cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/06/10 00:11:14

  Modified:jni/native/src error.c
  Log:
  Use extended macro for checking user wrapped errors.
  
  Revision  ChangesPath
  1.12  +7 -12 jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- error.c   9 Jun 2005 11:13:40 -   1.11
  +++ error.c   10 Jun 2005 07:11:14 -  1.12
  @@ -133,6 +133,7 @@
   TCN_IMPLEMENT_CALL(jboolean, Status, is)(TCN_STDARGS, jint err, jint idx)
   {
   #define APR_IS(I, E) case I: if (E(err)) return JNI_TRUE; break
  +#define APR_ISX(I, E, T) case I: if (E(err) || (err == T)) return JNI_TRUE; 
break
   
   UNREFERENCED_STDARGS;
   switch (idx) {
  @@ -173,10 +174,7 @@
   APR_IS(54, APR_STATUS_IS_NOTDETACH);
   APR_IS(55, APR_STATUS_IS_CHILD_DONE);
   APR_IS(56, APR_STATUS_IS_CHILD_NOTDONE);
  -case 57:
  -if (APR_STATUS_IS_TIMEUP(err) || err == TCN_TIMEUP)
  -return JNI_TRUE;
  -break;
  +APR_ISX(57, APR_STATUS_IS_TIMEUP, TCN_TIMEUP);
   APR_IS(58, APR_STATUS_IS_INCOMPLETE);
   /* empty slot: +9 */
   /* empty slot: +10 */
  @@ -196,15 +194,12 @@
   APR_IS(74, APR_STATUS_IS_EMISMATCH);
   APR_IS(75, APR_STATUS_IS_EBUSY);
   /* Socket errors */
  -case 90:
  -if (APR_STATUS_IS_EAGAIN(err) || err == TCN_EAGAIN)
  -return JNI_TRUE;
  -break;
  -APR_IS(91, TCN_STATUS_IS_ETIMEDOUT);
  +APR_ISX(90, APR_STATUS_IS_EAGAIN, TCN_EAGAIN);
  +APR_ISX(91, TCN_STATUS_IS_ETIMEDOUT, TCN_ETIMEDOUT);
   APR_IS(92, APR_STATUS_IS_ECONNABORTED);
   APR_IS(93, APR_STATUS_IS_ECONNRESET);
  -APR_IS(94, APR_STATUS_IS_EINPROGRESS);
  -APR_IS(95, APR_STATUS_IS_EINTR);
  +APR_ISX(94, APR_STATUS_IS_EINPROGRESS, TCN_EINPROGRESS);
  +APR_ISX(95, APR_STATUS_IS_EINTR, TCN_EINTR);
   APR_IS(96, APR_STATUS_IS_ENOTSOCK);
   APR_IS(97, APR_STATUS_IS_EINVAL);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c network.c poll.c

[mturk]

mturk   2005/06/09 04:13:40

  Modified:jni/java/org/apache/tomcat/jni Status.java
   jni/native/include tcn.h
   jni/native/src error.c network.c poll.c
  Log:
  Use user errors for TIMEUP and EAGAIN.
  This way we'll be able to save an extra JNI call on each poll
  or sendfile.
  
  Revision  ChangesPath
  1.7   +4 -1  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
  
  Index: Status.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Status.java   19 Apr 2005 16:32:11 -  1.6
  +++ Status.java   9 Jun 2005 11:13:40 -   1.7
  @@ -175,6 +175,9 @@
   public static final int APR_EMISMATCH = (APR_OS_START_STATUS + 24);
   public static final int APR_EBUSY = (APR_OS_START_STATUS + 25);
   
  +public static final int TIMEUP= (APR_OS_START_USERERR + 1);
  +public static final int EAGAIN= (APR_OS_START_USERERR + 2);
  +
   private static native boolean is(int err, int idx);
   /**
* APR_STATUS_IS Status Value Tests
  
  
  
  1.14  +4 -1  jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- tcn.h 8 Jun 2005 07:16:33 -   1.13
  +++ tcn.h 9 Jun 2005 11:13:40 -   1.14
  @@ -39,6 +39,9 @@
   #define APR_MAX_IOVEC_SIZE 1024
   #endif
   
  +#define TCN_TIMEUP  APR_OS_START_USERERR + 1
  +#define TCN_EAGAIN  APR_OS_START_USERERR + 2
  +
   #define TCN_CLASS_PATH  org/apache/tomcat/jni/
   #define TCN_FINFO_CLASS TCN_CLASS_PATH FileInfo
   #define TCN_AINFO_CLASS TCN_CLASS_PATH Sockaddr
  
  
  
  1.11  +9 -3  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- error.c   7 Jun 2005 10:08:08 -   1.10
  +++ error.c   9 Jun 2005 11:13:40 -   1.11
  @@ -173,7 +173,10 @@
   APR_IS(54, APR_STATUS_IS_NOTDETACH);
   APR_IS(55, APR_STATUS_IS_CHILD_DONE);
   APR_IS(56, APR_STATUS_IS_CHILD_NOTDONE);
  -APR_IS(57, APR_STATUS_IS_TIMEUP);
  +case 57:
  +if (APR_STATUS_IS_TIMEUP(err) || err == TCN_TIMEUP)
  +return JNI_TRUE;
  +break;
   APR_IS(58, APR_STATUS_IS_INCOMPLETE);
   /* empty slot: +9 */
   /* empty slot: +10 */
  @@ -193,7 +196,10 @@
   APR_IS(74, APR_STATUS_IS_EMISMATCH);
   APR_IS(75, APR_STATUS_IS_EBUSY);
   /* Socket errors */
  -APR_IS(90, APR_STATUS_IS_EAGAIN);
  +case 90:
  +if (APR_STATUS_IS_EAGAIN(err) || err == TCN_EAGAIN)
  +return JNI_TRUE;
  +break;
   APR_IS(91, TCN_STATUS_IS_ETIMEDOUT);
   APR_IS(92, APR_STATUS_IS_ECONNABORTED);
   APR_IS(93, APR_STATUS_IS_ECONNRESET);
  
  
  
  1.24  +41 -11jakarta-tomcat-connectors/jni/native/src/network.c
  
  Index: network.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- network.c 30 May 2005 06:15:52 -  1.23
  +++ network.c 9 Jun 2005 11:13:40 -   1.24
  @@ -291,8 +291,11 @@
   (*e)-ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
  -else
  +else {
  +if (APR_STATUS_IS_EAGAIN(ss))
  +ss = TCN_EAGAIN;
   return -(jint)ss;
  +}
   }
   
   TCN_IMPLEMENT_CALL(jint, Socket, sendb)(TCN_STDARGS, jlong sock,
  @@ -311,8 +314,11 @@
   
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
  -else
  +else {
  +if (APR_STATUS_IS_EAGAIN(ss))
  +ss = TCN_EAGAIN;
   return -(jint)ss;
  +}
   }
   
   TCN_IMPLEMENT_CALL(jint, Socket, sendv)(TCN_STDARGS, jlong sock,
  @@ -344,8 +350,11 @@
   }
   if (ss == APR_SUCCESS)
   return (jint)written;
  -else
  +else {
  +if (APR_STATUS_IS_EAGAIN(ss))
  +ss = TCN_EAGAIN;
   return -(jint)ss;
  +}
   }
   
   TCN_IMPLEMENT_CALL(jint, Socket, sendto)(TCN_STDARGS, jlong sock,
  @@ -376,8 +385,11 @@
   (*e)-ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
  -else
  +

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[jfclere]

jfclere 2005/06/07 03:08:08

  Modified:jni/native/src error.c
  Log:
  typo? It cores in my machine...
  
  Revision  ChangesPath
  1.10  +1 -2  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- error.c   3 Jun 2005 07:44:10 -   1.9
  +++ error.c   7 Jun 2005 10:08:08 -   1.10
  @@ -53,7 +53,6 @@
   apr_vsnprintf(msg, TCN_BUFFER_SZ, fmt, ap);
   tcn_ThrowException(env, msg);
   va_end(ap);
  -free(msg);
   }
   
   /*
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[Mladen Turk]

[EMAIL PROTECTED] wrote:

jfclere 2005/06/07 03:08:08

  Modified:jni/native/src error.c
  Log:
  typo? It cores in my machine...
  
  -free(msg);


Yes, nasty typo. I was freeing a static string. Just great :)

Thanks for tracking that down,
Mladen.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/06/03 00:35:07

  Modified:jni/native/include tcn.h
   jni/native/src error.c
  Log:
  Add generic throw for printf style arguments.
  
  Revision  ChangesPath
  1.11  +2 -2  jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tcn.h 1 Jun 2005 06:38:09 -   1.10
  +++ tcn.h 3 Jun 2005 07:35:07 -   1.11
  @@ -56,7 +56,7 @@
   JNIEXPORT RT JNICALL Java_org_apache_tomcat_jni_##CL##_##FN
   
   /* Private helper functions */
  -void tcn_Throw(JNIEnv *env, const char *cname, const char *msg);
  +void tcn_Throw(JNIEnv *env, const char *fmt, ...);
   void tcn_ThrowException(JNIEnv *env, const char *msg);
   void tcn_ThrowAPRException(JNIEnv *env, apr_status_t err);
   jstring tcn_new_string(JNIEnv *env, const char *str, int l);
  
  
  
  1.8   +17 -4 jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- error.c   24 May 2005 09:24:40 -  1.7
  +++ error.c   3 Jun 2005 07:35:07 -   1.8
  @@ -18,9 +18,10 @@
