costin 02/03/01 21:43:28
Modified: jk/native2/include jk_channel.h jk_workerEnv.h
Log:
Create worker takes the type of the worker to be created.
Exposed some of the properties that were used internally
in init, the setProperty() will set them.
Revision Changes Path
1.6 +4 -16 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_channel.h 26 Jan 2002 06:17:47 -0000 1.5
+++ jk_channel.h 2 Mar 2002 05:43:28 -0000 1.6
@@ -102,12 +102,6 @@
struct jk_channel {
char *name;
- /** List of properties this channel 'knows'.
- * This will permit admin code to 'query' each channel
- * and the setting code can better report errors.
- */
- char **supportedProperties;
-
/* JK_TRUE if the channel is 'stream' based, i.e. it works using
send() followed by blocking reads().
XXX make it type and define an enum of supported types ?
@@ -121,7 +115,6 @@
int is_stream;
struct jk_worker *worker;
- jk_map_t *properties;
/** Prepare the channel, check the properties. This
* will resolve the host and do all the validations.
@@ -131,11 +124,8 @@
* the inet addr, etc )
* XXX revisit this - we may pass too much that is not needed
*/
- int (JK_METHOD *init)(struct jk_env *env, jk_channel_t *_this,
- jk_map_t *properties,
- char *worker_name,
- struct jk_worker *worker );
-
+ int (JK_METHOD *init)(struct jk_env *env, jk_channel_t *_this);
+
/** Open the communication channel
*/
int (JK_METHOD *open)(struct jk_env *env, jk_channel_t *_this,
@@ -175,8 +165,6 @@
-
- /* XXX remove for now, add later in all objects */
/** Set a channel property. Properties are used to configure the
* communication channel ( example: port, host, file, shmem_name, etc).
*/
@@ -185,8 +173,8 @@
/** Get a channel property
*/
- int (JK_METHOD *getProperty)(struct jk_env *env, jk_channel_t *_this,
- char *name, char **value);
+ char *(JK_METHOD *getProperty)(struct jk_env *env, jk_channel_t *_this,
+ char *name);
void *_privatePtr;
};
1.12 +8 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_workerEnv.h 28 Feb 2002 22:08:21 -0000 1.11
+++ jk_workerEnv.h 2 Mar 2002 05:43:28 -0000 1.12
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.11 $ *
+ * Version: $Revision: 1.12 $ *
***************************************************************************/
#ifndef JK_WORKERENV_H
@@ -111,6 +111,12 @@
*/
struct jk_map *worker_map;
+ /* worker.list - workers to load at startup
+ */
+ char **worker_list;
+ int declared_workers;
+
+
struct jk_env *globalEnv;
/** Worker that will be used by default, if no other
@@ -245,7 +251,7 @@
struct jk_worker *(*createWorker)(struct jk_env *env,
struct jk_workerEnv *_this,
const char *name,
- struct jk_map *init_data);
+ char *type);
/** Call the handler associated with the message type.
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
