costin 02/04/11 12:28:01
Modified: jk/native2/include jk_channel.h jk_workerEnv.h
Log:
Few fixes for better channel initialization.
Revision Changes Path
1.9 +2 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_channel.h 26 Mar 2002 02:55:15 -0000 1.8
+++ jk_channel.h 11 Apr 2002 19:28:01 -0000 1.9
@@ -113,9 +113,10 @@
send/receive flow is hard to replicate on jni )
*/
int is_stream;
- struct jk_pool *pool;
+ struct jk_workerEnv *workerEnv;
struct jk_worker *worker;
+ char *workerName;
/** Prepare the channel, check the properties. This
* will resolve the host and do all the validations.
1.15 +13 -1 jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
Index: jk_workerEnv.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_workerEnv.h 10 Apr 2002 23:48:03 -0000 1.14
+++ jk_workerEnv.h 11 Apr 2002 19:28:01 -0000 1.15
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.14 $ *
+ * Version: $Revision: 1.15 $ *
***************************************************************************/
#ifndef JK_WORKERENV_H
@@ -81,6 +81,7 @@
#endif /* __cplusplus */
struct jk_worker;
+struct jk_channel;
struct jk_endpoint;
struct jk_env;
struct jk_config;
@@ -109,6 +110,10 @@
*/
struct jk_map *worker_map;
+ /* Channels
+ */
+ struct jk_map *channel_map;
+
/* worker.list - workers to load at startup
*/
char **worker_list;
@@ -219,6 +224,13 @@
struct jk_workerEnv *_this,
struct jk_worker *w);
+ int (*addChannel)(struct jk_env *env,
+ struct jk_workerEnv *_this,
+ struct jk_channel *w);
+
+ int (*initChannel)(struct jk_env *env,
+ struct jk_workerEnv *wEnv, struct jk_channel *ch);
+
/** Call the handler associated with the message type.
*/
int (*dispatch)(struct jk_env *env, struct jk_workerEnv *_this,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
