Author: rjung
Date: Sat May 23 10:31:30 2015
New Revision: 1681315
URL: http://svn.apache.org/r1681315
Log:
- Step 1 in solving the JVM core on shutdown.
Use APR pool pre-cleanup API
- Use old (problematic) variant if newer API is
not available.
Backport of r988402 and 1681314 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/network.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:31:30 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988428,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/native/trunk:815411,988402,988428,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,1681314
/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/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1681315&r1=1681314&r2=1681315&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Sat May 23 10:31:30 2015
@@ -196,9 +196,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
+#ifdef HAVE_POOL_PRE_CLEANUP
+ apr_pool_pre_cleanup_register(c, (const void *)a,
+ sp_socket_cleanup);
+#else
apr_pool_cleanup_register(c, (const void *)a,
sp_socket_cleanup,
apr_pool_cleanup_null);
+#endif
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -395,9 +400,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
+#ifdef HAVE_POOL_PRE_CLEANUP
+ apr_pool_pre_cleanup_register(a->pool, (const void *)a,
+ sp_socket_cleanup);
+#else
apr_pool_cleanup_register(a->pool, (const void *)a,
sp_socket_cleanup,
apr_pool_cleanup_null);
+#endif
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
