Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 64839 invoked from network); 12 May 2002 01:11:09 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 12 May 2002 01:11:09 -0000 Received: (qmail 14767 invoked by uid 97); 12 May 2002 01:11:11 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 14731 invoked by uid 97); 12 May 2002 01:11:10 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 14720 invoked by uid 97); 12 May 2002 01:11:09 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 12 May 2002 01:10:56 -0000 Message-ID: <20020512011056.65706.qmail@icarus.apache.org> From: nacho@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c org_apache_jk_apr_AprImpl.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N nacho 02/05/11 18:10:56 Modified: jk/native2/jni jk_jni_aprImpl.c org_apache_jk_apr_AprImpl.h Log: * Fixed mutexcreate impl * Commited complete JNI header Revision Changes Path 1.19 +6 -4 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c Index: jk_jni_aprImpl.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jk_jni_aprImpl.c 11 May 2002 17:29:28 -0000 1.18 +++ jk_jni_aprImpl.c 12 May 2002 01:10:56 -0000 1.19 @@ -226,12 +226,14 @@ jint mechJ ) { apr_proc_mutex_t *mutex; - char *fname; - apr_lockmech_e mech; - apr_pool_t *pool; + apr_lockmech_e mech=(apr_lockmech_e)mechJ; + apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolP; apr_status_t st; - + char *fname=(char *)(*jniEnv)->GetStringUTFChars(jniEnv, fileJ, 0); + st=apr_proc_mutex_create( &mutex, fname, mech, pool ); + + (*jniEnv)->ReleaseStringUTFChars(jniEnv, fileJ, fname); return (jlong)(long)(void *)mutex; } 1.2 +109 -0 jakarta-tomcat-connectors/jk/native2/jni/org_apache_jk_apr_AprImpl.h Index: org_apache_jk_apr_AprImpl.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/org_apache_jk_apr_AprImpl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- org_apache_jk_apr_AprImpl.h 6 Jan 2002 09:01:51 -0000 1.1 +++ org_apache_jk_apr_AprImpl.h 12 May 2002 01:10:56 -0000 1.2 @@ -7,6 +7,19 @@ #ifdef __cplusplus extern "C" { #endif +#undef org_apache_jk_apr_AprImpl_OK +#define org_apache_jk_apr_AprImpl_OK 0L +#undef org_apache_jk_apr_AprImpl_LAST +#define org_apache_jk_apr_AprImpl_LAST 1L +#undef org_apache_jk_apr_AprImpl_ERROR +#define org_apache_jk_apr_AprImpl_ERROR 2L +#undef org_apache_jk_apr_AprImpl_HANDLE_RECEIVE_PACKET +#define org_apache_jk_apr_AprImpl_HANDLE_RECEIVE_PACKET 10L +#undef org_apache_jk_apr_AprImpl_HANDLE_SEND_PACKET +#define org_apache_jk_apr_AprImpl_HANDLE_SEND_PACKET 11L +/* Inaccessible static: aprSingleton */ +/* Inaccessible static: ok */ +/* Inaccessible static: jniMode */ /* * Class: org_apache_jk_apr_AprImpl * Method: initialize @@ -86,6 +99,102 @@ */ JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_unWrite (JNIEnv *, jobject, jlong, jlong, jbyteArray, jint, jint); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: mutexCreate + * Signature: (JLjava/lang/String;I)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_mutexCreate + (JNIEnv *, jobject, jlong, jstring, jint); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: mutexLock + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_mutexLock + (JNIEnv *, jobject, jlong, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: mutexUnLock + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_mutexUnLock + (JNIEnv *, jobject, jlong, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: mutexTryLock + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_mutexTryLock + (JNIEnv *, jobject, jlong, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: mutexDestroy + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_mutexDestroy + (JNIEnv *, jobject, jlong, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: getJkEnv + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkEnv + (JNIEnv *, jobject); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: releaseJkEnv + * Signature: (J)V + */ +JNIEXPORT void JNICALL Java_org_apache_jk_apr_AprImpl_releaseJkEnv + (JNIEnv *, jobject, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: jkRecycle + * Signature: (JJ)V + */ +JNIEXPORT void JNICALL Java_org_apache_jk_apr_AprImpl_jkRecycle + (JNIEnv *, jobject, jlong, jlong); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: getJkHandler + * Signature: (JLjava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkHandler + (JNIEnv *, jobject, jlong, jstring); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: createJkHandler + * Signature: (JLjava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_createJkHandler + (JNIEnv *, jobject, jlong, jstring); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: jkGetId + * Signature: (JLjava/lang/String;Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkGetId + (JNIEnv *, jobject, jlong, jstring, jstring); + +/* + * Class: org_apache_jk_apr_AprImpl + * Method: jkInvoke + * Signature: (JJJI[BI)I + */ +JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkInvoke + (JNIEnv *, jclass, jlong, jlong, jlong, jint, jbyteArray, jint); #ifdef __cplusplus } -- To unsubscribe, e-mail: For additional commands, e-mail: