costin 02/05/30 11:03:59
Modified: jk/native2/include jk_bean.h jk_channel.h jk_shm.h
Log:
Added a special flag to indicate that an invoke() operation has a response.
This allows as to use JNI_ABORT and discard the buffer for most operations,
only few calls need the buffer.
Also removed unused methods in jk_shm, added a common 'super' impl for channel
setAttribute.
Revision Changes Path
1.6 +2 -0 jakarta-tomcat-connectors/jk/native2/include/jk_bean.h
Index: jk_bean.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_bean.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_bean.h 28 May 2002 22:47:43 -0000 1.5
+++ jk_bean.h 30 May 2002 18:03:59 -0000 1.6
@@ -80,6 +80,8 @@
#define JK_STATE_DISABLED 0
#define JK_STATE_NEW 1
#define JK_STATE_INIT 2
+
+#define JK_INVOKE_WITH_RESPONSE 1
/**
* Factory used to create all jk objects. Factories are registered with
1.14 +3 -1 jakarta-tomcat-connectors/jk/native2/include/jk_channel.h
Index: jk_channel.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_channel.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_channel.h 28 May 2002 22:37:11 -0000 1.13
+++ jk_channel.h 30 May 2002 18:03:59 -0000 1.14
@@ -168,7 +168,9 @@
int JK_METHOD jk2_channel_invoke(struct jk_env *env, struct jk_bean *bean, struct
jk_endpoint *ep, int code,
struct jk_msg *msg, int raw);
-
+
+int JK_METHOD jk2_channel_setAttribute(struct jk_env *env, struct jk_bean *mbean,
char *name, void *valueP)
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
1.7 +0 -9 jakarta-tomcat-connectors/jk/native2/include/jk_shm.h
Index: jk_shm.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_shm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_shm.h 15 May 2002 19:32:42 -0000 1.6
+++ jk_shm.h 30 May 2002 18:03:59 -0000 1.7
@@ -159,11 +159,6 @@
*/
int (JK_METHOD *destroy)(struct jk_env *env, struct jk_shm *shm);
- /**
- */
- int (JK_METHOD *setWorkerEnv)( struct jk_env *env, struct jk_shm *shm,
- struct jk_workerEnv *wEnv );
-
/** Get a shm slot. Each slot has different rules for synchronization, based on
type.
*/
struct jk_shm_slot *(JK_METHOD *getSlot)(struct jk_env *env, struct jk_shm
*shm, int pos);
@@ -171,10 +166,6 @@
/** Create a slot. This typically involves inter-process synchronization.
*/
struct jk_shm_slot *(JK_METHOD *createSlot)(struct jk_env *env, struct jk_shm
*shm, char *name, int size);
-
- /** Get an ID that is unique across processes.
- */
- int (JK_METHOD *getId)(struct jk_env *env, struct jk_shm *shm);
int size;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