* @author Mladen Turk
* @version $Revision$, $Date$
*/
  - 
  +
   #include apr.h
   #include apr_pools.h
  +#include apr_strings.h
   #include tcn.h
   
   /* Merge IS_ETIMEDOUT with APR_TIMEUP
  @@ -29,7 +30,7 @@
   /*
* Convenience function to help throw an Exception.
*/
  -void tcn_Throw(JNIEnv *env, const char *cname, const char *msg)
  +static void do_throw(JNIEnv *env, const char *cname, const char *msg)
   {
   jclass javaExceptionClass;
   
  @@ -47,7 +48,19 @@
*/
   void tcn_ThrowException(JNIEnv *env, const char *msg)
   {
  -tcn_Throw(env, java/lang/Exception, msg);
  +do_throw(env, java/lang/Exception, msg);
  +}
  +
  +void tcn_Throw(JNIEnv *env, const char *fmt, ...)
  +{
  +char msg[TCN_BUFFER_SZ] = {'\0'};
  +va_list ap;
  +
  +va_start(ap, fmt);
  +apr_vsnprintf(msg, TCN_BUFFER_SZ, fmt, ap);
  +do_throw(env, java/lang/Exception, msg);
  +va_end(ap);
  +free(msg);
   }
   
   /*
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/06/03 00:44:10

  Modified:jni/native/src error.c
  Log:
  Remove extra static function by merge it to the ThrowException.
  
  Revision  ChangesPath
  1.9   +6 -13 jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- error.c   3 Jun 2005 07:35:07 -   1.8
  +++ error.c   3 Jun 2005 07:44:10 -   1.9
  @@ -28,27 +28,20 @@
*/
   #define TCN_STATUS_IS_ETIMEDOUT(x) (APR_STATUS_IS_ETIMEDOUT((x)) || ((x) == 
APR_TIMEUP))
   /*
  - * Convenience function to help throw an Exception.
  + * Convenience function to help throw an java.lang.Exception.
*/
  -static void do_throw(JNIEnv *env, const char *cname, const char *msg)
  +void tcn_ThrowException(JNIEnv *env, const char *msg)
   {
   jclass javaExceptionClass;
   
  -javaExceptionClass = (*env)-FindClass(env, cname);
  +javaExceptionClass = (*env)-FindClass(env, java/lang/Exception);
   if (javaExceptionClass == NULL) {
  -fprintf(stderr, Cannot find %s class\n, cname);
  +fprintf(stderr, Cannot find java/lang/Exception class\n);
   return;
   }
   (*env)-ThrowNew(env, javaExceptionClass, msg);
   (*env)-DeleteLocalRef(env, javaExceptionClass);
  -}
   
  -/*
  - * Convenience function to help throw an java.lang.Exception.
  - */
  -void tcn_ThrowException(JNIEnv *env, const char *msg)
  -{
  -do_throw(env, java/lang/Exception, msg);
   }
   
   void tcn_Throw(JNIEnv *env, const char *fmt, ...)
  @@ -58,7 +51,7 @@
   
   va_start(ap, fmt);
   apr_vsnprintf(msg, TCN_BUFFER_SZ, fmt, ap);
  -do_throw(env, java/lang/Exception, msg);
  +tcn_ThrowException(env, msg);
   va_end(ap);
   free(msg);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c poll.c

