costin 02/04/10 16:44:29
Modified: jk/native2/common jk_registry.h jk_registry.c
Log:
Add jk_shm to the registry.
The general structure of the shared memory will be very simple - a number
of 'slots', each following its own rules. That will allow multiple
components to use the shm.
My goal is to get at least 2 'slots' working - one for the worker status,
similar with mod_jserv, and one for the config 'generation', allowing
apache processes to refresh themself when config changes.
( this is not the most urgent piece for jk2, but I wanted to get it at least
in a basic state - maybe other people will help )
Revision Changes Path
1.11 +7 -2 jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
Index: jk_registry.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_registry.h 23 Mar 2002 17:25:11 -0000 1.10
+++ jk_registry.h 10 Apr 2002 23:44:29 -0000 1.11
@@ -62,7 +62,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -124,7 +124,12 @@
#ifdef HAS_APR
int JK_METHOD jk2_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
- const char *type,
const char *name);
+ const char *type, const char *name);
+
+int JK_METHOD jk2_shm_factory(jk_env_t *env, jk_pool_t *pool,
+ jk_bean_t *result,
+ const char *type, const char *name);
+
#endif
int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
1.16 +4 -1 jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Index: jk_registry.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_registry.c 23 Mar 2002 17:25:11 -0000 1.15
+++ jk_registry.c 10 Apr 2002 23:44:29 -0000 1.16
@@ -63,7 +63,7 @@
#include "jk_registry.h"
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -126,6 +126,9 @@
#ifdef HAS_APR
env->registerFactory( env, "channel.apr",
jk2_channel_apr_socket_factory );
+#if APR_HAS_SHARED_MEMORY
+ env->registerFactory( env, "shm", jk2_shm_factory );
+#endif
#endif
env->registerFactory( env, "channel.socket", jk2_channel_socket_factory );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
