Author: markt
Date: Wed Jun 13 15:59:02 2012
New Revision: 1349932
URL: http://svn.apache.org/viewvc?rev=1349932&view=rev
Log:
Add per socket timeout to JNI API
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342027
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1349932&r1=1349931&r2=1349932&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Wed Jun 13 15:59:02 2012
@@ -60,9 +60,9 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 1;
- protected static final int TCN_REQUIRED_PATCH = 17;
+ protected static final int TCN_REQUIRED_PATCH = 24;
protected static final int TCN_RECOMMENDED_MINOR = 1;
- protected static final int TCN_RECOMMENDED_PV = 22;
+ protected static final int TCN_RECOMMENDED_PV = 24;
// ---------------------------------------------- Properties
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1349932&r1=1349931&r2=1349932&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Wed Jun 13
15:59:02 2012
@@ -73,11 +73,8 @@ public class Poll {
public static native int destroy(long pollset);
/**
- * Add a socket or to a pollset
- * If you set client_data in the descriptor, that value
- * will be returned in the client_data field whenever this
- * descriptor is signaled in apr_pollset_poll().
- * @param pollset The pollset to which to add the descriptor
+ * Add a socket to a pollset with the default timeout.
+ * @param pollset The pollset to which to add the socket
* @param sock The sockets to add
* @param reqevents requested events
*/
@@ -85,6 +82,16 @@ public class Poll {
int reqevents);
/**
+ * Add a socket to a pollset with a specific timeout.
+ * @param pollset The pollset to which to add the socket
+ * @param sock The sockets to add
+ * @param reqevents requested events
+ * @param timeout requested timeout in microseconds (-1 for infinite)
+ */
+ public static native int addWithTimeout(long pollset, long sock,
+ int reqevents, long timeout);
+
+ /**
* Remove a descriptor from a pollset
* @param pollset The pollset from which to remove the descriptor
* @param sock The socket to remove
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
