hgomez 02/02/21 03:13:59
Modified: jk/native2/common jk_workerEnv.c jk_worker_jni.c
jk_worker_run.c jk_worker_status.c
Log:
Sixth batch of renaming (how borred)
Revision Changes Path
1.16 +64 -64 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_workerEnv.c 6 Feb 2002 19:16:25 -0000 1.15
+++ jk_workerEnv.c 21 Feb 2002 11:13:59 -0000 1.16
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***************************************************************************/
#include "jk_workerEnv.h"
@@ -69,21 +69,21 @@
#define DEFAULT_WORKER ("ajp13")
-int JK_METHOD jk_workerEnv_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-static void jk_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this);
-static void jk_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this);
-static int jk_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this);
+static void jk2_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this);
+static void jk2_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this);
+static int jk2_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this);
-static int jk_workerEnv_init(jk_env_t *env, jk_workerEnv_t *workerEnv)
+static int jk2_workerEnv_init(jk_env_t *env, jk_workerEnv_t *workerEnv)
{
int err;
char *opt;
int options;
- opt=jk_map_getString( env, workerEnv->init_data, "workerFile", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "workerFile", NULL );
if( opt != NULL ) {
struct stat statbuf;
@@ -109,7 +109,7 @@
workerEnv->worker_file,
workerEnv->init_data->size(env, workerEnv->init_data) );
- err=jk_map_readFileProperties(env, workerEnv->init_data,
+ err=jk2_map_readFileProperties(env, workerEnv->init_data,
workerEnv->worker_file);
if( err==JK_TRUE ) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -123,7 +123,7 @@
}
}
- opt=jk_map_getString( env, workerEnv->init_data, "logLevel", "Error" );
+ opt=jk2_map_getString( env, workerEnv->init_data, "logLevel", "Error" );
if(0 == strcasecmp(opt, JK_LOG_INFO_VERB)) {
env->l->level=JK_LOG_INFO_LEVEL;
@@ -131,22 +131,22 @@
if(0 == strcasecmp(opt, JK_LOG_DEBUG_VERB)) {
env->l->level=JK_LOG_DEBUG_LEVEL;
}
- opt=jk_map_getString( env, workerEnv->init_data, "logFile", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "logFile", NULL );
env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk.init_jk()\n" );
env->l->open( env, env->l, workerEnv->init_data );
- opt=jk_map_getString( env, workerEnv->init_data, "sslEnable", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "sslEnable", NULL );
workerEnv->ssl_enable = JK_TRUE;
- opt=jk_map_getString( env, workerEnv->init_data, "httpsIndicator", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "httpsIndicator", NULL );
workerEnv->https_indicator = opt;
- opt=jk_map_getString( env, workerEnv->init_data, "certsIndicator", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "certsIndicator", NULL );
workerEnv->certs_indicator = opt;
- opt=jk_map_getString( env, workerEnv->init_data, "cipherIndicator", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "cipherIndicator", NULL );
workerEnv->cipher_indicator = opt;
- opt=jk_map_getString( env, workerEnv->init_data, "sessionIndicator", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "sessionIndicator", NULL );
workerEnv->session_indicator = opt;
- opt=jk_map_getString( env, workerEnv->init_data, "keySizeIndicator", NULL );
+ opt=jk2_map_getString( env, workerEnv->init_data, "keySizeIndicator", NULL );
workerEnv->key_size_indicator = opt;
/* Small change in how we treat options: we have a default,
@@ -154,25 +154,25 @@
of overriding the default ( "-Option == no option, leave the
default
*/
- if ( jk_map_getBool(env, workerEnv->init_data,
+ if ( jk2_map_getBool(env, workerEnv->init_data,
"ForwardKeySize", NULL)) {
workerEnv->options |= JK_OPT_FWDKEYSIZE;
- } else if(jk_map_getBool(env, workerEnv->init_data,
+ } else if(jk2_map_getBool(env, workerEnv->init_data,
"ForwardURICompat", NULL)) {
workerEnv->options &= ~JK_OPT_FWDURIMASK;
workerEnv->options |=JK_OPT_FWDURICOMPAT;
- } else if(jk_map_getBool(env, workerEnv->init_data,
+ } else if(jk2_map_getBool(env, workerEnv->init_data,
"ForwardURICompatUnparsed", NULL)) {
workerEnv->options &= ~JK_OPT_FWDURIMASK;
workerEnv->options |=JK_OPT_FWDURICOMPATUNPARSED;
- } else if (jk_map_getBool(env, workerEnv->init_data,
+ } else if (jk2_map_getBool(env, workerEnv->init_data,
"ForwardURIEscaped", NULL)) {
workerEnv->options &= ~JK_OPT_FWDURIMASK;
workerEnv->options |= JK_OPT_FWDURIESCAPED;
}
/* Init() - post-config initialization ( now all options are set ) */
- jk_workerEnv_init1( env, workerEnv );
+ jk2_workerEnv_init1( env, workerEnv );
err=workerEnv->uriMap->init(env, workerEnv->uriMap,
workerEnv,
@@ -185,7 +185,7 @@
*
* Replaces wc_open
*/
-static int jk_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this)
+static int jk2_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this)
{
jk_map_t *init_data=_this->init_data;
char **worker_list = NULL;
@@ -196,9 +196,9 @@
/* _this->init_data=init_data; */
- tmp = jk_map_getString(env, init_data, "worker.list",
+ tmp = jk2_map_getString(env, init_data, "worker.list",
DEFAULT_WORKER );
- worker_list=jk_map_split( env, init_data, init_data->pool,
+ worker_list=jk2_map_split( env, init_data, init_data->pool,
tmp, NULL, & declared_workers );
if(worker_list==NULL || declared_workers <= 0 ) {
@@ -224,7 +224,7 @@
}
}
- jk_workerEnv_initHandlers( env, _this );
+ jk2_workerEnv_initHandlers( env, _this );
env->l->jkLog(env, env->l, JK_LOG_INFO,
"workerEnv.init() %d workers, default %s\n",
@@ -233,7 +233,7 @@
}
-static void jk_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this)
+static void jk2_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this)
{
int sz;
int i;
@@ -255,9 +255,9 @@
_this->worker_map->clear(env, _this->worker_map);
}
-static jk_worker_t *jk_workerEnv_getWorkerForName(jk_env_t *env,
- jk_workerEnv_t *_this,
- const char *name )
+static jk_worker_t *jk2_workerEnv_getWorkerForName(jk_env_t *env,
+ jk_workerEnv_t *_this,
+ const char *name )
{
jk_worker_t * rc;
@@ -277,11 +277,11 @@
}
-static jk_webapp_t *jk_workerEnv_createWebapp(jk_env_t *env,
- jk_workerEnv_t *_this,
- const char *vhost,
- const char *name,
- jk_map_t *init_data)
+static jk_webapp_t *jk2_workerEnv_createWebapp(jk_env_t *env,
+ jk_workerEnv_t *_this,
+ const char *vhost,
+ const char *name,
+ jk_map_t *init_data)
{
jk_pool_t *webappPool;
jk_webapp_t *webapp;
@@ -312,8 +312,8 @@
}
-static void jk_workerEnv_checkSpace( jk_env_t *env, jk_pool_t *pool,
- void ***tableP, int *sizeP, int id )
+static void jk2_workerEnv_checkSpace(jk_env_t *env, jk_pool_t *pool,
+ void ***tableP, int *sizeP, int id)
{
void **newTable;
int i;
@@ -329,7 +329,7 @@
*sizeP=newSize;
}
-static void jk_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this)
+static void jk2_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this)
{
/* Find the max message id */
/* XXX accessing private data... env most provide some method to get this */
@@ -351,7 +351,7 @@
for( j=0; j< localHandlers->size( env, localHandlers ); j++ ) {
handler=(jk_handler_t *)localHandlers->valueAt( env, localHandlers,
j );
- jk_workerEnv_checkSpace( env, _this->pool,
+ jk2_workerEnv_checkSpace( env, _this->pool,
(void ***)&_this->handlerTable,
&_this->lastMessageId,
handler->messageId );
@@ -363,8 +363,8 @@
}
}
-static int jk_workerEnv_dispatch(jk_env_t *env, jk_workerEnv_t *_this,
- jk_endpoint_t *e, jk_ws_service_t *r )
+static int jk2_workerEnv_dispatch(jk_env_t *env, jk_workerEnv_t *_this,
+ jk_endpoint_t *e, jk_ws_service_t *r)
{
int code;
jk_handler_t *handler;
@@ -411,8 +411,8 @@
* In fact if tomcat link is broken during upload (browser ->apache ->tomcat)
* we'll loose data and we'll have to abort the whole request.
*/
-static int jk_workerEnv_processCallbacks(jk_env_t *env, jk_workerEnv_t *_this,
- jk_endpoint_t *e, jk_ws_service_t *r )
+static int jk2_workerEnv_processCallbacks(jk_env_t *env, jk_workerEnv_t *_this,
+ jk_endpoint_t *e, jk_ws_service_t *r )
{
int code;
jk_handler_t *handler;
@@ -441,7 +441,7 @@
/* e->reply->dump(env, e->reply, "Received "); */
- rc=jk_workerEnv_dispatch( env, _this, e, r );
+ rc=jk2_workerEnv_dispatch( env, _this, e, r );
/* Process the status code returned by handler */
switch( rc ) {
@@ -493,19 +493,19 @@
return JK_FALSE;
}
-static jk_worker_t *jk_workerEnv_releasePool(jk_env_t *env,
- jk_workerEnv_t *_this,
- const char *name,
- jk_map_t *init_data)
+static jk_worker_t *jk2_workerEnv_releasePool(jk_env_t *env,
+ jk_workerEnv_t *_this,
+ const char *name,
+ jk_map_t *init_data)
{
}
-static jk_worker_t *jk_workerEnv_createWorker(jk_env_t *env,
- jk_workerEnv_t *_this,
- const char *name,
- jk_map_t *init_data)
+static jk_worker_t *jk2_workerEnv_createWorker(jk_env_t *env,
+ jk_workerEnv_t *_this,
+ const char *name,
+ jk_map_t *init_data)
{
int err=JK_TRUE;
char *type;
@@ -525,7 +525,7 @@
workerPool=_this->pool->create(env, _this->pool, HUGE_POOL_SIZE);
- type=jk_map_getStrProp( env, init_data,"worker",name,"type",NULL );
+ type=jk2_map_getStrProp( env, init_data,"worker",name,"type",NULL );
/* Each worker has it's own pool */
if( type == NULL ) type="ajp13";
@@ -546,7 +546,7 @@
w->pool=workerPool;
w->workerEnv=_this;
- w->rPoolCache= jk_objCache_create( env, workerPool );
+ w->rPoolCache= jk2_objCache_create( env, workerPool );
err=w->rPoolCache->init( env, w->rPoolCache,
1024 ); /* XXX make it unbound */
@@ -591,7 +591,7 @@
return w;
}
-int JK_METHOD jk_workerEnv_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name)
{
@@ -606,7 +606,7 @@
*result=_this;
_this->init_data = NULL;
- jk_map_default_create(env, & _this->init_data, pool);
+ jk2_map_default_create(env, & _this->init_data, pool);
/* Add 'compile time' settings. Those are defined in jk_global,
with the other platform-specific settings. No need to ask
@@ -666,9 +666,9 @@
_this->secret_key = NULL;
_this->envvars_in_use = JK_FALSE;
- jk_map_default_create(env, &_this->envvars, pool);
+ jk2_map_default_create(env, &_this->envvars, pool);
- jk_map_default_create(env,&_this->worker_map, _this->pool);
+ jk2_map_default_create(env,&_this->worker_map, _this->pool);
uriMapPool = _this->pool->create(env, _this->pool, HUGE_POOL_SIZE);
@@ -684,13 +684,13 @@
_this->perThreadWorker=0;
/* methods */
- _this->init=&jk_workerEnv_init;
- _this->getWorkerForName=&jk_workerEnv_getWorkerForName;
- _this->close=&jk_workerEnv_close;
- _this->createWorker=&jk_workerEnv_createWorker;
- _this->createWebapp=&jk_workerEnv_createWebapp;
- _this->processCallbacks=&jk_workerEnv_processCallbacks;
- _this->dispatch=&jk_workerEnv_dispatch;
+ _this->init=&jk2_workerEnv_init;
+ _this->getWorkerForName=&jk2_workerEnv_getWorkerForName;
+ _this->close=&jk2_workerEnv_close;
+ _this->createWorker=&jk2_workerEnv_createWorker;
+ _this->createWebapp=&jk2_workerEnv_createWebapp;
+ _this->processCallbacks=&jk2_workerEnv_processCallbacks;
+ _this->dispatch=&jk2_workerEnv_dispatch;
_this->rootWebapp=_this->createWebapp( env, _this, NULL, "/", NULL );
1.3 +22 -22 jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Index: jk_worker_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_worker_jni.c 6 Feb 2002 19:20:41 -0000 1.2
+++ jk_worker_jni.c 21 Feb 2002 11:13:59 -0000 1.3
@@ -90,7 +90,7 @@
/** Static methods - much easier...
*/
-static int get_method_ids(jk_env_t *env, jni_worker_data_t *p, JNIEnv *jniEnv )
+static int jk2_get_method_ids(jk_env_t *env, jni_worker_data_t *p, JNIEnv *jniEnv )
{
p->jk_startup_method =
@@ -115,16 +115,16 @@
return JK_TRUE;
}
-static int JK_METHOD jni_worker_service(jk_env_t *env,
- jk_worker_t *w,
- jk_ws_service_t *s)
+static int JK_METHOD jk2_jni_worker_service(jk_env_t *env,
+ jk_worker_t *w,
+ jk_ws_service_t *s)
{
return JK_FALSE;
}
-static int JK_METHOD jni_worker_validate(jk_env_t *env, jk_worker_t *pThis,
- jk_map_t *props, jk_workerEnv_t *we)
+static int JK_METHOD jk2_jni_worker_validate(jk_env_t *env, jk_worker_t *pThis,
+ jk_map_t *props, jk_workerEnv_t *we)
{
jni_worker_data_t *jniWorker;
int mem_config = 0;
@@ -154,17 +154,17 @@
return JK_FALSE;
}
- jniWorker->className = jk_map_getStrProp( env, props, "worker",
+ jniWorker->className = jk2_map_getStrProp( env, props, "worker",
pThis->name,
"class", JAVA_BRIDGE_CLASS_NAME);
- jniWorker->tomcat_cmd_line = jk_map_getStrProp( env, props, "worker",
+ jniWorker->tomcat_cmd_line = jk2_map_getStrProp( env, props, "worker",
pThis->name,
"cmd_line", NULL );
- jniWorker->stdout_name= jk_map_getStrProp( env, props, "worker",
+ jniWorker->stdout_name= jk2_map_getStrProp( env, props, "worker",
pThis->name, "stdout", NULL );
- jniWorker->stderr_name= jk_map_getStrProp( env, props, "worker",
+ jniWorker->stderr_name= jk2_map_getStrProp( env, props, "worker",
pThis->name, "stderr", NULL );
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -208,7 +208,7 @@
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"Loaded %s\n", jniWorker->className);
- rc=get_method_ids(env, jniWorker, jniEnv);
+ rc=jk2_get_method_ids(env, jniWorker, jniEnv);
if( !rc ) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"Fail-> can't get method ids\n");
@@ -223,8 +223,8 @@
return JK_TRUE;
}
-static int JK_METHOD jni_worker_init(jk_env_t *env, jk_worker_t *_this,
- jk_map_t *props, jk_workerEnv_t *we)
+static int JK_METHOD jk2_jni_worker_init(jk_env_t *env, jk_worker_t *_this,
+ jk_map_t *props, jk_workerEnv_t *we)
{
jni_worker_data_t *jniWorker;
JNIEnv *jniEnv;
@@ -308,7 +308,7 @@
}
}
-static int JK_METHOD jni_worker_destroy(jk_env_t *env, jk_worker_t *_this)
+static int JK_METHOD jk2_jni_worker_destroy(jk_env_t *env, jk_worker_t *_this)
{
jni_worker_data_t *jniWorker;
JNIEnv *jniEnv;
@@ -349,9 +349,9 @@
return JK_TRUE;
}
-int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name)
+int JK_METHOD jk2_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name)
{
jk_worker_t *_this;
jni_worker_data_t *jniData;
@@ -381,7 +381,7 @@
_this->name = _this->pool->pstrdup(env, _this->pool, name);
/* XXX split it in VM11 and VM12 util */
- jk_vm_factory( env, pool, &jniData->vm, "vm", "default" );
+ jk2_jk_vm_factory( env, pool, &jniData->vm, "vm", "default" );
jniData->jk_java_bridge_class = NULL;
jniData->jk_startup_method = NULL;
@@ -391,10 +391,10 @@
jniData->stdout_name = NULL;
jniData->stderr_name = NULL;
- _this->validate = jni_worker_validate;
- _this->init = jni_worker_init;
- _this->destroy = jni_worker_destroy;
- _this->service = jni_worker_service;
+ _this->validate = jk2_jni_worker_validate;
+ _this->init = jk2_jni_worker_init;
+ _this->destroy = jk2_jni_worker_destroy;
+ _this->service = jk2_jni_worker_service;
*result = _this;
1.3 +8 -8 jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c
Index: jk_worker_run.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_worker_run.c 26 Jan 2002 06:59:45 -0000 1.2
+++ jk_worker_run.c 21 Feb 2002 11:13:59 -0000 1.3
@@ -72,8 +72,8 @@
#include "jk_requtil.h"
#include "jk_registry.h"
-static int JK_METHOD service(jk_env_t *env, jk_worker_t *_this,
- jk_ws_service_t *s )
+static int JK_METHOD jk2_worker_run_service(jk_env_t *env, jk_worker_t *_this,
+ jk_ws_service_t *s)
{
/* I should display a status page for the monitored processes
*/
@@ -91,7 +91,7 @@
return JK_TRUE;
}
-static int JK_METHOD destroy(jk_env_t *env, jk_worker_t *w)
+static int JK_METHOD jk2_worker_run_destroy(jk_env_t *env, jk_worker_t *w)
{
int i = 0;
@@ -107,9 +107,9 @@
}
-int JK_METHOD jk_worker_run_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)
{
jk_worker_t *_this;
@@ -130,13 +130,13 @@
_this->name=(char *)name;
_this->pool=pool;
- _this->lb_workers = NULL;
+ _this->lb_workers = NULL;
_this->num_of_workers = 0;
_this->worker_private = NULL;
_this->validate = NULL;
_this->init = NULL;
_this->destroy = NULL;
- _this->service = service;
+ _this->service = jk2_worker_run_service;
*result=_this;
1.5 +61 -61 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_worker_status.c 6 Feb 2002 19:16:56 -0000 1.4
+++ jk_worker_status.c 21 Feb 2002 11:13:59 -0000 1.5
@@ -88,7 +88,7 @@
void (*flush)( jk_env_t *env );
} jk_buff_t;
-static void jk_printf( jk_env_t *env, jk_buff_t *buf, char *fmt,... )
+static void jk2_printf(jk_env_t *env, jk_buff_t *buf, char *fmt, ...)
{
va_list vargs;
int ret=0;
@@ -102,17 +102,17 @@
/*fprintf(stderr, "Writing %d %s \n", ret, buf->buf); */
}
-static void jk_worker_status_displayWorkers( jk_env_t *env, jk_buff_t *buf,
- jk_workerEnv_t *wenv )
+static void jk2_worker_status_displayWorkers(jk_env_t *env, jk_buff_t *buf,
+ jk_workerEnv_t *wenv)
{
jk_map_t *map=wenv->worker_map;
int i;
int count=map->size( env, map );
- jk_printf(env, buf, "<H2>Active workers</H2>\n" );
- jk_printf(env, buf, "<table border>\n");
+ jk2_printf(env, buf, "<H2>Active workers</H2>\n" );
+ jk2_printf(env, buf, "<table border>\n");
- jk_printf(env, buf, "<tr><th>Name</th><th>Type</th>"
+ jk2_printf(env, buf, "<tr><th>Name</th><th>Type</th>"
"<th>Channel</th><th>Route</th>"
"<th>Error state</th><th>Recovery</th>"
"<th>Endpoint cache</th></tr>");
@@ -121,23 +121,23 @@
char *name=map->nameAt( env, map, i );
jk_worker_t *worker=(jk_worker_t *)map->valueAt( env, map,i );
- jk_printf(env, buf, "<tr><td>%s</td>", name );
- jk_printf(env, buf, "<td>%s</td>", worker->type );
+ jk2_printf(env, buf, "<tr><td>%s</td>", name );
+ jk2_printf(env, buf, "<td>%s</td>", worker->type );
if( worker->channel != NULL ) {
- jk_printf(env, buf, "<td>%s</td>",worker->channel->name );
+ jk2_printf(env, buf, "<td>%s</td>",worker->channel->name );
} else {
- jk_printf(env, buf, "<td> </td>" );
+ jk2_printf(env, buf, "<td> </td>" );
}
if( worker->route != NULL ) {
- jk_printf(env, buf, "<td>%s</td>",worker->route );
+ jk2_printf(env, buf, "<td>%s</td>",worker->route );
} else {
- jk_printf(env, buf, "<td> </td>" );
+ jk2_printf(env, buf, "<td> </td>" );
}
- jk_printf(env, buf, "<td class='in_error'>%d</td>",
+ jk2_printf(env, buf, "<td class='in_error'>%d</td>",
worker->in_error_state );
- jk_printf(env, buf, "<td class='in_recovering'>%d</td>",
+ jk2_printf(env, buf, "<td class='in_recovering'>%d</td>",
worker->in_recovering );
- jk_printf(env, buf, "<td class='epCount'>%d</td>",
+ jk2_printf(env, buf, "<td class='epCount'>%d</td>",
( worker->endpointCache == NULL ? 0 :
worker->endpointCache->count ));
@@ -145,87 +145,87 @@
/* special case for status worker */
- jk_printf(env, buf, "</tr>" );
+ jk2_printf(env, buf, "</tr>" );
}
- jk_printf(env, buf, "</table>\n");
+ jk2_printf(env, buf, "</table>\n");
}
-static void jk_worker_status_displayWorkerEnv( jk_env_t *env, jk_buff_t *buf,
- jk_workerEnv_t *wenv )
+static void jk2_worker_status_displayWorkerEnv(jk_env_t *env, jk_buff_t *buf,
+ jk_workerEnv_t *wenv)
{
jk_map_t *map=wenv->init_data;
int i;
- jk_printf(env, buf, "<H2>Worker Env Info</H2>\n");
+ jk2_printf(env, buf, "<H2>Worker Env Info</H2>\n");
- jk_printf(env, buf, "<table border>\n");
+ jk2_printf(env, buf, "<table border>\n");
/* Could be modified dynamically */
- jk_printf(env, buf, "<tr><th>LogLevel</th>"
+ jk2_printf(env, buf, "<tr><th>LogLevel</th>"
"<td id='logLevel'>%d</td></tr>\n",
wenv->log_level);
- jk_printf(env, buf, "</table>\n");
+ jk2_printf(env, buf, "</table>\n");
- jk_printf(env, buf, "<H3>Properties</H3>\n");
- jk_printf(env, buf, "<table border>\n");
- jk_printf(env, buf, "<tr><th>Name</th><th>Value</td></tr>\n");
+ jk2_printf(env, buf, "<H3>Properties</H3>\n");
+ jk2_printf(env, buf, "<table border>\n");
+ jk2_printf(env, buf, "<tr><th>Name</th><th>Value</td></tr>\n");
for( i=0; i< map->size( env, map ) ; i++ ) {
char *name=map->nameAt( env, map, i );
char *value=(char *)map->valueAt( env, map,i );
- jk_printf(env, buf, "<tr><td>%s</td><td>%s</td></tr>", name,
+ jk2_printf(env, buf, "<tr><td>%s</td><td>%s</td></tr>", name,
value);
}
- jk_printf(env, buf, "</table>\n");
+ jk2_printf(env, buf, "</table>\n");
}
-static void jk_worker_status_displayWebapps( jk_env_t *env, jk_buff_t *buf,
- jk_workerEnv_t *wenv )
+static void jk2_worker_status_displayWebapps(jk_env_t *env, jk_buff_t *buf,
+ jk_workerEnv_t *wenv)
{
jk_map_t *map=wenv->webapps;
int i;
- jk_printf(env, buf, "<H2>Webapps</H2>\n");
+ jk2_printf(env, buf, "<H2>Webapps</H2>\n");
if( map==NULL ) {
- jk_printf(env, buf, "None\n");
+ jk2_printf(env, buf, "None\n");
return;
}
- jk_printf(env, buf, "<table border>\n");
+ jk2_printf(env, buf, "<table border>\n");
- jk_printf(env, buf, "<tr><th>Name</th><th>DocBase</th>"
+ jk2_printf(env, buf, "<tr><th>Name</th><th>DocBase</th>"
"<th>Mappings</th></tr>");
for( i=0; i< map->size( env, map ) ; i++ ) {
char *name=map->nameAt( env, map, i );
jk_webapp_t *webapp=(jk_webapp_t *)map->valueAt( env, map,i );
- jk_printf(env, buf, "<tr id='webapp.%s'>", name );
- jk_printf(env, buf, "<td class='name'>%s</td>", name );
- jk_printf(env, buf, "</tr>" );
+ jk2_printf(env, buf, "<tr id='webapp.%s'>", name );
+ jk2_printf(env, buf, "<td class='name'>%s</td>", name );
+ jk2_printf(env, buf, "</tr>" );
}
- jk_printf(env, buf, "</table>\n");
+ jk2_printf(env, buf, "</table>\n");
}
/* Channels and connections, including 'pooled' ones
*/
-static void jk_worker_status_displayConnections( jk_env_t *env, jk_buff_t *buf,
- jk_workerEnv_t *wenv )
+static void jk2_worker_status_displayConnections(jk_env_t *env, jk_buff_t *buf,
+ jk_workerEnv_t *wenv)
{
- jk_printf(env, buf, "<H2>Active connections</H2>\n");
- jk_printf(env, buf, "<table border>\n");
+ jk2_printf(env, buf, "<H2>Active connections</H2>\n");
+ jk2_printf(env, buf, "<table border>\n");
- jk_printf(env, buf, "</table>\n");
+ jk2_printf(env, buf, "</table>\n");
}
-static jk_buff_t *jk_worker_status_createBuffer(jk_env_t *env,
- jk_ws_service_t *s)
+static jk_buff_t *jk2_worker_status_createBuffer(jk_env_t *env,
+ jk_ws_service_t *s)
{
jk_buff_t *buff;
int bsize=JK_BUF_SIZE;
@@ -235,16 +235,16 @@
buff->s=s;
buff->size=bsize;
buff->buf=(char *)s->pool->alloc( env, s->pool, bsize );
- buff->jkprintf=jk_printf;
+ buff->jkprintf=jk2_printf;
return buff;
}
-static int JK_METHOD service(jk_env_t *env,
- jk_worker_t *w,
- jk_ws_service_t *s)
+static int JK_METHOD jk2_worker_status_service(jk_env_t *env,
+ jk_worker_t *w,
+ jk_ws_service_t *s)
{
- jk_buff_t *buff=jk_worker_status_createBuffer(env, s );
+ jk_buff_t *buff=jk2_worker_status_createBuffer(env, s );
env->l->jkLog(env, env->l, JK_LOG_INFO, "status.service()\n");
@@ -258,10 +258,10 @@
s->head(env, s );
/* Body */
- jk_worker_status_displayWorkerEnv(env, buff, s->workerEnv );
- jk_worker_status_displayWorkers(env, buff, s->workerEnv );
- jk_worker_status_displayWebapps(env, buff, s->workerEnv );
- jk_worker_status_displayConnections(env, buff, s->workerEnv );
+ jk2_worker_status_displayWorkerEnv(env, buff, s->workerEnv );
+ jk2_worker_status_displayWorkers(env, buff, s->workerEnv );
+ jk2_worker_status_displayWebapps(env, buff, s->workerEnv );
+ jk2_worker_status_displayConnections(env, buff, s->workerEnv );
s->afterRequest( env, s);
fprintf(stderr, "After req %s \n", buff);
@@ -269,9 +269,9 @@
}
-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_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
+ void **result,
+ const char *type, const char *name)
{
jk_worker_t *_this;
@@ -289,10 +289,10 @@
return JK_FALSE;
}
- _this->name=(char *)name;
- _this->pool=pool;
+ _this->name = (char *)name;
+ _this->pool = pool;
- _this->lb_workers = NULL;
+ _this->lb_workers = NULL;
_this->num_of_workers = 0;
_this->worker_private = NULL;
@@ -300,7 +300,7 @@
_this->init = NULL;
_this->destroy = NULL;
- _this->service = service;
+ _this->service = jk2_worker_status_service;
*result=_this;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
