costin 02/05/15 12:34:09
Modified: jk/native2/common jk_channel_apr_socket.c jk_channel_jni.c
Log:
Few cosmetic changes - simplify the code
Revision Changes Path
1.17 +13 -27
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_channel_apr_socket.c 12 May 2002 01:08:45 -0000 1.16
+++ jk_channel_apr_socket.c 15 May 2002 19:34:09 -0000 1.17
@@ -89,12 +89,6 @@
short port;
};
-/** Informations for each connection
- */
-typedef struct jk_channel_apr_data {
- apr_socket_t *sock;
-} jk_channel_apr_data_t;
-
typedef struct jk_channel_apr_private jk_channel_apr_private_t;
/*
@@ -214,9 +208,8 @@
apr_sockaddr_t *remote_sa=socketInfo->addr;
int ndelay=socketInfo->ndelay;
- jk_channel_apr_data_t *sd=endpoint->channelData;
- apr_socket_t *sock;
+ apr_socket_t *sock=endpoint->channelData;
apr_status_t ret;
apr_interval_time_t timeout = 2 * APR_USEC_PER_SEC;
char msg[128];
@@ -270,13 +263,7 @@
*/
/* store the channel information */
- if( sd==NULL ) {
- sd=(jk_channel_apr_data_t *)
- endpoint->pool->calloc( env, endpoint->pool,
- sizeof( jk_channel_apr_data_t ));
- endpoint->channelData=sd;
- }
- sd->sock = sock;
+ endpoint->channelData=sock;
return JK_OK;
}
@@ -290,12 +277,13 @@
apr_socket_t *sd;
apr_status_t rc;
- jk_channel_apr_data_t *chD=endpoint->channelData;
- if( chD==NULL )
+ sd=endpoint->channelData;
+ if( sd==NULL )
return JK_ERR;
- sd=chD->sock;
- chD->sock=NULL; /* XXX check it. */
+ endpoint->channelData=NULL; /* XXX check it. */
+ endpoint->sd=-1;
+
/* nothing else to clean, the socket_data was allocated ouf of
* endpoint's pool
*/
@@ -330,17 +318,15 @@
int this_time;
int unixsock;
- jk_channel_apr_data_t *chD=endpoint->channelData;
+ sock=endpoint->channelData;
- if( chD==NULL )
+ if( sock==NULL )
return JK_ERR;
msg->end( env, msg );
len=msg->len;
b=msg->buf;
- sock=chD->sock;
-
length = (apr_size_t) len;
stat = apr_send(sock, b, &length);
if (stat!= APR_SUCCESS) {
@@ -366,8 +352,6 @@
jk_endpoint_t *endpoint,
char *b, int len )
{
- jk_channel_apr_data_t *chD=endpoint->channelData;
-
apr_socket_t *sock;
apr_size_t length;
apr_status_t stat;
@@ -375,9 +359,11 @@
int sd;
int rdlen;
- if( chD==NULL )
+ sock=endpoint->channelData;
+
+ if( sock==NULL )
return JK_ERR;
- sock=chD->sock;
+
rdlen = 0;
length = (apr_size_t) len;
1.18 +4 -23 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_channel_jni.c 11 May 2002 00:02:53 -0000 1.17
+++ jk_channel_jni.c 15 May 2002 19:34:09 -0000 1.18
@@ -176,8 +176,8 @@
solution
*/
epData=(jk_ch_jni_ep_private_t *)
- endpoint->pool->calloc( env,endpoint->pool,
- sizeof( jk_ch_jni_ep_private_t ));
+ endpoint->mbean->pool->calloc( env,endpoint->mbean->pool,
+ sizeof( jk_ch_jni_ep_private_t ));
endpoint->channelData=epData;
/** XXX make it customizable */
@@ -250,8 +250,8 @@
/* XXX > ajp buffer size. Don't know how to fragment or reallocate
yet */
- epData->carray=(char *)endpoint->pool->calloc( env, endpoint->pool,
- epData->arrayLen);
+ epData->carray=(char *)endpoint->mbean->pool->calloc( env,
endpoint->mbean->pool,
+ epData->arrayLen);
jniCh->writeMethod =
(*jniEnv)->GetStaticMethodID(jniEnv, jniCh->jniBridge,
@@ -469,24 +469,6 @@
if( worker->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "service() attaching to vm\n");
-
- jniEnv=(JNIEnv *)endpoint->endpoint_private;
- if(jniEnv==NULL) { /*! attached */
- /* Try to attach */
- if( we->vm == NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "No VM to use\n");
- return JK_ERR;
- }
- jniEnv = we->vm->attach(env, we->vm);
-
- if(jniEnv == NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "Attach failed\n");
- /* Is it recoverable ?? - yes, don't change the previous value*/
- /* r->is_recoverable_error = JK_OK; */
- return JK_ERR;
- }
- endpoint->endpoint_private = jniEnv;
- }
return JK_OK;
}
@@ -501,7 +483,6 @@
jk_workerEnv_t *we=worker->workerEnv;
/* XXX Don't detach if worker is reused per thread */
- endpoint->endpoint_private=NULL;
if( we==NULL || we->vm==NULL ) {
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
