Author: rjung
Date: Wed Aug 23 11:26:56 2006
New Revision: 434119
URL: http://svn.apache.org/viewvc?rev=434119&view=rev
Log:
Change note names and symbols to make them more consistent.
Add a note with the worker type. More notes are to come.
Documentation of the notes is still missing but important.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_worker.c
tomcat/connectors/trunk/jk/native/common/jk_worker.h
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=434119&r1=434118&r2=434119&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Aug 23 11:26:56
2006
@@ -60,9 +60,10 @@
#include "jk_ajp13.h"
#include "jk_shm.h"
-#define JK_WORKER_ID ("jakarta.worker")
+#define JK_NOTE_WORKER_NAME ("JK_WORKER_NAME")
+#define JK_NOTE_WORKER_TYPE ("JK_WORKER_TYPE")
+#define JK_NOTE_REQUEST_DURATION ("JK_REQUEST_DURATION")
#define JK_HANDLER ("jakarta-servlet")
-#define JK_DURATION ("jakarta.worker.duration")
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet")
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
@@ -1071,13 +1072,13 @@
static const char *log_worker_name(request_rec * r, char *a)
{
- return ap_table_get(r->notes, JK_WORKER_ID);
+ return ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
}
static const char *log_request_duration(request_rec * r, char *a)
{
- return ap_table_get(r->notes, JK_DURATION);
+ return ap_table_get(r->notes, JK_NOTE_REQUEST_DURATION);
}
static const char *log_request_line(request_rec * r, char *a)
@@ -1711,7 +1712,7 @@
static int jk_handler(request_rec * r)
{
/* Retrieve the worker name stored by jk_translate() */
- const char *worker_name = ap_table_get(r->notes, JK_WORKER_ID);
+ const char *worker_name = ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
int rc;
if (r->proxyreq) {
@@ -1757,6 +1758,8 @@
s.retries = worker->retries;
s.ws_private = &private_data;
s.pool = &private_data.p;
+ ap_table_setn(r->notes, JK_NOTE_WORKER_TYPE,
+ wc_get_name_for_type(worker->type, l));
#ifndef NO_GETTIMEOFDAY
if (conf->format != NULL) {
gettimeofday(&tv_begin, NULL);
@@ -1799,7 +1802,7 @@
seconds = tv_end.tv_sec - tv_begin.tv_sec;
duration =
ap_psprintf(r->pool, "%.1ld.%.6ld", seconds, micro);
- ap_table_setn(r->notes, JK_DURATION, duration);
+ ap_table_setn(r->notes, JK_NOTE_REQUEST_DURATION,
duration);
request_log_transaction(r, conf);
}
#endif
@@ -2203,7 +2206,7 @@
if (worker) {
r->handler = ap_pstrdup(r->pool, JK_HANDLER);
- ap_table_setn(r->notes, JK_WORKER_ID, worker);
+ ap_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker);
}
else if (conf->alias_dir != NULL) {
/* Automatically map uri to a context static file */
@@ -2301,7 +2304,7 @@
if (r->main) {
jk_server_conf_t *conf = (jk_server_conf_t *)
ap_get_module_config(r->server->module_config, &jk_module);
- char *worker = (char *)ap_table_get(r->notes, JK_WORKER_ID);
+ char *worker = (char *)ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
/* Only if we have no worker and ForwardDirectories is set */
if (!worker && (conf->options & JK_OPT_FWDDIRS)) {
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=434119&r1=434118&r2=434119&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Aug 23 11:26:56
2006
@@ -108,9 +108,10 @@
#include "jk_worker.h"
#include "jk_shm.h"
-#define JK_WORKER_ID ("jakarta.worker")
+#define JK_NOTE_WORKER_NAME ("JK_WORKER_NAME")
+#define JK_NOTE_WORKER_TYPE ("JK_WORKER_TYPE")
+#define JK_NOTE_REQUEST_DURATION ("JK_REQUEST_DURATION")
#define JK_HANDLER ("jakarta-servlet")
-#define JK_DURATION ("jakarta.worker.duration")
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet")
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
@@ -1095,13 +1096,13 @@
static const char *log_worker_name(request_rec * r, char *a)
{
- return apr_table_get(r->notes, JK_WORKER_ID);
+ return apr_table_get(r->notes, JK_NOTE_WORKER_NAME);
}
static const char *log_request_duration(request_rec * r, char *a)
{
- return apr_table_get(r->notes, JK_DURATION);
+ return apr_table_get(r->notes, JK_NOTE_REQUEST_DURATION);
}
static const char *log_request_line(request_rec * r, char *a)
@@ -1790,7 +1791,7 @@
JK_TRACE_EXIT(xconf->log);
return DECLINED;
}
- worker_name = apr_table_get(r->notes, JK_WORKER_ID);
+ worker_name = apr_table_get(r->notes, JK_NOTE_WORKER_NAME);
/* Set up r->read_chunked flags for chunked encoding, if present */
if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) !=
APR_SUCCESS) {
@@ -1825,7 +1826,7 @@
}
}
if (worker_name)
- apr_table_setn(r->notes, JK_WORKER_ID, worker_name);
+ apr_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker_name);
}
if (JK_IS_DEBUG_LEVEL(xconf->log))
@@ -1876,6 +1877,8 @@
s.retries = worker->retries;
s.ws_private = &private_data;
s.pool = &private_data.p;
+ apr_table_setn(r->notes, JK_NOTE_WORKER_TYPE,
+ wc_get_name_for_type(worker->type, xconf->log));
#ifndef NO_GETTIMEOFDAY
if (xconf->format != NULL) {
gettimeofday(&tv_begin, NULL);
@@ -1941,7 +1944,7 @@
micro = tv_end.tv_usec - tv_begin.tv_usec;
seconds = tv_end.tv_sec - tv_begin.tv_sec;
duration = apr_psprintf(r->pool, "%.1ld.%.6ld", seconds,
micro);
- apr_table_setn(r->notes, JK_DURATION, duration);
+ apr_table_setn(r->notes, JK_NOTE_REQUEST_DURATION, duration);
request_log_transaction(r, xconf);
}
#endif
@@ -2532,14 +2535,14 @@
if (worker) {
r->handler = apr_pstrdup(r->pool, JK_HANDLER);
- apr_table_setn(r->notes, JK_WORKER_ID, worker);
+ apr_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker);
/* This could be a sub-request, possibly from mod_dir */
/* Also set the HANDLER and uri for subrequest */
if (r->main) {
r->main->handler = apr_pstrdup(r->main->pool, JK_HANDLER);
r->main->uri = apr_pstrdup(r->main->pool, r->uri);
- apr_table_setn(r->main->notes, JK_WORKER_ID, worker);
+ apr_table_setn(r->main->notes, JK_NOTE_WORKER_NAME,
worker);
}
return OK;
@@ -2644,7 +2647,7 @@
static int jk_map_to_storage(request_rec * r)
{
- if (!r->proxyreq && !apr_table_get(r->notes, JK_WORKER_ID)) {
+ if (!r->proxyreq && !apr_table_get(r->notes, JK_NOTE_WORKER_NAME)) {
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(r->server->
module_config,
@@ -2675,17 +2678,17 @@
if (worker) {
r->handler = apr_pstrdup(r->pool, JK_HANDLER);
- apr_table_setn(r->notes, JK_WORKER_ID, worker);
+ apr_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker);
/* This could be a sub-request, possibly from mod_dir */
if (r->main)
- apr_table_setn(r->main->notes, JK_WORKER_ID, worker);
+ apr_table_setn(r->main->notes, JK_NOTE_WORKER_NAME,
worker);
}
}
}
- if (apr_table_get(r->notes, JK_WORKER_ID)) {
+ if (apr_table_get(r->notes, JK_NOTE_WORKER_NAME)) {
/* First find just the name of the file, no directory */
r->filename = (char *)apr_filepath_name_get(r->uri);
Modified: tomcat/connectors/trunk/jk/native/common/jk_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_worker.c?rev=434119&r1=434118&r2=434119&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_worker.c Wed Aug 23 11:26:56
2006
@@ -279,6 +279,23 @@
return NULL;
}
+const char *wc_get_name_for_type(int type, jk_logger_t *l)
+{
+ worker_factory_record_t *factory = &worker_factories[0];
+ while (factory->name) {
+ if (type == factory->type) {
+ jk_log(l, JK_LOG_DEBUG,
+ "Found worker type '%s'",
+ factory->name);
+ return factory->name;
+ }
+
+ factory++;
+ }
+
+ return NULL;
+}
+
void wc_maintain(jk_logger_t *l)
{
static time_t last_maintain = 0;
Modified: tomcat/connectors/trunk/jk/native/common/jk_worker.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_worker.h?rev=434119&r1=434118&r2=434119&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_worker.h Wed Aug 23 11:26:56
2006
@@ -39,6 +39,8 @@
jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l);
+const char *wc_get_name_for_type(int type, jk_logger_t *l);
+
int wc_create_worker(const char *name, int use_map,
jk_map_t *init_data,
jk_worker_t **rc,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