[mturk]

mturk   2005/04/19 09:32:11

  Modified:jni/java/org/apache/tomcat/jni Poll.java Status.java
   jni/native/src error.c poll.c
  Log:
  Add maintain for Poll for polling timed out sockets. Remove
  thread safety flags, because this is responsibility of Java client.
  
  Revision  ChangesPath
  1.8   +22 -2 
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java
  
  Index: Poll.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Poll.java 18 Apr 2005 15:24:01 -  1.7
  +++ Poll.java 19 Apr 2005 16:32:11 -  1.8
  @@ -104,11 +104,31 @@
* descriptors[n + 2] - client data
* descriptors[n + 2] - reserved
* /PRE
  + * @param remove Remove signaled descriptors from pollset
* @return Number of signalled descriptors (output parameter)
* or negative APR error code.
*/
   public static native int poll(long pollset, long timeout,
  -  long [] descriptors);
  +  long [] descriptors, boolean remove);
  +
  +/**
  + * Maintain on the descriptor(s) in a pollset
  + * @param pollset The pollset to use
  + * @param descriptors Array of signalled descriptors (output parameter)
  + *The desctiptor array must be four times the size of pollset.
  + *and are populated as follows:
  + * PRE
  + * descriptors[n + 0] - returned events
  + * descriptors[n + 1] - socket
  + * descriptors[n + 2] - client data
  + * descriptors[n + 2] - reserved
  + * /PRE
  + * @param remove Remove signaled descriptors from pollset
  + * @return Number of signalled descriptors (output parameter)
  + * or negative APR error code.
  + */
  +public static native int maintain(long pollset, long [] descriptors,
  +  boolean remove);
   
   /**
* Set the socket time to live.
  
  
  
  1.6   +2 -1  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
  
  Index: Status.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Status.java   15 Apr 2005 17:21:23 -  1.5
  +++ Status.java   19 Apr 2005 16:32:11 -  1.6
  @@ -253,5 +253,6 @@
   public static final boolean APR_STATUS_IS_EINPROGRESS(int s)  { return 
is(s, 94); }
   public static final boolean APR_STATUS_IS_EINTR(int s)  { return 
is(s, 95); }
   public static final boolean APR_STATUS_IS_ENOTSOCK(int s)   { return 
is(s, 96); }
  +public static final boolean APR_STATUS_IS_EINVAL(int s) { return 
is(s, 97); }
   
   }
  
  
  
  1.5   +1 -0  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- error.c   15 Apr 2005 17:21:23 -  1.4
  +++ error.c   19 Apr 2005 16:32:11 -  1.5
  @@ -186,6 +186,7 @@
   APR_IS(94, APR_STATUS_IS_EINPROGRESS);
   APR_IS(95, APR_STATUS_IS_EINTR);
   APR_IS(96, APR_STATUS_IS_ENOTSOCK);
  +APR_IS(97, APR_STATUS_IS_EINVAL);
   }
   return JNI_FALSE;
   }
  
  
  
  1.10  +71 -107   jakarta-tomcat-connectors/jni/native/src/poll.c
  
  Index: poll.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/poll.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- poll.c18 Apr 2005 15:43:35 -  1.9
  +++ poll.c19 Apr 2005 16:32:11 -  1.10
  @@ -16,7 +16,6 @@
   #include apr.h
   #include apr_pools.h
   #include apr_poll.h
  -#include apr_thread_mutex.h
   #include tcn.h
   
   /* Internal poll structure for queryset
  @@ -25,13 +24,10 @@
   typedef struct tcn_pollset {
   apr_pool_t*pool;
   apr_int32_t   nelts;
  -apr_int32_t   nadds;
   apr_int32_t   nalloc;
   apr_pollset_t *pollset;
  -apr_thread_mutex_t *mutex;
  -apr_pollfd_t  *query_set;
  -apr_pollfd_t  *query_add;
  -apr_time_t*query_ttl;
  +apr_pollfd_t  *socket_set;
  +apr_interval_time_t *socket_ttl;
   apr_interval_time_t max_ttl;
   } tcn_pollset_t;
   
  @@ -42,14 +38,10 @@
   apr_pool_t *p = J2P(pool, apr_pool_t *);
   apr_pollset_t *pollset = NULL;
   tcn_pollset_t *tps = NULL;
  -apr_thread_mutex_t *mutex = NULL;
   apr_uint32_t f = 

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/04/19 12:55:42

  Modified:jni/native/src error.c
  Log:
  Add APR_TIMEUP testing to ETIMEDOUT.
  
  Revision  ChangesPath
  1.6   +4 -1  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- error.c   19 Apr 2005 16:32:11 -  1.5
  +++ error.c   19 Apr 2005 19:55:42 -  1.6
  @@ -17,6 +17,9 @@
   #include apr_pools.h
   #include tcn.h
   
  +/* Merge IS_ETIMEDOUT with APR_TIMEUP
  + */
  +#define TCN_STATUS_IS_ETIMEDOUT(x) (APR_STATUS_IS_ETIMEDOUT((x)) || ((x) == 
