hgomez 02/02/21 03:12:11
Modified: jk/native2/common jk_objCache.c jk_pool.c jk_registry.c
jk_registry.h
Log:
Fourth batch of jk2 renaming
Revision Changes Path
1.5 +9 -9 jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
Index: jk_objCache.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_objCache.c 6 Feb 2002 19:14:50 -0000 1.4
+++ jk_objCache.c 21 Feb 2002 11:12:11 -0000 1.5
@@ -65,7 +65,7 @@
#include "jk_objCache.h"
static int
-jk_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
+jk2_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
{
int rc;
@@ -107,7 +107,7 @@
}
static int
-jk_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
+jk2_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
int i;
if( cacheSize <= 0 ) {
@@ -136,7 +136,7 @@
}
static int
-jk_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
+jk2_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
int i;
JK_DELETE_CS(&(_this->cs), i);
@@ -149,7 +149,7 @@
static void *
-jk_objCache_get(jk_env_t *env, jk_objCache_t *_this )
+jk2_objCache_get(jk_env_t *env, jk_objCache_t *_this )
{
int rc;
void *ae=NULL;
@@ -168,7 +168,7 @@
return NULL;
}
-jk_objCache_t *jk_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
+jk_objCache_t *jk2_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
jk_objCache_t *_this=pool->calloc( env, pool, sizeof( jk_objCache_t ));
_this->pool=pool;
@@ -177,10 +177,10 @@
_this->size=0;
_this->maxSize=-1;
- _this->get=jk_objCache_get;
- _this->put=jk_objCache_put;
- _this->init=jk_objCache_init;
- _this->destroy=jk_objCache_destroy;
+ _this->get=jk2_objCache_get;
+ _this->put=jk2_objCache_put;
+ _this->init=jk2_objCache_init;
+ _this->destroy=jk2_objCache_destroy;
return _this;
}
1.6 +40 -40 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_pool.c 16 Dec 2001 23:29:55 -0000 1.5
+++ jk_pool.c 21 Feb 2002 11:12:11 -0000 1.6
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Simple memory pool *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -81,34 +81,34 @@
typedef struct jk_pool_private jk_pool_private_t;
-int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
+int jk2_pool_create( jk_env_t *env, jk_pool_t **newPool,
jk_pool_t *parent, int size );
-int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
+int JK_METHOD jk2_pool_factory( jk_env_t *env, void **result,
char *type, char *name);
-static jk_pool_t *jk_pool_createChild( jk_env_t *env,
- jk_pool_t *parent, int size );
+static jk_pool_t *jk2_pool_createChild(jk_env_t *env,
+ jk_pool_t *parent, int size);
-static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p,
- size_t size);
+static void *jk2_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p,
+ size_t size);
-static void jk_pool_reset(jk_env_t *env, jk_pool_t *p);
+static void jk2_pool_reset(jk_env_t *env, jk_pool_t *p);
-static void jk_pool_close(jk_env_t *env, jk_pool_t *p);
+static void jk2_pool_close(jk_env_t *env, jk_pool_t *p);
-static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
+static void *jk2_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
+static void *jk2_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
+static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
-static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void *old,
- size_t old_sz);
+static void *jk2_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void
*old,
+ size_t old_sz);
-int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
- jk_pool_t *parent, int size )
+int jk2_pool_create(jk_env_t *env, jk_pool_t **newPool,
+ jk_pool_t *parent, int size)
{
jk_pool_private_t *pp;
@@ -132,28 +132,28 @@
pp->parent=parent;
/* methods */
- _this->create=jk_pool_createChild;
- _this->close=jk_pool_close;
- _this->reset=jk_pool_reset;
+ _this->create=jk2_pool_createChild;
+ _this->close=jk2_pool_close;
+ _this->reset=jk2_pool_reset;
- _this->alloc=jk_pool_alloc;
- _this->calloc=jk_pool_calloc;
- _this->pstrdup=jk_pool_strdup;
- _this->realloc=jk_pool_realloc;
+ _this->alloc=jk2_pool_alloc;
+ _this->calloc=jk2_pool_calloc;
+ _this->pstrdup=jk2_pool_strdup;
+ _this->realloc=jk2_pool_realloc;
*newPool = _this;
return JK_TRUE;
}
-static jk_pool_t *jk_pool_createChild( jk_env_t *env, jk_pool_t *parent, int size )
{
+static jk_pool_t *jk2_pool_createChild( jk_env_t *env, jk_pool_t *parent, int size
) {
jk_pool_t *newPool;
- jk_pool_create( env, &newPool, parent, size );
+ jk2_pool_create( env, &newPool, parent, size );
return newPool;
}
-static void jk_pool_close(jk_env_t *env, jk_pool_t *p)
+static void jk2_pool_close(jk_env_t *env, jk_pool_t *p)
{
jk_pool_private_t *pp;
@@ -162,7 +162,7 @@
pp=(jk_pool_private_t *)p->_private;
- jk_pool_reset(env, p);
+ jk2_pool_reset(env, p);
if(pp->dynamic) {
free(pp->dynamic);
}
@@ -172,7 +172,7 @@
free( p );
}
-static void jk_pool_reset(jk_env_t *env, jk_pool_t *p)
+static void jk2_pool_reset(jk_env_t *env, jk_pool_t *p)
{
jk_pool_private_t *pp;
@@ -194,17 +194,17 @@
pp->pos = 0;
}
-static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p,
+static void *jk2_pool_calloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
- void *rc=jk_pool_alloc( env, p, size );
+ void *rc=jk2_pool_alloc( env, p, size );
if( rc==NULL )
return NULL;
memset( rc, 0, size );
return rc;
}
-static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p,
+static void *jk2_pool_alloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
void *rc = NULL;
@@ -228,13 +228,13 @@
#ifdef JK_DEBUG_POOL
printf("Dynamic alloc %d\n", pp->size );
#endif
- rc = jk_pool_dyn_alloc(env, p, size);
+ rc = jk2_pool_dyn_alloc(env, p, size);
}
return rc;
}
-static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,
+static void *jk2_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,
const void *old, size_t old_sz)
{
void *rc;
@@ -242,7 +242,7 @@
if(!p || (!old && old_sz)) {
return NULL;
}
- rc = jk_pool_alloc(env, p, sz);
+ rc = jk2_pool_alloc(env, p, sz);
if(rc==NULL)
return NULL;
@@ -250,7 +250,7 @@
return rc;
}
-static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
+static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
{
char *rc = NULL;
if(s && p) {
@@ -260,7 +260,7 @@
return "";
}
- rc = jk_pool_alloc(env, p, size+1);
+ rc = jk2_pool_alloc(env, p, size+1);
if(rc) {
memcpy(rc, s, size);
}
@@ -270,8 +270,8 @@
}
/*
- static void jk_dump_pool(jk_pool_t *p,
- FILE *f)
+ static void jk2_dump_pool(jk_pool_t *p,
+ FILE *f)
{
fprintf(f, "Dumping for pool [%p]\n", p);
fprintf(f, "size [%d]\n", p->size);
@@ -285,7 +285,7 @@
}
*/
-static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p, size_t size)
+static void *jk2_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p, size_t size)
{
void *rc = NULL;
@@ -320,7 +320,7 @@
/* Not used yet */
-int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
+int JK_METHOD jk2_pool_factory( jk_env_t *env, void **result,
char *type, char *name)
{
jk_pool_t *_this=(jk_pool_t *)calloc( 1, sizeof(jk_pool_t));
1.12 +19 -19 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_registry.c 26 Jan 2002 06:57:18 -0000 1.11
+++ jk_registry.c 21 Feb 2002 11:12:11 -0000 1.12
@@ -63,7 +63,7 @@
#include "jk_registry.h"
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.11 $ *
+ * Version: $Revision: 1.12 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -93,10 +93,10 @@
*
* For now the static registrartion should work.
*/
-void JK_METHOD jk_registry_init(jk_env_t *env) {
+void JK_METHOD jk2_registry_init(jk_env_t *env) {
if( env==NULL ) {
/* XXX do something ! */
- printf("jk_registry_init: Assertion failed, env==NULL\n" );
+ printf("jk2_registry_init: Assertion failed, env==NULL\n" );
return;
}
/**
@@ -105,34 +105,34 @@
* and because the MetroWerks compiler (used for NetWare) treats this as an
* error, I'm casting the function pointers to (void *) - mmanders
*/
- env->registerFactory( env, "logger", "file", jk_logger_file_factory );
- env->registerFactory( env, "workerEnv", "default", jk_workerEnv_factory );
- env->registerFactory( env, "uriMap", "default", jk_uriMap_factory );
- env->registerFactory( env, "worker", "ajp13", jk_worker_ajp14_factory );
- env->registerFactory( env, "worker", "ajp14", jk_worker_ajp14_factory );
- env->registerFactory( env, "worker", "lb", jk_worker_lb_factory );
- env->registerFactory( env, "worker", "status", jk_worker_status_factory );
- env->registerFactory( env, "worker", "run", jk_worker_run_factory );
+ env->registerFactory( env, "logger", "file", jk2_logger_file_factory );
+ env->registerFactory( env, "workerEnv", "default", jk2_workerEnv_factory );
+ env->registerFactory( env, "uriMap", "default", jk2_uriMap_factory );
+ env->registerFactory( env, "worker", "ajp13", jk2_worker_ajp14_factory );
+ env->registerFactory( env, "worker", "ajp14", jk2_worker_ajp14_factory );
+ env->registerFactory( env, "worker", "lb", jk2_worker_lb_factory );
+ env->registerFactory( env, "worker", "status", jk2_worker_status_factory );
+ env->registerFactory( env, "worker", "run", jk2_worker_run_factory );
#ifdef HAS_APR
env->registerFactory( env, "channel", "apr",
- jk_channel_apr_socket_factory );
+ jk2_channel_apr_socket_factory );
#endif
- env->registerFactory( env, "channel", "socket", jk_channel_socket_factory );
+ env->registerFactory( env, "channel", "socket", jk2_channel_socket_factory );
env->registerFactory( env, "handler", "response",
- jk_handler_response_factory );
- env->registerFactory( env, "handler", "logon", jk_handler_logon_factory );
+ jk2_handler_response_factory );
+ env->registerFactory( env, "handler", "logon", jk2_handler_logon_factory );
env->registerFactory( env, "handler", "discovery",
- jk_handler_discovery_factory );
+ jk2_handler_discovery_factory );
/* Optional objects */
#ifdef HAVE_JNI
- env->registerFactory( env, "worker", "jni", jk_worker_jni_factory );
- env->registerFactory( env, "channel","jni", jk_channel_jni_factory );
+ env->registerFactory( env, "worker", "jni", jk2_worker_jni_factory );
+ env->registerFactory( env, "channel","jni", jk2_channel_jni_factory );
#endif
#ifdef AJP12
- env->registerFactory( env, "worker", "ajp12", jk_worker_ajp12_factory );
+ env->registerFactory( env, "worker", "ajp12", jk2_worker_ajp12_factory );
#endif
1.7 +36 -36 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_registry.h 26 Jan 2002 07:07:41 -0000 1.6
+++ jk_registry.h 21 Feb 2002 11:12:11 -0000 1.7
@@ -62,7 +62,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -84,73 +84,73 @@
*
*/
-int JK_METHOD jk_worker_ajp14_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_worker_ajp14_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-
-int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
+
+int JK_METHOD jk2_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
-int JK_METHOD jk_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
+
+int JK_METHOD jk2_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
+
+int JK_METHOD jk2_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
/* Factories for 'new' types. We use the new factory interface,
* workers will be updated later
*/
#ifdef HAS_APR
-int JK_METHOD jk_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type,
const char *name);
#endif
-int JK_METHOD jk_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
-int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
- const char *type, const char *name);
+ const char *type, const
char *name);
-int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
-int JK_METHOD jk_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
+ const char *type, const char *name);
-int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
+int JK_METHOD jk2_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name);
-int JK_METHOD jk_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_logon_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_discovery_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-int JK_METHOD jk_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_response_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
