Author: rjung
Date: Sat May 23 10:15:38 2015
New Revision: 1681310
URL: http://svn.apache.org/r1681310
Log:
Add unmanaged pool api.
Partial backport of r1205445 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/configure.in
tomcat/native/branches/1.1.x/native/src/pool.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:15:38 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,992208,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/configure.in?rev=1681310&r1=1681309&r2=1681310&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/configure.in (original)
+++ tomcat/native/branches/1.1.x/native/configure.in Sat May 23 10:15:38 2015
@@ -224,6 +224,8 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
+
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
AC_SUBST(TCNATIVE_INCLUDES)
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1681310&r1=1681309&r2=1681310&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Sat May 23 10:15:38 2015
@@ -56,6 +56,24 @@ cleanup:
return P2J(n);
}
+#if defined(HAVE_POOL_UNMANAGED)
+TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
+{
+ apr_pool_t *n;
+
+ UNREFERENCED(o);
+ TCN_THROW_IF_ERR(apr_pool_create_unmanaged(&n), n);
+cleanup:
+ return P2J(n);
+}
+#else
+TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
+{
+ UNREFERENCED_STDARGS;
+ return 0;
+}
+#endif
+
TCN_IMPLEMENT_CALL(void, Pool, clear)(TCN_STDARGS, jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