APR_TIMEUP))
   /*
* Convenience function to help throw an Exception.
*/
  @@ -180,7 +183,7 @@
   APR_IS(75, APR_STATUS_IS_EBUSY);
   /* Socket errors */
   APR_IS(90, APR_STATUS_IS_EAGAIN);
  -APR_IS(91, APR_STATUS_IS_ETIMEDOUT);
  +APR_IS(91, TCN_STATUS_IS_ETIMEDOUT);
   APR_IS(92, APR_STATUS_IS_ECONNABORTED);
   APR_IS(93, APR_STATUS_IS_ECONNRESET);
   APR_IS(94, APR_STATUS_IS_EINPROGRESS);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/04/15 03:16:05

  Modified:jni/native/src error.c
  Log:
  Add ETIMEDOUT flag check.
  
  Revision  ChangesPath
  1.3   +1 -1  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- error.c   14 Apr 2005 16:41:34 -  1.2
  +++ error.c   15 Apr 2005 10:16:05 -  1.3
  @@ -180,7 +180,7 @@
   APR_IS(75, APR_STATUS_IS_EBUSY);
   /* Socket errors */
   APR_IS(90, APR_STATUS_IS_EAGAIN);
  -
  +APR_IS(91, APR_STATUS_IS_ETIMEDOUT);
   }
   return JNI_FALSE;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/04/15 10:21:23

  Modified:jni/java/org/apache/tomcat/jni Status.java
   jni/native/src error.c
  Log:
  Add missing APR_STATUS_IS_ macros wrappers for socket statuses.
  
  Revision  ChangesPath
  1.5   +7 -2  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
  
  Index: Status.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Status.java   15 Apr 2005 10:15:55 -  1.4
  +++ Status.java   15 Apr 2005 17:21:23 -  1.5
  @@ -244,9 +244,14 @@
   public static final boolean APR_STATUS_IS_ENOTIMPL(int s)   { return 
is(s, 73); }
   public static final boolean APR_STATUS_IS_EMISMATCH(int s)  { return 
is(s, 74); }
   public static final boolean APR_STATUS_IS_EBUSY(int s)  { return 
is(s, 75); }
  -
  +
   /* Socket errors */
   public static final boolean APR_STATUS_IS_EAGAIN(int s) { return 
is(s, 90); }
   public static final boolean APR_STATUS_IS_ETIMEDOUT(int s)  { return 
is(s, 91); }
  +public static final boolean APR_STATUS_IS_ECONNABORTED(int s) { return 
is(s, 92); }
  +public static final boolean APR_STATUS_IS_ECONNRESET(int s)   { return 
is(s, 93); }
  +public static final boolean APR_STATUS_IS_EINPROGRESS(int s)  { return 
is(s, 94); }
  +public static final boolean APR_STATUS_IS_EINTR(int s)  { return 
is(s, 95); }
  +public static final boolean APR_STATUS_IS_ENOTSOCK(int s)   { return 
is(s, 96); }
   
   }
  
  
  
  1.4   +5 -0  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- error.c   15 Apr 2005 10:16:05 -  1.3
  +++ error.c   15 Apr 2005 17:21:23 -  1.4
  @@ -181,6 +181,11 @@
   /* Socket errors */
   APR_IS(90, APR_STATUS_IS_EAGAIN);
   APR_IS(91, APR_STATUS_IS_ETIMEDOUT);
  +APR_IS(92, APR_STATUS_IS_ECONNABORTED);
  +APR_IS(93, APR_STATUS_IS_ECONNRESET);
  +APR_IS(94, APR_STATUS_IS_EINPROGRESS);
  +APR_IS(95, APR_STATUS_IS_EINTR);
  +APR_IS(96, APR_STATUS_IS_ENOTSOCK);
   }
   return JNI_FALSE;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk   2005/04/14 09:41:34

  Modified:jni/native/src error.c
  Log:
  Add Status.APR_STATUS_IS_EAGAIN for checking non blocking sockets.
  
  Revision  ChangesPath
  1.2   +2 -0  jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- error.c   14 Jan 2005 13:47:58 -  1.1
  +++ error.c   14 Apr 2005 16:41:34 -  1.2
  @@ -178,6 +178,8 @@
   APR_IS(73, APR_STATUS_IS_ENOTIMPL);
   APR_IS(74, APR_STATUS_IS_EMISMATCH);
   APR_IS(75, APR_STATUS_IS_EBUSY);
  +/* Socket errors */
  +APR_IS(90, APR_STATUS_IS_EAGAIN);
   
   }
   return JNI_FALSE;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]