cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_shm.c jk_shm.h jk_status.c
mturk 2005/09/15 22:52:26
Modified:jk/native/common jk_lb_worker.c jk_shm.c jk_shm.h
jk_status.c
Log:
Fix bug #36525 by properly aligning shared memory header struct.
This patch was provided and investigated by Rainer Jung. Thaks!
Also bring back 64 bit sizes, because the problem was not with them,
but rather they've cause different struct alignment.
Revision ChangesPath
1.94 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- jk_lb_worker.c14 Sep 2005 06:50:14 - 1.93
+++ jk_lb_worker.c16 Sep 2005 05:52:26 - 1.94
@@ -225,8 +225,8 @@
{
unsigned int i;
int total_factor = 0;
-size_t mytraffic = 0;
-size_t curmin = 0;
+jk_u64_t mytraffic = 0;
+jk_u64_t curmin = 0;
worker_record_t *candidate = NULL;
if (p->lblock == JK_LB_LOCK_PESSIMISTIC)
@@ -328,8 +328,8 @@
jk_logger_t *l)
{
unsigned int i;
-size_t mytraffic = 0;
-size_t curmin = 0;
+jk_u64_t mytraffic = 0;
+jk_u64_t curmin = 0;
worker_record_t *candidate = NULL;
double diff;
time_t now = time(NULL);
1.20 +33 -22jakarta-tomcat-connectors/jk/native/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_shm.c 12 Sep 2005 12:53:05 - 1.19
+++ jk_shm.c 16 Sep 2005 05:52:26 - 1.20
@@ -26,8 +26,8 @@
#include "jk_mt.h"
#include "jk_shm.h"
-/** jk shm header record structure */
-struct jk_shm_header
+/** jk shm header core data structure */
+struct jk_shm_header_data
{
/* Shared memory magic JK_SHM_MAGIC */
char magic[8];
@@ -36,6 +36,17 @@
unsigned int childs;
unsigned int workers;
time_t modified;
+};
+
+typedef struct jk_shm_header_data jk_shm_header_data_t;
+
+/** jk shm header record structure */
+struct jk_shm_header
+{
+union {
+jk_shm_header_data_t data;
+char alignbuf[JK_SHM_ALIGN(sizeof(jk_shm_header_data_t))];
+};
char buf[1];
};
@@ -116,13 +127,13 @@
jk_shmem.filename = "memory";
jk_shmem.fd = 0;
jk_shmem.attached = 0;
-memcpy(jk_shmem.hdr->magic, shm_signature, 8);
-jk_shmem.hdr->size = sz;
+memcpy(jk_shmem.hdr->data.magic, shm_signature, 8);
+jk_shmem.hdr->data.size = sz;
JK_INIT_CS(&(jk_shmem.cs), rc);
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Initialized shared memory size=%u free=%u addr=%#lx",
- jk_shmem.size, jk_shmem.hdr->size, jk_shmem.hdr);
+ jk_shmem.size, jk_shmem.hdr->data.size, jk_shmem.hdr);
JK_TRACE_EXIT(l);
return 0;
}
@@ -132,12 +143,12 @@
JK_TRACE_ENTER(l);
if (!jk_shm_open(fname, sz, l)) {
jk_shmem.attached = 1;
-jk_shmem.hdr->childs++;
+jk_shmem.hdr->data.childs++;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Attached shared memory [%d] size=%u free=%u addr=%#lx",
- jk_shmem.hdr->childs, jk_shmem.hdr->size,
- jk_shmem.hdr->size - jk_shmem.hdr->pos,
+ jk_shmem.hdr->data.childs, jk_shmem.hdr->data.size,
+ jk_shmem.hdr->data.size - jk_shmem.hdr->data.pos,
jk_shmem.hdr);
JK_TRACE_EXIT(l);
return 0;
@@ -306,20 +317,20 @@
/* Clear shared memory */
if (!attached) {
memset(jk_shmem.hdr, 0, jk_shmem.size);
-memcpy(jk_shmem.hdr->magic, shm_signature, 8);
-jk_shmem.hdr->size = sz;
+memcpy(jk_shmem.hdr->data.magic, shm_signature, 8);
+jk_shmem.hdr->data.size = sz;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Initialized shared memory size=%u free=%u addr=%#lx",
- jk_shmem.size, jk_shmem.hdr->size, jk_shmem.hdr);
+ jk_shmem.size, jk_shmem.hdr->data.size, jk_shmem.hdr);
}
else {
-jk_shmem.hdr->childs++;
+jk_shmem.hdr->data.childs++;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_INFO,
"Attac
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c
mturk 2005/09/17 04:19:47
Modified:jk/native/common jk_shm.c
Log:
Use named union for shm header. Some compilers have problems
comiling unnamed unions as struct members.
Revision ChangesPath
1.21 +21 -21jakarta-tomcat-connectors/jk/native/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_shm.c 16 Sep 2005 05:52:26 - 1.20
+++ jk_shm.c 17 Sep 2005 11:19:47 - 1.21
@@ -46,7 +46,7 @@
union {
jk_shm_header_data_t data;
char alignbuf[JK_SHM_ALIGN(sizeof(jk_shm_header_data_t))];
-};
+} h;
char buf[1];
};
@@ -127,13 +127,13 @@
jk_shmem.filename = "memory";
jk_shmem.fd = 0;
jk_shmem.attached = 0;
-memcpy(jk_shmem.hdr->data.magic, shm_signature, 8);
-jk_shmem.hdr->data.size = sz;
+memcpy(jk_shmem.hdr->h.data.magic, shm_signature, 8);
+jk_shmem.hdr->h.data.size = sz;
JK_INIT_CS(&(jk_shmem.cs), rc);
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Initialized shared memory size=%u free=%u addr=%#lx",
- jk_shmem.size, jk_shmem.hdr->data.size, jk_shmem.hdr);
+ jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
JK_TRACE_EXIT(l);
return 0;
}
@@ -143,12 +143,12 @@
JK_TRACE_ENTER(l);
if (!jk_shm_open(fname, sz, l)) {
jk_shmem.attached = 1;
-jk_shmem.hdr->data.childs++;
+jk_shmem.hdr->h.data.childs++;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Attached shared memory [%d] size=%u free=%u addr=%#lx",
- jk_shmem.hdr->data.childs, jk_shmem.hdr->data.size,
- jk_shmem.hdr->data.size - jk_shmem.hdr->data.pos,
+ jk_shmem.hdr->h.data.childs, jk_shmem.hdr->h.data.size,
+ jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
JK_TRACE_EXIT(l);
return 0;
@@ -317,20 +317,20 @@
/* Clear shared memory */
if (!attached) {
memset(jk_shmem.hdr, 0, jk_shmem.size);
-memcpy(jk_shmem.hdr->data.magic, shm_signature, 8);
-jk_shmem.hdr->data.size = sz;
+memcpy(jk_shmem.hdr->h.data.magic, shm_signature, 8);
+jk_shmem.hdr->h.data.size = sz;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Initialized shared memory size=%u free=%u addr=%#lx",
- jk_shmem.size, jk_shmem.hdr->data.size, jk_shmem.hdr);
+ jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
}
else {
-jk_shmem.hdr->data.childs++;
+jk_shmem.hdr->h.data.childs++;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_INFO,
"Attached shared memory [%d] size=%u free=%u addr=%#lx",
- jk_shmem.hdr->data.childs, jk_shmem.hdr->data.size,
- jk_shmem.hdr->data.size - jk_shmem.hdr->data.pos,
+ jk_shmem.hdr->h.data.childs, jk_shmem.hdr->h.data.size,
+ jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
/* TODO: check header magic */
}
@@ -387,9 +387,9 @@
if (jk_shmem.hdr) {
size = JK_ALIGN_DEFAULT(size);
-if ((jk_shmem.hdr->data.size - jk_shmem.hdr->data.pos) >= size) {
-rc = &(jk_shmem.hdr->buf[jk_shmem.hdr->data.pos]);
-jk_shmem.hdr->data.pos += size;
+if ((jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos) >= size) {
+rc = &(jk_shmem.hdr->buf[jk_shmem.hdr->h.data.pos]);
+jk_shmem.hdr->h.data.pos += size;
}
}
else if (p)
@@ -407,7 +407,7 @@
time_t jk_shm_get_workers_time()
{
if (jk_shmem.hdr)
-return jk_shmem.hdr->data.modified;
+return jk_shmem.hdr->h.data.modified;
else
return jk_workers_modified_time;
}
@@ -415,7 +415,7 @@
void jk_shm_set_workers_time(time_t t)
{
if (jk_shmem.hdr)
-jk_shmem.hdr->data.modified = t;
+jk_shmem.hdr->h.data.modified = t;
else
jk_workers_modified_time = t;
jk_workers_access_time = t;
@@ -461,8 +461,8 @@
if (w) {
memset(w, 0, sizeof(jk_shm_worker_t));
if (jk_shmem.hdr) {
-jk_shmem.hdr->data.workers
cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
mturk 2005/09/22 23:35:10
Modified:jk/native/iis jk_isapi_plugin.c
Log:
Use simple Translate header for multiple instances.
Patch provided by Tim Whittington fixes #35298.
Revision ChangesPath
1.54 +7 -4 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_isapi_plugin.c 14 Sep 2005 10:52:43 - 1.53
+++ jk_isapi_plugin.c 23 Sep 2005 06:35:10 - 1.54
@@ -79,6 +79,10 @@
#define URI_SELECT_UNPARSED_VERB("unparsed")
#define URI_SELECT_ESCAPED_VERB ("escaped")
+#define TRANSLATE_HEADER ("Translate:")
+#define TRANSLATE_HEADER_NAME ("Translate")
+#define TRANSLATE_HEADER_NAME_LC ("translate")
+
#define BAD_REQUEST -1
#define BAD_PATH-2
#define MAX_SERVERNAME 128
@@ -907,7 +911,7 @@
* This allows the servlet to handle 'Translate: f'.
*/
if (GetHeader
-(pfc, "Translate:", (LPVOID) Translate,
+(pfc, TRANSLATE_HEADER, (LPVOID) Translate,
(LPDWORD) & szTranslate) && Translate != NULL
&& szTranslate > 0) {
if (!AddHeader
@@ -1555,8 +1559,7 @@
}
else if (!strnicmp(tmp, TOMCAT_TRANSLATE_HEADER_NAME,
strlen(TOMCAT_TRANSLATE_HEADER_NAME))) {
-tmp += 6; /* TOMCAT */
-s->headers_names[i] = tmp;
+s->headers_names[i] = TRANSLATE_HEADER_NAME_LC;
}
else {
s->headers_names[i] = tmp;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
mturk 2005/09/22 23:54:16
Modified:jk/native/iis jk_isapi_plugin.c
Log:
Remove temporary HTTP_TOMCATQUERY header from
ALL_HTTP. Patch provided by Tim Whittington that fixes #36765
Revision ChangesPath
1.55 +13 -2 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- jk_isapi_plugin.c 23 Sep 2005 06:35:10 - 1.54
+++ jk_isapi_plugin.c 23 Sep 2005 06:54:16 - 1.55
@@ -1529,7 +1529,10 @@
size_t len_of_http_prefix = strlen("HTTP_");
BOOL need_content_length_header = (s->content_length == 0);
-cnt -= 2; /* For our two special headers */
+cnt -= 2; /* For our two special headers:
+ * HTTP_TOMCATURI_
+ * HTTP_TOMCATWORKER_
+ */
/* allocate an extra header slot in case we need to add a
content-length header */
s->headers_names =
jk_pool_alloc(&private_data->p, (cnt + 1) * sizeof(char *));
@@ -1551,6 +1554,14 @@
strlen(WORKER_HEADER_NAME))) {
real_header = JK_FALSE;
}
+else if (!strnicmp(tmp, QUERY_HEADER_NAME,
+ strlen(QUERY_HEADER_NAME))) {
+/* HTTP_TOMCATQUERY_ was supplied,
+ * remove it from the count and skip
+ */
+cnt--;
+real_header = JK_FALSE;
+}
else if (need_content_length_header &&
!strnicmp(tmp, CONTENT_LENGTH,
strlen(CONTENT_LENGTH))) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/09/23 00:18:21
Modified:jk/native/common jk_lb_worker.c
Log:
Fix loadbalancer retries to allow usage of cachesize lower then
number of threads. In case the worker is busy having no free endpoints,
and the retries config value is larger the total number of workers in load
balancer, for each consequitive attempt sleep for a 100 ms, rather then
returning 503.
Revision ChangesPath
1.95 +11 -10jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- jk_lb_worker.c16 Sep 2005 05:52:26 - 1.94
+++ jk_lb_worker.c23 Sep 2005 07:18:21 - 1.95
@@ -595,7 +595,7 @@
while (num_of_workers) {
worker_record_t *rec =
-get_most_suitable_worker(p->worker, s, attempt++, l);
+get_most_suitable_worker(p->worker, s, attempt, l);
int rc;
/* Do not reuse previous worker, because
* that worker already failed.
@@ -650,20 +650,21 @@
else {
/* If we can not get the endpoint
* mark the worker as busy rather then
- * as in error
+ * as in error if the attemp number is
+ * greater then the number of retries.
*/
-if (p->worker->s->retries < num_of_workers)
+attempt++;
+if (attempt > p->worker->s->retries) {
rec->s->is_busy = JK_TRUE;
+num_of_workers = 0;
+}
jk_log(l, JK_LOG_INFO,
"could not get free endpoint for worker %s
(attempt %d)",
rec->s->name, attempt);
-/* Decrement the worker count and try another worker */
-if (attempt > p->worker->s->retries)
-num_of_workers = 0;
-/* In case of retries > 3 sleep 100 ms
- * on each next attempt.
+/* In case of attempt > num of workers sleep for 100 ms
+ * on each consequtive attempt.
*/
-else if (attempt > JK_RETRIES)
+if (attempt > p->worker->num_of_workers)
jk_sleep_def();
continue;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/09/23 00:32:24
Modified:jk/native/common jk_lb_worker.c
Log:
Fix compile time warnings. No functional change.
Revision ChangesPath
1.96 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- jk_lb_worker.c23 Sep 2005 07:18:21 - 1.95
+++ jk_lb_worker.c23 Sep 2005 07:32:24 - 1.96
@@ -126,8 +126,8 @@
result = id_start;
}
else {
-int osz = strlen(result) + 1;
-int sz = osz + strlen(id_start) + 1;
+size_t osz = strlen(result) + 1;
+size_t sz = osz + strlen(id_start) + 1;
result =
jk_pool_realloc(s->pool, sz, result, osz);
strcat(result, ";");
@@ -664,7 +664,7 @@
/* In case of attempt > num of workers sleep for 100 ms
* on each consequtive attempt.
*/
-if (attempt > p->worker->num_of_workers)
+if (attempt > (int)p->worker->num_of_workers)
jk_sleep_def();
continue;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/09/23 00:57:28
Modified:jk/native/common jk_status.c
Log:
Added cmd=reset status command without web interface that
will reset all workers in selected load balancer and reset their
runtime data. This is usefull for cron jobs to skip the need to
cold restart apache.
Revision ChangesPath
1.47 +43 -2 jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- jk_status.c 16 Sep 2005 05:52:26 - 1.46
+++ jk_status.c 23 Sep 2005 07:57:28 - 1.47
@@ -738,6 +738,32 @@
}
}
+static void reset_worker(jk_ws_service_t *s, status_worker_t *sw,
+ const char *dworker, jk_logger_t *l)
+{
+unsigned int i;
+lb_worker_t *lb;
+jk_worker_t *w = wc_get_worker_for_name(dworker, l);
+
+if (w && w->type == JK_LB_WORKER_TYPE) {
+lb = (lb_worker_t *)w->worker_private;
+for (i = 0; i < lb->num_of_workers; i++) {
+worker_record_t *wr = &(lb->lb_workers[i]);
+wr->s->busy = 0;
+wr->s->elected = 0;
+wr->s->error_time = 0;
+wr->s->errors = 0;
+wr->s->lb_value = 0;
+wr->s->max_busy = 0;
+wr->s->readed = 0;
+wr->s->transferred = 0;
+wr->s->is_busy = JK_FALSE;
+wr->s->in_error_state = JK_FALSE;
+wr->s->in_recovering= JK_FALSE;
+}
+}
+}
+
static int status_cmd_type(const char *req)
{
if (!req)
@@ -748,6 +774,8 @@
return 1;
else if (!strncmp(req, "cmd=update", 10))
return 2;
+else if (!strncmp(req, "cmd=reset", 9))
+return 3;
else
return 0;
}
@@ -800,7 +828,20 @@
/* unlock the shared memory */
jk_shm_unlock();
}
-if(mime == 0) {
+else if ((cmd == 3) && worker) {
+/* lock shared memory */
+jk_shm_lock();
+reset_worker(s, p->s_worker, worker, l);
+/* update modification time to reflect the current config */
+jk_shm_set_workers_time(time(NULL));
+/* Since we updated the config no need to reload
+ * on the next request
+ */
+jk_shm_sync_access_time();
+/* unlock the shared memory */
+jk_shm_unlock();
+}
+if (mime == 0) {
s->start_response(s, 200, "OK", headers_names, headers_vhtml, 3);
s->write(s, JK_STATUS_HEAD, sizeof(JK_STATUS_HEAD) - 1);
if (p->s_worker->css) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_version.h
mturk 2005/09/23 04:44:44 Modified:jk/native/common jk_version.h Log: Bump the release version Revision ChangesPath 1.46 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- jk_version.h 26 Jul 2005 16:04:10 - 1.45 +++ jk_version.h 23 Sep 2005 11:44:44 - 1.46 @@ -32,7 +32,7 @@ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.h
mturk 2005/09/23 04:49:04 Modified:jk/native/common jk_connect.h Log: Fix compile time warning Revision ChangesPath 1.17 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.h Index: jk_connect.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_connect.h 14 Sep 2005 06:45:00 - 1.16 +++ jk_connect.h 23 Sep 2005 11:49:03 - 1.17 @@ -55,7 +55,7 @@ int jk_is_socket_connected(int sd); -void jk_sleep_def(); +void jk_sleep_def(void); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_version.h
mturk 2005/09/23 04:51:51 Modified:jk/native/common jk_version.h Log: Bump to 1.2.16-dev verion. We are ready for SVN transition. Revision ChangesPath 1.47 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- jk_version.h 23 Sep 2005 11:44:44 - 1.46 +++ jk_version.h 23 Sep 2005 11:51:50 - 1.47 @@ -25,14 +25,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 -#define JK_VERFIX 15 -#define JK_VERSTRING"1.2.15" +#define JK_VERFIX 16 +#define JK_VERSTRING"1.2.16" /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2002/06/22 22:40:29 Modified:jk/native/apache-2.0 mod_jk.c Log: Fixing the compile time warning: 'jk_apr_pool_cleanup' function must return a value Revision ChangesPath 1.46 +2 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mod_jk.c 12 Jun 2002 14:31:09 - 1.45 +++ mod_jk.c 23 Jun 2002 05:40:29 - 1.46 @@ -1359,6 +1359,7 @@ } s = s->next; } + return APR_SUCCESS; } /** Create default jk_config. XXX This is mostly server-independent, -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
mturk 2002/06/22 23:55:56
Modified:jk/native2/common jk_channel_socket.c
Log:
Costin changed it to use read/write instead of send/receive.
Unfortunaly that doesn't work on WIN32 cause read/write cannot operate on sockets.
Perhaps we shoud reverse that unless there is a strong reason to use the
read/write on unix.
Revision ChangesPath
1.35 +20 -2 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_channel_socket.c 20 Jun 2002 18:45:01 - 1.34
+++ jk_channel_socket.c 23 Jun 2002 06:55:55 - 1.35
@@ -355,9 +355,13 @@
len=msg->len;
b=msg->buf;
-
+
while(sent < len) {
+#ifdef WIN32
+int this_time = send(sd, (char *)b + sent , len - sent, 0);
+#else
int this_time = write(sd, (char *)b + sent , len - sent);
+#endif
if(0 == this_time) {
return -2;
}
@@ -393,9 +397,16 @@
if( sd<0 ) return JK_ERR;
while(rdlen < len) {
+#ifdef WIN32
+ /* WIN32 read cannot operate on sockets */
+ int this_time = recv(sd,
+ (char *)b + rdlen,
+ len - rdlen, 0);
+#else
int this_time = read(sd,
(char *)b + rdlen,
len - rdlen);
+#endif
if(-1 == this_time) {
#ifdef WIN32
if(SOCKET_ERROR == this_time) {
@@ -430,9 +441,16 @@
if( sd<0 ) return JK_ERR;
while(rdlen < minLen ) {
+#ifdef WIN32
+ /* WIN32 read cannot operate on sockets */
+ int this_time = recv(sd,
+ (char *)b + rdlen,
+ maxLen - rdlen, 0);
+#else
int this_time = read(sd,
(char *)b + rdlen,
- maxLen - rdlen);
+ maxLen - rdlen);
+#endif
/* fprintf(stderr, "XXX received %d\n", this_time ); */
if(-1 == this_time) {
#ifdef WIN32
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.h
mturk 2002/06/25 00:06:19 Modified:jk/native/common jk_util.h Log: Introduced socket and cache timeout. By Jan Singer, Henri Gomez and Mladen Turk. Revision ChangesPath 1.7 +21 -9 jakarta-tomcat-connectors/jk/native/common/jk_util.h Index: jk_util.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_util.h 15 May 2002 21:00:29 - 1.6 +++ jk_util.h 25 Jun 2002 07:06:18 - 1.7 @@ -86,14 +86,14 @@ /* [V] Two general purpose functions. Should ease the function bloat. */ int jk_get_worker_str_prop(jk_map_t *m, -const char *wname, -const char *pname, -char **prop); + const char *wname, + const char *pname, + char **prop); int jk_get_worker_int_prop(jk_map_t *m, -const char *wname, -const char *pname, -int *prop); + const char *wname, + const char *pname, + int *prop); char *jk_get_worker_host(jk_map_t *m, const char *wname, @@ -110,6 +110,18 @@ const char *wname, int def); +int jk_get_worker_socket_timeout(jk_map_t *m, + const char *wname, + int def); + +int jk_get_worker_socket_keepalive(jk_map_t *m, + const char *wname, + int def); + +int jk_get_worker_cache_timeout(jk_map_t *m, + const char *wname, + int def); + char * jk_get_worker_secret_key(jk_map_t *m, const char *wname); @@ -123,10 +135,10 @@ const char *wname); int jk_get_is_local_worker(jk_map_t *m, -const char *wname); + const char *wname); int jk_get_is_local_worker_only_flag(jk_map_t *m, - const char *lb_wname); + const char *lb_wname); int jk_get_lb_worker_list(jk_map_t *m, const char *lb_wname, -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2002/06/25 00:06:42
Modified:jk/native/common jk_util.c
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.16 +80 -31jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_util.c 21 Jun 2002 15:28:56 - 1.15
+++ jk_util.c 25 Jun 2002 07:06:42 - 1.16
@@ -83,6 +83,9 @@
#define PORT_OF_WORKER ("port")
#define TYPE_OF_WORKER ("type")
#define CACHE_OF_WORKER ("cachesize")
+#define CACHE_TIMEOUT_OF_WORKER ("cache_timeout")
+#define SOCKET_TIMEOUT_OF_WORKER("socket_timeout")
+#define SOCKET_KEEPALIVE_OF_WORKER ("socket_keepalive")
#define LOAD_FACTOR_OF_WORKER ("lbfactor")
#define BALANCED_WORKERS("balanced_workers")
#define LOCAL_WORKER_ONLY_FLAG ("local_worker_only")
@@ -94,7 +97,7 @@
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME ("worker.list")
#define DEFAULT_LB_FACTOR (1.0)
-#define LOG_FORMAT ("log_format")
+#define LOG_FORMAT ("log_format")
#define HUGE_BUFFER_SIZE (8*1024)
#define LOG_LINE_SIZE(1024)
@@ -118,11 +121,11 @@
static void set_time_str(char * str, int len)
{
- time_t t = time(NULL);
- struct tm *tms;
+time_t t = time(NULL);
+struct tm *tms;
- tms = localtime(&t);
- strftime(str, len, jk_log_fmt, tms);
+tms = localtime(&t);
+strftime(str, len, jk_log_fmt, tms);
}
static int JK_METHOD log_to_file(jk_logger_t *l,
@@ -136,8 +139,8 @@
if(sz) {
file_logger_t *p = l->logger_private;
fwrite(what, 1, sz, p->logfile);
- /* [V] Flush the dam' thing! */
- fflush(p->logfile);
+/* [V] Flush the dam' thing! */
+fflush(p->logfile);
}
return JK_TRUE;
@@ -243,13 +246,13 @@
if (NULL == buf)
return -1;
#endif
- set_time_str(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+set_time_str(buf, HUGE_BUFFER_SIZE);
+used = strlen(buf);
if(line)
used += sprintf(&buf[used], " [%s (%d)]: ", f, line);
#else
- set_time_str(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+set_time_str(buf, HUGE_BUFFER_SIZE);
+used = strlen(buf);
if(line)
used += snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
#endif
@@ -288,7 +291,7 @@
}
char *jk_get_worker_secret(jk_map_t *m,
- const char *wname)
+ const char *wname)
{
char buf[1024];
char *secret;
@@ -310,9 +313,9 @@
/* Functions that can be simulated with these should be "deprecated".*/
int jk_get_worker_str_prop(jk_map_t *m,
-const char *wname,
-const char *pname,
-char **prop)
+ const char *wname,
+ const char *pname,
+ char **prop)
{
char buf[1024];
@@ -327,9 +330,9 @@
}
int jk_get_worker_int_prop(jk_map_t *m,
-const char *wname,
-const char *pname,
-int *prop)
+ const char *wname,
+ const char *pname,
+ int *prop)
{
char buf[1024];
@@ -390,6 +393,51 @@
return map_get_int(m, buf, def);
}
+int jk_get_worker_socket_timeout(jk_map_t *m,
+ const char *wname,
+ int def)
+{
+char buf[1024];
+
+if(!m || !wname) {
+return -1;
+}
+
+sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, SOCKET_TIMEOUT_OF_WORKER);
+
+return map_get_int(m, buf, def);
+}
+
+int jk_get_worker_socket_keepalive(jk_map_t *m,
+ const char *wname,
+ int def)
+{
+char buf[1024];
+
+if(!m || !wname) {
+return -1;
+}
+
+sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, SOCKET_KEEPALIVE_OF_WORKER);
+
+return map_get_int(m, buf, def);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.h
mturk 2002/06/25 00:06:59 Modified:jk/native/common jk_connect.h Log: Introduced socket and cache timeout. By Jan Singer, Henri Gomez and Mladen Turk. Revision ChangesPath 1.3 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.h Index: jk_connect.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_connect.h 18 Jun 2001 14:15:36 - 1.2 +++ jk_connect.h 25 Jun 2002 07:06:59 - 1.3 @@ -68,7 +68,7 @@ #include "jk_global.h" #ifndef WIN32 - #define closesocket close +#define closesocket close #endif #ifdef __cplusplus @@ -81,6 +81,7 @@ int jk_open_socket(struct sockaddr_in *addr, int ndelay, + int keepalive, jk_logger_t *l); int jk_close_socket(int s); -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mturk 2002/06/25 00:07:14
Modified:jk/native/common jk_connect.c
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.4 +29 -18jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_connect.c 4 Jul 2001 16:59:38 - 1.3
+++ jk_connect.c 25 Jun 2002 07:07:14 - 1.4
@@ -60,7 +60,7 @@
* Based on:Various Jserv files
*/
/**
- * @package jk_connect
+ * @package jk_connect
* @author Gal Shachor <[EMAIL PROTECTED]>
* @version $Revision$
*/
@@ -109,6 +109,7 @@
int jk_open_socket(struct sockaddr_in *addr,
int ndelay,
+ int keepalive,
jk_logger_t *l)
{
int sock;
@@ -134,6 +135,7 @@
/* Check if we connected */
if(0 == ret) {
+int keep = 1;
if(ndelay) {
int set = 1;
@@ -145,6 +147,15 @@
sizeof(set));
}
+if (keepalive) {
+jk_log(l, JK_LOG_DEBUG, "jk_open_socket, set SO_KEEPALIVE to on\n");
+setsockopt(sock,
+ SOL_SOCKET,
+ SO_KEEPALIVE,
+ (char *)&keep,
+ sizeof(keep));
+}
+
jk_log(l, JK_LOG_DEBUG, "jk_open_socket, return, sd = %d\n", sock);
return sock;
}
@@ -198,14 +209,14 @@
(char *)b + sent ,
len - sent,
0);
-
- if(0 == this_time) {
- return -2;
- }
- if(this_time < 0) {
- return -3;
- }
- sent += this_time;
+
+if(0 == this_time) {
+return -2;
+}
+if(this_time < 0) {
+return -3;
+}
+sent += this_time;
}
return sent;
@@ -225,26 +236,26 @@
int rdlen = 0;
while(rdlen < len) {
- int this_time = recv(sd,
+int this_time = recv(sd,
(char *)b + rdlen,
len - rdlen,
- 0);
- if(-1 == this_time) {
+ 0);
+if(-1 == this_time) {
#ifdef WIN32
if(SOCKET_ERROR == this_time) {
errno = WSAGetLastError() - WSABASEERR;
}
#endif /* WIN32 */
- if(EAGAIN == errno) {
+if(EAGAIN == errno) {
continue;
- }
- return -1;
- }
+}
+return -1;
+}
if(0 == this_time) {
return -1;
}
- rdlen += this_time;
+rdlen += this_time;
}
return rdlen;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.h
mturk 2002/06/25 00:07:31
Modified:jk/native/common jk_ajp_common.h
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.15 +22 -4 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
Index: jk_ajp_common.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_ajp_common.h 6 Feb 2002 19:11:23 - 1.14
+++ jk_ajp_common.h 25 Jun 2002 07:07:31 - 1.15
@@ -87,7 +87,7 @@
#define SC_A_SSL_CIPHER (unsigned char)8
#define SC_A_SSL_SESSION(unsigned char)9
#define SC_A_REQ_ATTRIBUTE (unsigned char)10
-#define SC_A_SSL_KEY_SIZE (unsigned char)11/* only in if
JkOptions +ForwardKeySize */
+#define SC_A_SSL_KEY_SIZE (unsigned char)11 /* only in if JkOptions
+ForwardKeySize */
#define SC_A_SECRET (unsigned char)12
#define SC_A_ARE_DONE (unsigned char)0xFF
@@ -132,7 +132,7 @@
#define SC_M_MOVE (unsigned char)12
#define SC_M_LOCK (unsigned char)13
#define SC_M_UNLOCK (unsigned char)14
-#define SC_M_ACL (unsigned char)15
+#define SC_M_ACL(unsigned char)15
#define SC_M_REPORT (unsigned char)16
#define SC_M_VERSION_CONTROL(unsigned char)17
#define SC_M_CHECKIN(unsigned char)18
@@ -216,6 +216,7 @@
#define AJP_HEADER_LEN(4)
#define AJP_HEADER_SZ_LEN (2)
#define CHUNK_BUFFER_PAD (12)
+#define AJP_DEF_CACHE_TIMEOUT (15)
struct jk_res_data {
@@ -252,6 +253,8 @@
*/
JK_CRIT_SEC cs;
unsigned ep_cache_sz;
+unsigned ep_mincache_sz;
+unsigned ep_maxcache_sz;
ajp_endpoint_t **ep_cache;
int proto; /* PROTOCOL USED AJP13/AJP14 */
@@ -269,6 +272,16 @@
*/
int (* logon)(ajp_endpoint_t *ae,
jk_logger_t*l);
+
+/*
+* Handle Socket Timeouts
+*/
+unsigned socket_timeout;
+unsigned keepalive;
+/*
+* Handle Cache Timeouts
+*/
+unsigned cache_timeout;
};
@@ -281,13 +294,18 @@
jk_pool_t pool;
jk_pool_atom_t buf[BIG_POOL_SIZE];
- int proto; /* PROTOCOL USED AJP13/AJP14 */
+int proto; /* PROTOCOL USED AJP13/AJP14 */
int sd;
int reuse;
jk_endpoint_t endpoint;
unsigned left_bytes_to_send;
+
+/* time of the last request
+ handled by this endpoint */
+time_t last_access;
+
};
/*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mturk 2002/06/25 00:08:03
Modified:jk/native/common jk_ajp_common.c
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.26 +376 -334 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_ajp_common.c 10 May 2002 23:58:40 - 1.25
+++ jk_ajp_common.c 25 Jun 2002 07:08:03 - 1.26
@@ -115,23 +115,23 @@
} else if(0 == strcmp(method, "TRACE")) {
*sc = SC_M_TRACE;
} else if(0 == strcmp(method, "PROPFIND")) {
- *sc = SC_M_PROPFIND;
+*sc = SC_M_PROPFIND;
} else if(0 == strcmp(method, "PROPPATCH")) {
- *sc = SC_M_PROPPATCH;
+*sc = SC_M_PROPPATCH;
} else if(0 == strcmp(method, "MKCOL")) {
- *sc = SC_M_MKCOL;
+*sc = SC_M_MKCOL;
} else if(0 == strcmp(method, "COPY")) {
- *sc = SC_M_COPY;
+*sc = SC_M_COPY;
} else if(0 == strcmp(method, "MOVE")) {
- *sc = SC_M_MOVE;
+*sc = SC_M_MOVE;
} else if(0 == strcmp(method, "LOCK")) {
- *sc = SC_M_LOCK;
+*sc = SC_M_LOCK;
} else if(0 == strcmp(method, "UNLOCK")) {
- *sc = SC_M_UNLOCK;
+*sc = SC_M_UNLOCK;
} else if(0 == strcmp(method, "ACL")) {
- *sc = SC_M_ACL;
+*sc = SC_M_ACL;
} else if(0 == strcmp(method, "REPORT")) {
- *sc = SC_M_REPORT;
+*sc = SC_M_REPORT;
} else if(0 == strcmp(method, "VERSION-CONTROL")) {
*sc = SC_M_VERSION_CONTROL;
} else if(0 == strcmp(method, "CHECKIN")) {
@@ -263,7 +263,7 @@
?ssl_cert (byte)(string)
?ssl_cipher(byte)(string)
?ssl_session (byte)(string)
-?ssl_key_size (byte)(int) via JkOptions +ForwardKeySize
+?ssl_key_size (byte)(int) via JkOptions +ForwardKeySize
request_terminator (byte)
?body content_length*(var binary)
@@ -442,10 +442,10 @@
static int ajp_unmarshal_response(jk_msg_buf_t *msg,
jk_res_data_t *d,
- ajp_endpoint_t *ae,
+ ajp_endpoint_t *ae,
jk_logger_t*l)
{
- jk_pool_t * p = &ae->pool;
+jk_pool_t * p = &ae->pool;
d->status = jk_b_get_int(msg);
@@ -533,16 +533,16 @@
void ajp_close_endpoint(ajp_endpoint_t *ae,
jk_logger_t*l)
{
- jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_close_endpoint\n");
+jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_close_endpoint\n");
ajp_reset_endpoint(ae);
jk_close_pool(&(ae->pool));
if (ae->sd > 0) {
jk_close_socket(ae->sd);
- jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_close_endpoint, closed
sd = %d\n", ae->sd);
- ae->sd = -1; /* just to avoid twice close */
- }
+jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_close_endpoint, closed sd =
%d\n", ae->sd);
+ae->sd = -1; /* just to avoid twice close */
+}
free(ae);
}
@@ -584,20 +584,22 @@
unsigned attempt;
for(attempt = 0 ; attempt < ae->worker->connect_retry_attempts ; attempt++) {
-ae->sd = jk_open_socket(&ae->worker->worker_inet_addr, JK_TRUE, l);
+ae->sd = jk_open_socket(&ae->worker->worker_inet_addr, JK_TRUE,
ae->worker->keepalive, l);
if(ae->sd >= 0) {
jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_connect_to_endpoint,
connected sd = %d\n", ae->sd);
- /* Check if we must execute a logon after the physical connect
*/
- if (ae->worker->logon != NULL)
- return (ae->worker->logon(ae, l));
+ /* set last_access */
+ ae->last_access = time(NULL);
+/* Check if we must execute a logon after the physical connect */
+if (ae->worker->logon != NULL)
+return (ae->worker->logon(ae, l));
- return JK_TRUE;
+return JK_TRUE;
}
}
jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::ajp_connect_to_endpoint, failed
errno = %d\n", errno);
- return JK_FALSE;
+return JK_FALSE;
}
/*
@@ -608,18 +610,18 @@
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13.h
mturk 2002/06/25 00:08:26
Modified:jk/native/common jk_ajp13.h
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.9 +8 -7 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h
Index: jk_ajp13.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ajp13.h4 Dec 2001 19:48:41 - 1.8
+++ jk_ajp13.h25 Jun 2002 07:08:26 - 1.9
@@ -69,18 +69,19 @@
extern "C" {
#endif /* __cplusplus */
-#define AJP13_PROTO 13
-#define AJP13_WS_HEADER 0x1234
-#define AJP13_SW_HEADER 0x4142 /* 'AB' */
+#define AJP13_PROTO 13
+#define AJP13_WS_HEADER 0x1234
+#define AJP13_SW_HEADER 0x4142 /* 'AB' */
-#define AJP13_DEF_HOST ("localhost")
-#define AJP13_DEF_PORT (8009)
+#define AJP13_DEF_HOST ("localhost")
+#define AJP13_DEF_PORT (8009)
#define AJP13_READ_BUF_SIZE (8*1024)
#define AJP13_DEF_CACHE_SZ (1)
-#define JK_INTERNAL_ERROR(-2)
+#define JK_INTERNAL_ERROR (-2)
#define JK_FATAL_ERROR (-3)
#define JK_CLIENT_ERROR (-4)
#define AJP13_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6)
+#define AJP13_DEF_TIMEOUT (0) /* Idle timout for pooled connections */
/*
* Message does not have a response (for example, JK_AJP13_END_RESPONSE)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2002/06/25 00:08:47
Modified:jk/native/common jk_ajp12_worker.c
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.7 +4 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_ajp12_worker.c 4 Dec 2001 19:39:54 - 1.6
+++ jk_ajp12_worker.c 25 Jun 2002 07:08:47 - 1.7
@@ -131,6 +131,7 @@
for(attempt = 0 ; attempt < p->worker->connect_retry_attempts ; attempt++) {
p->sd = jk_open_socket(&p->worker->worker_inet_addr,
JK_TRUE,
+ JK_FALSE,
l);
jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::service, sd = %d\n", p->sd);
@@ -404,8 +405,8 @@
for(i = 0 ; i < s->num_attributes ; i++) {
ret = (ajpv12_mark(p, 5)&&
-ajpv12_sendstring(p, s->attributes_names[i]) &&
-ajpv12_sendstring(p, s->attributes_values[i]));
+ ajpv12_sendstring(p, s->attributes_names[i]) &&
+ ajpv12_sendstring(p, s->attributes_values[i]));
if(!ret) {
jk_log(l, JK_LOG_ERROR,
"In ajpv12_handle_request, failed to send environment\n");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/06/26 04:06:58
Modified:jk/native2/common jk_channel_jni.c
Log:
Fix the multithreading bug in channel open, setting worker to the
disabled state, that caused already opened enpoint to fail.
Revision ChangesPath
1.28 +27 -18jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_channel_jni.c 10 Jun 2002 23:57:24 - 1.27
+++ jk_channel_jni.c 26 Jun 2002 11:06:58 - 1.28
@@ -146,20 +146,28 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.open(): \n" );
-if( _this->worker != NULL )
-_this->worker->mbean->disabled=JK_TRUE;
-
+/* It is useless to continue if the channel worker
+ does not exist.
+ */
+if( _this->worker == NULL ) {
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "channel_jni.open() NullPointerException, no channel worker
found\n");
+return JK_ERR;
+}
+
jniCh->vm=(jk_vm_t *)we->vm;
if( jniCh->vm == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() no VM found\n" );
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
jniEnv = (JNIEnv *)jniCh->vm->attach( env, jniCh->vm );
if( jniEnv == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() can't attach\n" );
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
/* Create the buffers used by the write method. We allocate a
@@ -174,24 +182,22 @@
sizeof( jk_ch_jni_ep_private_t ));
endpoint->channelData=epData;
-/** XXX make it customizable */
-jniCh->className=JAVA_BRIDGE_CLASS_NAME;
-
-jniCh->jniBridge =
-(*jniEnv)->FindClass(jniEnv, jniCh->className );
+jniCh->jniBridge = (*jniEnv)->FindClass(jniEnv, jniCh->className );
if( jniCh->jniBridge == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() can't find %s\n",jniCh->className );
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
jniCh->jniBridge=(*jniEnv)->NewGlobalRef( jniEnv, jniCh->jniBridge);
if( jniCh->jniBridge == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() Unable to allocate globalref for
%s\n",jniCh->className );
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
@@ -206,8 +212,9 @@
jmethod=(*jniEnv)->GetStaticMethodID(jniEnv, jniCh->jniBridge,
"createJavaContext", "(Ljava/lang/String;J)Ljava/lang/Object;");
if( jmethod == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() can't find createJavaContext\n");
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
@@ -222,6 +229,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() Can't create java context\n" );
epData->jniJavaContext=NULL;
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
epData->jniJavaContext=(*jniEnv)->NewGlobalRef( jniEnv, jobj );
@@ -235,8 +243,9 @@
"getBuffer",
"(Ljava/lang/Object;I)[B");
if( jmethod == NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() can't find getBuffer\n");
+_this->worker->mbean->disabled=JK_TRUE;
return JK_ERR;
}
@@ -259,17 +268,17 @@
"(JLjava/lang/Object;)I");
if( jniCh->writeM
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
mturk 2002/06/27 10:16:28
Modified:jk/native2/common jk_channel_socket.c
Log:
Added socket keepalive and send/recv timeout options.
keepalive=1/0 (enabled/disabled)
timeout=nn (seconds)
Added nodelay option (default disabled)
nodelay=1/0 (enabled/disabled)
Revision ChangesPath
1.36 +93 -58jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_channel_socket.c 23 Jun 2002 06:55:55 - 1.35
+++ jk_channel_socket.c 27 Jun 2002 17:16:28 - 1.36
@@ -80,7 +80,7 @@
#include "jk_registry.h"
#ifndef WIN32
- #define closesocket close
+#define closesocket close
#endif
#define DEFAULT_HOST "127.0.0.1"
@@ -92,6 +92,8 @@
struct sockaddr_in addr;
char *host;
short port;
+int keepalive;
+int timeout;
};
typedef struct jk_channel_socket_private jk_channel_socket_private_t;
@@ -122,12 +124,18 @@
jk_channel_t *ch=(jk_channel_t *)mbean->object;
char *value=(char *)valueP;
jk_channel_socket_private_t *socketInfo=
- (jk_channel_socket_private_t *)(ch->_privatePtr);
+(jk_channel_socket_private_t *)(ch->_privatePtr);
if( strcmp( "host", name ) == 0 ) {
- socketInfo->host=value;
+socketInfo->host=value;
} else if( strcmp( "port", name ) == 0 ) {
socketInfo->port=atoi( value );
+} else if( strcmp( "keepalive", name ) == 0 ) {
+socketInfo->keepalive=atoi( value );
+} else if( strcmp( "timeout", name ) == 0 ) {
+socketInfo->timeout=atoi( value );
+} else if( strcmp( "nodelay", name ) == 0 ) {
+socketInfo->ndelay=atoi( value );
} else {
return jk2_channel_setAttribute( env, mbean, name, valueP );
}
@@ -141,7 +149,7 @@
{
jk_channel_t *ch=chB->object;
jk_channel_socket_private_t *socketInfo=
- (jk_channel_socket_private_t *)(ch->_privatePtr);
+(jk_channel_socket_private_t *)(ch->_privatePtr);
int rc;
char *host=socketInfo->host;
@@ -180,7 +188,7 @@
rc=jk2_channel_socket_resolve( env, socketInfo->host, socketInfo->port,
&socketInfo->addr );
if( rc!= JK_OK ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "jk2_channel_socket_init: "
+env->l->jkLog(env, env->l, JK_LOG_ERROR, "jk2_channel_socket_init: "
"can't resolve %s:%d errno=%d\n", socketInfo->host,
socketInfo->port, errno );
}
@@ -250,14 +258,16 @@
{
/*int err; */
jk_channel_socket_private_t *socketInfo=
- (jk_channel_socket_private_t *)(ch->_privatePtr);
+(jk_channel_socket_private_t *)(ch->_privatePtr);
struct sockaddr_in *addr=&socketInfo->addr;
int ndelay=socketInfo->ndelay;
+int keepalive=socketInfo->keepalive;
+int ntimeout=socketInfo->timeout;
int sock;
int ret;
-
+
sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock < 0) {
#ifdef WIN32
@@ -271,6 +281,24 @@
return JK_ERR;
}
+if (ntimeout >= 0) {
+/* convert from seconds to ms */
+int set = ntimeout * 1000;
+u_long zero = 0;
+if (ioctlsocket(sock, FIONBIO, &zero) == SOCKET_ERROR) {
+#ifdef WIN32
+errno = WSAGetLastError() - WSABASEERR;
+#endif /* WIN32 */
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "channelSocket.open() ioctlcocket failed %s:%d %d %s \n",
+ socketInfo->host, socketInfo->port, errno, strerror(
errno ) );
+return JK_ERR;
+}
+
+setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &set, sizeof(set));
+setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *) &set, sizeof(set));
+}
+
/* Tries to connect to JServ (continues trying while error is EINTR) */
do {
if( ch->mbean->debug > 0 )
@@ -292,11 +320,18 @@
if(ret != 0 ) {
jk2_close_socket(env, sock);
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "channelSocket.connect() connect failed %s:%d %d %s \n",
+ "channelSocket.open() connect failed %s:%d %d %s \n",
socketInfo->host, socketInfo->port, errno, strerror(
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c
mturk 2002/06/27 10:19:09
Modified:jk/native2/common jk_channel_apr_socket.c
Log:
Added socket keepalive and send/recv timeout options.
keepalive=1/0 (enabled/disabled)
timeout=nn (seconds) defaults to unlimited
Added nodelay option (default disabled)
nodelay=1/0 (enabled/disabled)
Revision ChangesPath
1.23 +42 -11
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_channel_apr_socket.c 10 Jun 2002 21:55:06 - 1.22
+++ jk_channel_apr_socket.c 27 Jun 2002 17:19:09 - 1.23
@@ -88,6 +88,8 @@
apr_sockaddr_t *addr;
char *host;
short port;
+int keepalive;
+int timeout;
};
typedef struct jk_channel_apr_private jk_channel_apr_private_t;
@@ -121,6 +123,12 @@
socketInfo->host=value;
} else if( strcmp( "port", name ) == 0 ) {
socketInfo->port=atoi( value );
+} else if( strcmp( "keepalive", name ) == 0 ) {
+socketInfo->keepalive=atoi( value );
+} else if( strcmp( "timeout", name ) == 0 ) {
+socketInfo->timeout=atoi( value );
+} else if( strcmp( "nodelay", name ) == 0 ) {
+socketInfo->timeout=atoi( value );
} else {
return jk2_channel_setAttribute( env, mbean, name, valueP );
}
@@ -206,10 +214,11 @@
apr_sockaddr_t *remote_sa=socketInfo->addr;
int ndelay=socketInfo->ndelay;
+int keepalive=socketInfo->keepalive;
apr_socket_t *sock=endpoint->channelData;
apr_status_t ret;
-apr_interval_time_t timeout = 2 * APR_USEC_PER_SEC;
+apr_int32_t timeout = socketInfo->timeout * APR_USEC_PER_SEC;
char msg[128];
if (apr_socket_create(&sock, remote_sa->family, SOCK_STREAM,
@@ -223,6 +232,11 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"channelApr.open(): create tcp socket %d\n", sock );
+/* the default timeout (0) will set the socket to blocking with
+ infinite timeouts.
+ */
+if (timeout <= 0)
+timeout = -1;
if (apr_setsocketopt(sock, APR_SO_TIMEOUT, timeout)!= APR_SUCCESS) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channelApr.open(): can't set timeout %d %s\n",
@@ -235,7 +249,7 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"channelApr.open() connect on %d\n",sock);
ret = apr_connect(sock, remote_sa);
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_INFO,
"jk2_channel_apr_open: %d %s %s\n",ret, strerror( errno ),
socketInfo->host);
@@ -245,20 +259,38 @@
if(ret != APR_SUCCESS ) {
apr_socket_close(sock);
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "channelApr.connect() connect failed %d %s\n",
+ "channelApr.open() connect failed %d %s\n",
ret, apr_strerror( ret, msg, sizeof(msg) ) );
return JK_ERR;
}
+
+/* enable the use of keep-alive packets on TCP connection */
+if(keepalive) {
+int set = 1;
+if((ret = apr_setsocketopt(sock, APR_SO_KEEPALIVE, set)) != APR_SUCCESS ) {
+apr_socket_close(sock);
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "channelApr.open() keepalive failed %d %s\n",
+ ret, apr_strerror( ret, msg, sizeof(msg) ) );
+return JK_ERR;
+}
+}
-/* XXX needed?
+/* Disable the Nagle algorithm if ndelay is set */
if(ndelay) {
int set = 1;
-setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,(char *)&set,sizeof(set));
+if((ret = apr_setsocketopt(sock, APR_TCP_NODELAY, set)) != APR_SUCCESS ) {
+apr_socket_close(sock);
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "channelApr.open() nodelay failed %d %s\n",
+ ret, apr_strerror( ret, msg, sizeof(msg) ) );
+return JK_ERR;
+}
}
-env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelApr.connect(), sock = %d\n", sock);
-*/
+if( ch->mbean->debug > 0 )
+env->l->jk
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java
mturk 2002/06/29 00:43:24
Modified:jk/java/org/apache/jk/apr AprImpl.java
Log:
Introduced new native function jkStatus that signals the
TC startup status to the server for now.
Revision ChangesPath
1.22 +9 -0 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AprImpl.java 11 Jun 2002 22:48:46 - 1.21
+++ AprImpl.java 29 Jun 2002 07:43:24 - 1.22
@@ -119,6 +119,8 @@
*/
public native void jkRecycle(long xEnv, long endpointP);
+/* Send a TC status code to the server */
+public static native void jkStatus(int code);
// Called from C
// XXX Check security, add guard or other protection
@@ -181,6 +183,13 @@
jniMode=true;
}
+public static void jniStatus(int code) throws IOException {
+try {
+jkStatus( code);
+} catch( Throwable t) {
+throw new IOException( t.getMessage() );
+}
+}
/** This method of loading the libs doesn't require setting
* LD_LIBRARY_PATH. Assuming a 'right' binary distribution,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java
mturk 2002/06/29 00:43:38
Modified:jk/java/org/apache/jk/apr TomcatStarter.java
Log:
Introduced new native function jkStatus that signals the
TC startup status to the server for now.
Revision ChangesPath
1.9 +5 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TomcatStarter.java23 Jun 2002 22:48:02 - 1.8
+++ TomcatStarter.java29 Jun 2002 07:43:38 - 1.9
@@ -19,7 +19,9 @@
public static String mainClasses[]={ "org.apache.tomcat.startup.Main",
"org.apache.catalina.startup.BootstrapService",
"org.apache.catalina.startup.Bootstrap"};
-
+
+public static final int TC_STARTING=1;
+public static final int TC_STARTED=2;
// If someone has time - we can also guess the classpath and do other
// fancy guessings.
@@ -69,9 +71,11 @@
public void run() {
System.err.println("Starting " + c.getName());
try {
+AprImpl.jniStatus(TC_STARTING);
Class argClass=args.getClass();
Method m=c.getMethod( "main", new Class[] {argClass} );
m.invoke( c, new Object[] { args } );
+AprImpl.jniStatus(TC_STARTED);
System.out.println("TomcatStarter: Done");
} catch( Throwable t ) {
t.printStackTrace(System.err);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c
mturk 2002/06/29 00:44:04
Modified:jk/native2/jni jk_jni_aprImpl.c
Log:
Introduced new native function jkStatus that signals the
TC startup status to the server for now.
Revision ChangesPath
1.38 +14 -0 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_jni_aprImpl.c 11 Jun 2002 22:51:29 - 1.37
+++ jk_jni_aprImpl.c 29 Jun 2002 07:44:04 - 1.38
@@ -93,6 +93,8 @@
static int jniDebug=0;
+int jk_jni_status_code=0;
+
#define JK_GET_REGION 1
#define JK_GET_BYTE_ARRAY_ELEMENTS 2
#define JK_DIRECT_BUFFER_NIO 3
@@ -503,6 +505,14 @@
return rc;
}
+/*
+*/
+JNIEXPORT void JNICALL
+Java_org_apache_jk_apr_AprImpl_jkStatus
+ (JNIEnv *jniEnv, jobject o, jint statusCode )
+{
+jk_jni_status_code = statusCode;
+}
static JNINativeMethod org_apache_jk_apr_AprImpl_native_methods[] = {
{
@@ -552,6 +562,10 @@
{
"jkRecycle", "(JJ)V",
Java_org_apache_jk_apr_AprImpl_jkRecycle
+},
+{
+"jkStatus", "(I)V",
+Java_org_apache_jk_apr_AprImpl_jkStatus
},
};
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
mturk 2002/06/29 00:45:15 Modified:jk/native2/include jk_worker.h Log: Added initalized variable to the worker Revision ChangesPath 1.25 +6 -1 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h Index: jk_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jk_worker.h 31 May 2002 17:49:07 - 1.24 +++ jk_worker.h 29 Jun 2002 07:45:15 - 1.25 @@ -198,6 +198,11 @@ */ int in_error_state; +/* Initialized. Will be set to JK_TRUE after first service + * call to the worker + */ +int initialized; + /* Worker priority. * Workers with lower priority are allways preffered - regardless of lb_value * This is user to represent 'local' workers ( we can call it 'proximity' or 'distance' ) -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_channel.h
mturk 2002/06/29 00:45:46 Modified:jk/native2/include jk_channel.h Log: Added status callback function Revision ChangesPath 1.16 +4 -0 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_channel.h 30 May 2002 18:27:16 - 1.15 +++ jk_channel.h 29 Jun 2002 07:45:45 - 1.16 @@ -162,6 +162,10 @@ struct jk_endpoint *endpoint, struct jk_ws_service *r ); +/** Obtain the channel status code + */ +int (JK_METHOD *status)(struct jk_env *env, jk_channel_t *_this); + void *_privatePtr; }; -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
mturk 2002/06/29 00:48:20
Modified:jk/native2/common jk_worker_lb.c
Log:
Serialize the calls to the workers until the first call finishes or times out.
Added new config param 'timeout' setting the initialization worker
timeout.
Revision ChangesPath
1.21 +88 -7 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_worker_lb.c22 Jun 2002 16:57:54 - 1.20
+++ jk_worker_lb.c29 Jun 2002 07:48:20 - 1.21
@@ -70,6 +70,10 @@
#include "jk_env.h"
#include "jk_requtil.h"
+#ifdef HAS_APR
+#include "apr_thread_proc.h"
+#endif
+
#define DEFAULT_LB_FACTOR (1.0)
/* Time to wait before retry... XXX make it configurable*/
@@ -79,6 +83,12 @@
#define NO_WORKER_MSG "The servlet container is temporary unavailable or being
upgraded\n";
+typedef struct {
+struct jk_mutex *cs;
+intinit_timeout;
+intinitializing;
+} jk_worker_lb_private_t;
+
/** Find the best worker. In process, check if timeout expired
for workers that failed in the past and give them another chance.
@@ -281,6 +291,8 @@
{
int attempt=0;
jk_workerEnv_t *wEnv=lb->workerEnv;
+jk_worker_lb_private_t *lb_priv = lb->worker_private;
+jk_worker_t *rec = NULL;
if( s==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -309,10 +321,29 @@
}
while(1) {
-jk_worker_t *rec;
int rc;
-rec=jk2_get_most_suitable_worker(env, lb, s, attempt);
+/* Since there is potential worker state change
+ * make the find best worker call thread safe
+ */
+if (!lb_priv->initializing) {
+if (lb_priv->cs != NULL)
+lb_priv->cs->lock(env, lb_priv->cs);
+rec=jk2_get_most_suitable_worker(env, lb, s, attempt);
+
+if (lb_priv->cs != NULL)
+lb_priv->cs->unLock(env, lb_priv->cs);
+}
+else if (!rec){
+/* If we are initializing the service wait until
+ * the initialization finishes or times out
+ */
+if (lb->cs != NULL) {
+lb->cs->lock(env, lb->cs);
+lb->cs->unLock(env, lb->cs);
+}
+continue;
+}
attempt++;
s->is_recoverable_error = JK_FALSE;
@@ -354,16 +385,45 @@
s->jvm_route = rec->route;
s->realWorker = rec;
-
+if (!rec->initialized && !lb_priv->initializing && lb->cs != NULL) {
+/* If the worker has not been called yet serialize the call */
+lb->cs->lock(env, lb->cs);
+lb_priv->initializing = JK_TRUE;
+rec->error_time = time(NULL);
+}
rc = rec->service(env, rec, s);
if(rc==JK_OK) {
rec->in_error_state = JK_FALSE;
rec->error_time = 0;
-/* the endpoint that succeeded is saved for done() */
+/* Set the initialized flag to TRUE if that was the first call */
+if (!rec->initialized && lb->cs != NULL) {
+rec->initialized = JK_TRUE;
+lb_priv->initializing = JK_FALSE;
+lb->cs->unLock(env, lb->cs);
+}
return JK_OK;
}
+if (!rec->initialized && lb->cs != NULL) {
+time_t now = time(NULL);
+/* In the case of initialization timeout disable the worker */
+if ((int)(now - rec->error_time) > lb_priv->init_timeout) {
+rec->mbean->disabled = JK_TRUE;
+lb_priv->initializing = JK_FALSE;
+s->is_recoverable_error = JK_FALSE;
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "lb_worker.service() worker init timeout for %s\n",
+ rec->channelName);
+lb->cs->unLock(env, lb->cs);
+}
+else {
+#ifdef HAS_APR
+apr_thread_yield();
+#endif
+continue;
+}
+}
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"lb.service() worker failed %s\n", rec->mbean-&g
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
mturk 2002/06/29 00:49:30
Modified:jk/native2/common jk_worker_ajp13.c
Log:
If the channel provides the status callback call that and return
if channel has not been initialized
Revision ChangesPath
1.35 +8 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_worker_ajp13.c 26 Jun 2002 02:41:39 - 1.34
+++ jk_worker_ajp13.c 29 Jun 2002 07:49:30 - 1.35
@@ -626,6 +626,14 @@
if (err!=JK_OK)
return err;
+if (w->channel->status) {
+err = w->channel->status(env, w->channel);
+if (err!=JK_OK) {
+jk2_worker_ajp13_done( env, w, e);
+return err;
+}
+}
+
#ifdef HAS_APR
if( s->uriEnv!=NULL && s->uriEnv->timing == JK_TRUE ) {
e->stats->startTime=s->startTime;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/06/29 00:51:20
Modified:jk/native2/common jk_channel_jni.c
Log:
Add 'init' param that if set disables the channel until the
TC startup finishes, or lb timeout occurs.
Revision ChangesPath
1.29 +38 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_channel_jni.c 26 Jun 2002 11:06:58 - 1.28
+++ jk_channel_jni.c 29 Jun 2002 07:51:20 - 1.29
@@ -80,6 +80,8 @@
/* default only, is configurable now */
#define JAVA_BRIDGE_CLASS_NAME ("org/apache/jk/apr/AprImpl")
+#define JNI_TOMCAT_STARTED 2
+extern int jk_jni_status_code;
/** Information specific for the socket channel
*/
@@ -90,6 +92,8 @@
jclass jniBridge;
jmethodID writeMethod;
+int status;
+int wait_initialized;
} jk_channel_jni_private_t;
typedef struct {
@@ -154,7 +158,7 @@
"channel_jni.open() NullPointerException, no channel worker
found\n");
return JK_ERR;
}
-
+
jniCh->vm=(jk_vm_t *)we->vm;
if( jniCh->vm == NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -215,6 +219,10 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channel_jni.open() can't find createJavaContext\n");
_this->worker->mbean->disabled=JK_TRUE;
+
+if( (*jniEnv)->ExceptionCheck( jniEnv ) ) {
+(*jniEnv)->ExceptionClear( jniEnv );
+}
return JK_ERR;
}
@@ -230,6 +238,9 @@
"channel_jni.open() Can't create java context\n" );
epData->jniJavaContext=NULL;
_this->worker->mbean->disabled=JK_TRUE;
+if( (*jniEnv)->ExceptionCheck( jniEnv ) ) {
+(*jniEnv)->ExceptionClear( jniEnv );
+}
return JK_ERR;
}
epData->jniJavaContext=(*jniEnv)->NewGlobalRef( jniEnv, jobj );
@@ -297,6 +308,12 @@
JNIEnv *jniEnv;
jk_channel_jni_private_t *jniCh=_this->_privatePtr;
epData=(jk_ch_jni_ep_private_t *)endpoint->channelData;
+
+if (epData == NULL) {
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel_jni.close() no channel data\n" );
+return JK_ERR;
+}
jniEnv = (JNIEnv *)jniCh->vm->attach( env, jniCh->vm );
if( jniEnv == NULL ) {
@@ -524,6 +541,10 @@
if( strcmp( "class", name ) == 0 ) {
jniInfo->className=value;
}
+else if( strcmp( "init", name ) == 0 ) {
+jniInfo->wait_initialized=atoi(value);
+}
+
/* TODO: apache protocol hooks
else if( strcmp( "", name ) == 0 ) {
jniInfo->=value;
@@ -557,6 +578,19 @@
ep->currentRequest, ep, code, ep->reply
);
}
+static int JK_METHOD jk2_channel_jni_status(jk_env_t *env,
+jk_channel_t *_this)
+{
+
+jk_channel_jni_private_t *jniCh=_this->_privatePtr;
+if ( jniCh->status != JNI_TOMCAT_STARTED && jniCh->wait_initialized) {
+jniCh->status = jk_jni_status_code;
+if (jniCh->status != JNI_TOMCAT_STARTED)
+return JK_ERR;
+}
+return JK_OK;
+}
+
int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
@@ -565,7 +599,7 @@
jk_channel_t *ch=result->object;
jk_workerEnv_t *wEnv;
jk_channel_jni_private_t *jniPrivate;
-
+
ch=(jk_channel_t *)pool->calloc(env, pool, sizeof( jk_channel_t));
ch->recv= jk2_channel_jni_recv;
@@ -575,7 +609,8 @@
ch->beforeRequest= jk2_channel_jni_beforeRequest;
ch->afterRequest= jk2_channel_jni_afterRequest;
-
+ch->status = jk2_channel_jni_status;
+
ch->_privatePtr=jniPrivate=(jk_channel_jni_private_t *)pool->calloc(env, pool,
sizeof(jk_channel_jni_private_t));
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/06/29 07:17:27
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Create the thread when DllMain is called with the
DLL_PROCCESS_ATTACH param that starts the jk2 initalization.
That enables the inprocess TC to be started, cause it disables the
thread locking of DllMain itself.
Revision ChangesPath
1.30 +34 -8
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_isapi_plugin.c 9 Jun 2002 03:10:43 - 1.29
+++ jk_isapi_plugin.c 29 Jun 2002 14:17:27 - 1.30
@@ -533,6 +533,19 @@
}
+HANDLE jk2_starter_thread = NULL;
+
+DWORD WINAPI jk2_isapi_starter( LPVOID lpParam )
+{
+initialize_extension();
+if (is_inited) {
+if (init_jk(NULL))
+is_mapread = JK_TRUE;
+}
+return 0;
+}
+
+
BOOL WINAPI DllMain(HINSTANCE hInst,// Instance Handle of the DLL
ULONG ulReason, // Reason why NT called this DLL
LPVOID lpReserved) // Reserved parameter for future use
@@ -541,24 +554,37 @@
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
+DWORD dwThreadId;
switch (ulReason) {
case DLL_PROCESS_DETACH:
__try {
+if (jk2_starter_thread)
+CloseHandle(jk2_starter_thread);
TerminateFilter(HSE_TERM_MUST_UNLOAD);
} __except(1) {
}
break;
+case DLL_PROCESS_ATTACH:
+if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
+_splitpath( file_name, drive, dir, fname, NULL );
+_makepath( ini_file_name, drive, dir, fname, ".properties" );
+
+jk2_starter_thread = CreateThread( NULL,
+0,
+jk2_isapi_starter,
+NULL,
+0,
+&dwThreadId);
+
+} else {
+fReturn = JK_FALSE;
+}
+break;
default:
break;
}
-if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
-_splitpath( file_name, drive, dir, fname, NULL );
-_makepath( ini_file_name, drive, dir, fname, ".properties" );
-} else {
-fReturn = JK_FALSE;
-}
return fReturn;
}
@@ -575,7 +601,7 @@
/* Logging the initialization type: registry or properties file in virtual dir
*/
if(strlen(worker_file)){
-rc=(JK_OK != workerEnv->config->setPropertyString( env, workerEnv->config,
"config.file", worker_file ));
+rc=(JK_OK == workerEnv->config->setPropertyString( env, workerEnv->config,
"config.file", worker_file ));
}
workerEnv->init(env,workerEnv);
env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", server_root);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
mturk 2002/06/29 11:28:10
Modified:jk/native2/common jk_worker_lb.c
Log:
Move the worker initalization to channel, so we can skip the channels
that not need that option.
Revision ChangesPath
1.22 +6 -13 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_worker_lb.c29 Jun 2002 07:48:20 - 1.21
+++ jk_worker_lb.c29 Jun 2002 18:28:10 - 1.22
@@ -85,7 +85,6 @@
typedef struct {
struct jk_mutex *cs;
-intinit_timeout;
intinitializing;
} jk_worker_lb_private_t;
@@ -385,7 +384,7 @@
s->jvm_route = rec->route;
s->realWorker = rec;
-if (!rec->initialized && !lb_priv->initializing && lb->cs != NULL) {
+if (rec->mbean->initialize && !lb_priv->initializing && lb->cs != NULL) {
/* If the worker has not been called yet serialize the call */
lb->cs->lock(env, lb->cs);
lb_priv->initializing = JK_TRUE;
@@ -397,18 +396,18 @@
rec->in_error_state = JK_FALSE;
rec->error_time = 0;
/* Set the initialized flag to TRUE if that was the first call */
-if (!rec->initialized && lb->cs != NULL) {
-rec->initialized = JK_TRUE;
+if (rec->mbean->initialize && lb->cs != NULL) {
+rec->mbean->initialize = 0;
lb_priv->initializing = JK_FALSE;
lb->cs->unLock(env, lb->cs);
}
return JK_OK;
}
-if (!rec->initialized && lb->cs != NULL) {
+if (rec->mbean->initialize && lb->cs != NULL) {
time_t now = time(NULL);
/* In the case of initialization timeout disable the worker */
-if ((int)(now - rec->error_time) > lb_priv->init_timeout) {
+if ((int)(now - rec->error_time) > rec->mbean->initialize) {
rec->mbean->disabled = JK_TRUE;
lb_priv->initializing = JK_FALSE;
s->is_recoverable_error = JK_FALSE;
@@ -524,11 +523,7 @@
lb->noWorkerCode=atoi( value );
} else if( strcmp( name, "hwBalanceErr") == 0 ) {
lb->hwBalanceErr=atoi( value );
-} else if( strcmp( name, "initTimeout") == 0 ) {
-jk_worker_lb_private_t *priv = lb->worker_private;
-priv->init_timeout=atoi( value );
}
-
return JK_ERR;
}
@@ -595,8 +590,6 @@
worker_private = (jk_worker_lb_private_t *)pool->calloc(env,
pool, sizeof(jk_worker_lb_private_t));
-/* one minute service startup */
-worker_private->init_timeout = 60;
jkb=env->createBean2(env, pool,"threadMutex", NULL);
if( jkb != NULL ) {
worker_private->cs=jkb->object;
@@ -625,7 +618,7 @@
w->workerEnv=env->getByName( env, "workerEnv" );
w->workerEnv->addWorker( env, w->workerEnv, w );
-
+
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/06/29 11:29:09 Modified:jk/native2/common jk_worker_jni.c Log: Make the default 60 second worker initalization. Revision ChangesPath 1.20 +1 -1 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jk_worker_jni.c 23 Jun 2002 22:48:02 - 1.19 +++ jk_worker_jni.c 29 Jun 2002 18:29:09 - 1.20 @@ -390,7 +390,7 @@ _this->workerEnv=env->getByName( env, "workerEnv" ); _this->workerEnv->addWorker( env, _this->workerEnv, _this ); - + return JK_OK; } #else -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
mturk 2002/06/29 11:29:51
Modified:jk/native2/common jk_worker_ajp13.c
Log:
Changed the call to the service callback.
Revision ChangesPath
1.36 +1 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_worker_ajp13.c 29 Jun 2002 07:49:30 - 1.35
+++ jk_worker_ajp13.c 29 Jun 2002 18:29:51 - 1.36
@@ -627,7 +627,7 @@
return err;
if (w->channel->status) {
-err = w->channel->status(env, w->channel);
+err = w->channel->status(env, w, w->channel);
if (err!=JK_OK) {
jk2_worker_ajp13_done( env, w, e);
return err;
@@ -840,6 +840,5 @@
w->workerEnv=env->getByName( env, "workerEnv" );
w->workerEnv->addWorker( env, w->workerEnv, w );
-
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/06/29 11:31:01
Modified:jk/native2/common jk_channel_jni.c
Log:
Make default 60 second initialization.
Revision ChangesPath
1.30 +7 -8 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_channel_jni.c 29 Jun 2002 07:51:20 - 1.29
+++ jk_channel_jni.c 29 Jun 2002 18:31:00 - 1.30
@@ -93,7 +93,6 @@
jmethodID writeMethod;
int status;
-int wait_initialized;
} jk_channel_jni_private_t;
typedef struct {
@@ -119,8 +118,10 @@
if( wEnv->vm == NULL ) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"channel_jni.init() no VM found\n" );
-if( jniW->worker != NULL )
+if( jniW->worker != NULL ) {
jniW->worker->mbean->disabled=JK_TRUE;
+jniW->worker->mbean->initialize=60;
+}
return JK_ERR;
}
return JK_OK;
@@ -541,10 +542,6 @@
if( strcmp( "class", name ) == 0 ) {
jniInfo->className=value;
}
-else if( strcmp( "init", name ) == 0 ) {
-jniInfo->wait_initialized=atoi(value);
-}
-
/* TODO: apache protocol hooks
else if( strcmp( "", name ) == 0 ) {
jniInfo->=value;
@@ -579,11 +576,12 @@
}
static int JK_METHOD jk2_channel_jni_status(jk_env_t *env,
+struct jk_worker *worker,
jk_channel_t *_this)
{
jk_channel_jni_private_t *jniCh=_this->_privatePtr;
-if ( jniCh->status != JNI_TOMCAT_STARTED && jniCh->wait_initialized) {
+if ( jniCh->status != JNI_TOMCAT_STARTED && worker->mbean->initialize) {
jniCh->status = jk_jni_status_code;
if (jniCh->status != JNI_TOMCAT_STARTED)
return JK_ERR;
@@ -628,7 +626,8 @@
wEnv->addChannel( env, wEnv, ch );
result->invoke=jk2_channel_jni_invoke;
-
+ch->worker->mbean->initialize = 60;
+
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel.c
mturk 2002/06/29 11:32:30
Modified:jk/native2/common jk_channel.c
Log:
Added 'init' option. This is the number of second that worker
waits for channel to initialize. Defaults to 0 except for jni channel
Revision ChangesPath
1.5 +4 -0 jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Index: jk_channel.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_channel.c 10 Jun 2002 21:55:06 - 1.4
+++ jk_channel.c 29 Jun 2002 18:32:30 - 1.5
@@ -84,6 +84,10 @@
ch->mbean->disabled=atoi( value );
if( ch->worker!=NULL)
ch->worker->mbean->disabled=ch->mbean->disabled;
+} else if( strcmp( "init", name ) == 0 ) {
+ch->worker->mbean->initialize=atoi( value );
+if( ch->worker!=NULL)
+ch->worker->mbean->disabled=ch->mbean->disabled;
} else {
if( ch->worker!=NULL ) {
return ch->worker->mbean->setAttribute( env, ch->worker->mbean, name,
valueP );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
mturk 2002/06/29 11:33:06 Modified:jk/native2/include jk_worker.h Log: Remove the initalize flag from the worker. Revision ChangesPath 1.26 +2 -7 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h Index: jk_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_worker.h 29 Jun 2002 07:45:15 - 1.25 +++ jk_worker.h 29 Jun 2002 18:33:06 - 1.26 @@ -197,12 +197,7 @@ * or when the configuration changes. */ int in_error_state; - -/* Initialized. Will be set to JK_TRUE after first service - * call to the worker - */ -int initialized; - + /* Worker priority. * Workers with lower priority are allways preffered - regardless of lb_value * This is user to represent 'local' workers ( we can call it 'proximity' or 'distance' ) -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_channel.h
mturk 2002/06/29 11:33:57 Modified:jk/native2/include jk_channel.h Log: Chenged the status callback proto. Revision ChangesPath 1.17 +3 -1 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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_channel.h 29 Jun 2002 07:45:45 - 1.16 +++ jk_channel.h 29 Jun 2002 18:33:57 - 1.17 @@ -164,7 +164,9 @@ /** Obtain the channel status code */ -int (JK_METHOD *status)(struct jk_env *env, jk_channel_t *_this); +int (JK_METHOD *status)(struct jk_env *env, +struct jk_worker *worker, +jk_channel_t *_this); void *_privatePtr; }; -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_bean.h
mturk 2002/06/29 11:34:36 Modified:jk/native2/include jk_bean.h Log: Add the initialize flag/timeout. Revision ChangesPath 1.7 +5 -0 jakarta-tomcat-connectors/jk/native2/include/jk_bean.h Index: jk_bean.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_bean.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_bean.h 30 May 2002 18:03:59 - 1.6 +++ jk_bean.h 29 Jun 2002 18:34:36 - 1.7 @@ -155,6 +155,11 @@ */ int disabled; +/* Initialize. Will be set to 0 after first service + * call to the worker. + */ +int initialize; + /** Object 'version'. Used to detect changes in config. * XXX will be set to the timestamp of the last config modification. */ -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c
mturk 2002/06/30 02:57:38
Modified:jk/native2/jni jk_jni_aprImpl.c
Log:
Removed the jkStatus native call.
Use the jkSetAttribute for TC startup signaling.
Revision ChangesPath
1.39 +15 -13jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_jni_aprImpl.c 29 Jun 2002 07:44:04 - 1.38
+++ jk_jni_aprImpl.c 30 Jun 2002 09:57:38 - 1.39
@@ -98,6 +98,8 @@
#define JK_GET_REGION 1
#define JK_GET_BYTE_ARRAY_ELEMENTS 2
#define JK_DIRECT_BUFFER_NIO 3
+#define JNI_TOMCAT_STARTING 1
+#define JNI_TOMCAT_STARTED 2
static int arrayAccessMethod=JK_GET_REGION;
void JK_METHOD jk2_env_setAprPool( jk_env_t *env, void *aprPool );
@@ -301,6 +303,19 @@
char *value=(char *)(*jniEnv)->GetStringUTFChars(jniEnv, valueJ, 0);
int rc=JK_OK;
+/* XXX need to find a way how to set this to channel:jni component
+ * instead of global variable.
+ */
+if(env == NULL || component == NULL) {
+if (strcmp(name, "channel:jni") == 0) {
+if (strcmp(value, "starting") == 0)
+jk_jni_status_code = JNI_TOMCAT_STARTING;
+else if (strcmp(value, "done") == 0)
+ jk_jni_status_code = JNI_TOMCAT_STARTED;
+}
+return JK_OK;
+}
+
if( component->setAttribute ==NULL )
return JK_OK;
@@ -505,15 +520,6 @@
return rc;
}
-/*
-*/
-JNIEXPORT void JNICALL
-Java_org_apache_jk_apr_AprImpl_jkStatus
- (JNIEnv *jniEnv, jobject o, jint statusCode )
-{
-jk_jni_status_code = statusCode;
-}
-
static JNINativeMethod org_apache_jk_apr_AprImpl_native_methods[] = {
{
"initialize", "()I",
@@ -562,10 +568,6 @@
{
"jkRecycle", "(JJ)V",
Java_org_apache_jk_apr_AprImpl_jkRecycle
-},
-{
-"jkStatus", "(I)V",
-Java_org_apache_jk_apr_AprImpl_jkStatus
},
};
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java
mturk 2002/06/30 02:59:02
Modified:jk/java/org/apache/jk/apr AprImpl.java
Log:
Removed the jkStatus native call.
Use the jkSetAttribute for TC startup signaling.
Revision ChangesPath
1.23 +1 -11 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AprImpl.java 29 Jun 2002 07:43:24 - 1.22
+++ AprImpl.java 30 Jun 2002 09:59:02 - 1.23
@@ -119,9 +119,6 @@
*/
public native void jkRecycle(long xEnv, long endpointP);
-/* Send a TC status code to the server */
-public static native void jkStatus(int code);
-
// Called from C
// XXX Check security, add guard or other protection
// It's better to do it the other way - on init 'push' AprImpl into
@@ -166,6 +163,7 @@
loadNative();
initialize();
+jkSetAttribute(0, 0, "channel:jni", "starting");
} catch( Throwable t ) {
throw new IOException( t.getMessage() );
}
@@ -183,14 +181,6 @@
jniMode=true;
}
-public static void jniStatus(int code) throws IOException {
-try {
-jkStatus( code);
-} catch( Throwable t) {
-throw new IOException( t.getMessage() );
-}
-}
-
/** This method of loading the libs doesn't require setting
* LD_LIBRARY_PATH. Assuming a 'right' binary distribution,
* or a correct build all files will be in their right place.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java
mturk 2002/06/30 02:59:11
Modified:jk/java/org/apache/jk/apr TomcatStarter.java
Log:
Removed the jkStatus native call.
Use the jkSetAttribute for TC startup signaling.
Revision ChangesPath
1.10 +3 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TomcatStarter.java29 Jun 2002 07:43:38 - 1.9
+++ TomcatStarter.java30 Jun 2002 09:59:11 - 1.10
@@ -15,13 +15,12 @@
public class TomcatStarter implements Runnable {
Class c;
String args[];
+AprImpl apr = new AprImpl();
public static String mainClasses[]={ "org.apache.tomcat.startup.Main",
"org.apache.catalina.startup.BootstrapService",
"org.apache.catalina.startup.Bootstrap"};
-public static final int TC_STARTING=1;
-public static final int TC_STARTED=2;
// If someone has time - we can also guess the classpath and do other
// fancy guessings.
@@ -71,12 +70,12 @@
public void run() {
System.err.println("Starting " + c.getName());
try {
-AprImpl.jniStatus(TC_STARTING);
Class argClass=args.getClass();
Method m=c.getMethod( "main", new Class[] {argClass} );
m.invoke( c, new Object[] { args } );
-AprImpl.jniStatus(TC_STARTED);
System.out.println("TomcatStarter: Done");
+if (apr.isLoaded())
+apr.jkSetAttribute(0, 0, "channel:jni", "done");
} catch( Throwable t ) {
t.printStackTrace(System.err);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi_redirector2.reg
mturk 2002/06/30 03:11:11 Modified:jk/native2/server/isapi isapi_redirector2.reg Log: Fix the workerFile key to workersFile Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg Index: isapi_redirector2.reg === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- isapi_redirector2.reg 19 May 2002 21:17:10 - 1.2 +++ isapi_redirector2.reg 30 Jun 2002 10:11:11 - 1.3 @@ -3,5 +3,5 @@ [HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi Redirector\2.0] "serverRoot"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat" "extensionUri"="/jakarta/isapi_redirector2.dll" -"workerFile"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat\\conf\\workers2.properties" +"workersFile"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat\\conf\\workers2.properties" -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_vm.h
mturk 2002/07/01 08:42:52 Modified:jk/native2/include jk_vm.h Log: Added destroy callback function. Revision ChangesPath 1.4 +2 -0 jakarta-tomcat-connectors/jk/native2/include/jk_vm.h Index: jk_vm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_vm.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_vm.h 12 Apr 2002 23:00:45 - 1.3 +++ jk_vm.h 1 Jul 2002 15:42:52 - 1.4 @@ -102,6 +102,8 @@ void *(*attach)(struct jk_env *env, struct jk_vm *p); void (*detach)(struct jk_env *env, struct jk_vm *p); + +void (*destroy)(struct jk_env *env, struct jk_vm *p); }; typedef struct jk_vm jk_vm_t; -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/07/01 08:44:16
Modified:jk/native2/common jk_worker_jni.c
Log:
On worker destroy call the TomcatStarter with the stop arg
to gracefuly shutdown the Tomcat.
Revision ChangesPath
1.21 +36 -23jakarta-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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_worker_jni.c 29 Jun 2002 18:29:09 - 1.20
+++ jk_worker_jni.c 1 Jul 2002 15:44:16 - 1.21
@@ -152,6 +152,10 @@
} else {
jniWorker->className = value;
}
+/* XXX Instead of ARG=start split to something like:
+ * startup=start
+ * shutdown=stop
+ */
} else if( strcmp( name, "ARG" )==0 ) {
jniWorker->args[jniWorker->nArgs]=value;
jniWorker->nArgs++;
@@ -308,7 +312,14 @@
jk_worker_t *_this=bean->object;
jni_worker_data_t *jniWorker;
jk_vm_t *vm=_this->workerEnv->vm;
-
+JNIEnv *jniEnv;
+jstring cmd_line = NULL;
+jstring stdout_name = NULL;
+jstring stderr_name = NULL;
+jclass jstringClass;
+jarray jargs;
+jstring arg=NULL;
+
if(!_this || ! _this->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"In destroy, assert failed - invalid parameters\n");
@@ -317,28 +328,30 @@
jniWorker = _this->worker_private;
-/* A MUCH better solution is to use the standard JDK1.3 mechanism.
- Or Ajp13 shutdown.
- I'll implement JDK1.3 after I check if I do need to do anything
- on the C side ( i.e. call System.exit() explicitely - I have a feeling
- the smart VM guys have added a hook to at_exit ).
-*/
-
-/* if(! jniWorker->jk_shutdown_method) { */
-/* env->l->jkLog(env, env->l, JK_LOG_EMERG, */
-/* "In destroy, Tomcat not intantiated\n"); */
-/* return JK_ERR; */
-/* } */
-
-/* if((jniEnv = vm->attach(env, vm))) { */
-/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
-/* "jni.destroy(), shutting down Tomcat...\n"); */
-/* (*jniEnv)->CallStaticVoidMethod(jniEnv, */
-/* jniWorker->jk_java_bridge_class, */
-/* jniWorker->jk_shutdown_method); */
-/* vm->detach(env, vm); */
-/* } */
-
+if((jniEnv = vm->attach(env, vm))) {
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jni.destroy(), shutting down Tomcat...\n");
+
+jstringClass=(*jniEnv)->FindClass(jniEnv, "java/lang/String" );
+jargs=(*jniEnv)->NewObjectArray(jniEnv, 1, jstringClass, NULL);
+
+/* XXX Need to make that arg customizable
+*/
+arg=(*jniEnv)->NewStringUTF(jniEnv, "stop" );
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jni.destroy() ARG stop\n");
+(*jniEnv)->SetObjectArrayElement(jniEnv, jargs, 0, arg );
+
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jni.destroy() calling main()...\n");
+
+(*jniEnv)->CallStaticVoidMethod(jniEnv,
+jniWorker->jk_java_bridge_class,
+jniWorker->jk_main_method,
+jargs,stdout_name,stderr_name);
+
+vm->destroy(env, vm);
+}
env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() done\n");
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c
mturk 2002/07/01 08:45:20
Modified:jk/native2/common jk_vm_default.c
Log:
Add the destroy callback that calls the DestroyJavaVM
Revision ChangesPath
1.19 +20 -0 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_vm_default.c 11 Jun 2002 21:19:31 - 1.18
+++ jk_vm_default.c 1 Jul 2002 15:45:20 - 1.19
@@ -613,6 +613,25 @@
return JK_OK;
}
+static void jk2_vm_destroy(jk_env_t *env, jk_vm_t *jkvm)
+{
+int err;
+JavaVM *jvm = (JavaVM *)jkvm->jvm;
+
+if( jvm == NULL ) {
+return;
+}
+
+err= (*jvm)->DestroyJavaVM(jvm);
+if(err == 0 ) {
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "vm.destroy() ok\n");
+} else {
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "vm.destroy() cannot destroy the JVM.\n");
+}
+}
+
static int JK_METHOD
jk2_jk_vm_setProperty(jk_env_t *env, jk_bean_t *mbean, char *name, void *valueP )
{
@@ -649,6 +668,7 @@
jkvm->init=jk2_vm_initVM;
jkvm->attach=jk2_vm_attach;
jkvm->detach=jk2_vm_detach;
+jkvm->destroy=jk2_vm_destroy;
result->object=jkvm;
result->setAttribute=jk2_jk_vm_setProperty;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
mturk 2002/07/01 08:46:20
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Register child_init pool cleanup function jk2_shutdown
Revision ChangesPath
1.38 +13 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_jk2.c 19 Jun 2002 18:27:25 - 1.37
+++ mod_jk2.c 1 Jul 2002 15:46:20 - 1.38
@@ -370,6 +370,17 @@
return overrides;
}
+static apr_status_t jk2_shutdown(void *data)
+{
+jk_env_t *env;
+if (workerEnv) {
+env=workerEnv->globalEnv;
+workerEnv->close(env, workerEnv);
+workerEnv = NULL;
+}
+return APR_SUCCESS;
+}
+
/** Initialize jk, using worker.properties.
We also use apache commands ( JkWorker, etc), but this use is
@@ -387,6 +398,7 @@
workerEnv->server_name = (char *)ap_get_server_version();
/* Should be done in post config instead (cf DAV2) */
/* ap_add_version_component(pconf, JK_EXPOSED_VERSION); */
+apr_pool_cleanup_register(pconf, NULL, jk2_shutdown, apr_pool_cleanup_null);
return NULL;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/01 09:53:55
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Grecefully shutdown the Tomcat when IIS service stops.
Revision ChangesPath
1.31 +7 -4
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_isapi_plugin.c 29 Jun 2002 14:17:27 - 1.30
+++ jk_isapi_plugin.c 1 Jul 2002 16:53:55 - 1.31
@@ -524,11 +524,14 @@
{
if (is_inited) {
is_inited = JK_FALSE;
-
-/* XXX Here goes a graceful shutdown of jk2, Free resources and pools
-*/
+if (workerEnv) {
+jk_env_t *env = workerEnv->globalEnv;
+workerEnv->close(env, workerEnv);
+}
+apr_pool_destroy(jk_globalPool);
+workerEnv=NULL;
+is_mapread = JK_FALSE;
}
-
return TRUE;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_win32.c
mturk 2002/07/02 05:04:40
Modified:jk/native2/common jk_logger_win32.c
Log:
Fix the Run-Time Check Failrue #3 -
The variable 'rc' is being used without being defined.
This solves the IIS startup for debug build.
Revision ChangesPath
1.7 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_logger_win32.c 10 Jun 2002 21:55:06 - 1.6
+++ jk_logger_win32.c 2 Jul 2002 12:04:40 - 1.7
@@ -137,7 +137,7 @@
const char *fmt,
va_list args)
{
-int rc;
+int rc = 0;
if(l->level <= level) {
char buf[HUGE_BUFFER_SIZE];
char *f = (char *)(file + strlen(file) - 1);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/07/02 05:06:46 Modified:jk/native2/common jk_worker_jni.c Log: Disable the call ro the DestoryJavaVM. This call should be invoked when the TomcatStarter or something else signals that there will be no more calls. Revision ChangesPath 1.23 +7 -2 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_worker_jni.c 1 Jul 2002 23:11:42 - 1.22 +++ jk_worker_jni.c 2 Jul 2002 12:06:46 - 1.23 @@ -378,13 +378,18 @@ env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() calling main()...\n"); - + (*jniEnv)->CallStaticVoidMethod(jniEnv, jniWorker->jk_java_bridge_class, jniWorker->jk_main_method, jargs,stdout_name,stderr_name); - +#if 0 +/* XXX Need to fix the TomcatStarter not calling jkSetAttribute + * and call the destroy JVM on that event. + * Perhaps the DestroyJavaVM is not needed at all. + */ vm->destroy(env, vm); +#endif } env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() done\n"); -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/07/02 05:08:25
Modified:jk/native2/common jk_channel_jni.c
Log:
Call the vm detach on 'afterRequest' and on
channel destoy.
Revision ChangesPath
1.31 +5 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_channel_jni.c 29 Jun 2002 18:31:00 - 1.30
+++ jk_channel_jni.c 2 Jul 2002 12:08:25 - 1.31
@@ -329,6 +329,10 @@
(*jniEnv)->DeleteGlobalRef( jniEnv, epData->jniJavaContext );
}
+jniCh->vm->detach( env, jniCh->vm );
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel_jni.close() ok\n" );
+
endpoint->channelData=NULL;
return JK_OK;
@@ -522,7 +526,7 @@
if( we==NULL || we->vm==NULL ) {
return JK_OK;
}
-/* we->vm->detach( env, we->vm ); */
+we->vm->detach( env, we->vm );
if( worker->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/04 00:23:55
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Set the starter thread extisting through entire extension life cycle.
The starter thread at init sleeps for 1 s, causing not blocking of
the main IIS thread that calls LoadLibrary for our extension.
Revision ChangesPath
1.32 +26 -6
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_isapi_plugin.c 1 Jul 2002 16:53:55 - 1.31
+++ jk_isapi_plugin.c 4 Jul 2002 07:23:55 - 1.32
@@ -520,8 +520,13 @@
return TerminateFilter(dwFlags);
}
+HANDLE jk2_starter_event;
+
BOOL WINAPI TerminateFilter(DWORD dwFlags)
{
+/* detatch the starter thread */
+SetEvent(jk2_starter_event);
+
if (is_inited) {
is_inited = JK_FALSE;
if (workerEnv) {
@@ -540,11 +545,14 @@
DWORD WINAPI jk2_isapi_starter( LPVOID lpParam )
{
+Sleep(1000);
+
initialize_extension();
if (is_inited) {
if (init_jk(NULL))
is_mapread = JK_TRUE;
}
+WaitForSingleObject(jk2_starter_event, INFINITE);
return 0;
}
@@ -558,21 +566,33 @@
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
DWORD dwThreadId;
+DWORD dwRes;
+int tcount = 0;
switch (ulReason) {
case DLL_PROCESS_DETACH:
-__try {
-if (jk2_starter_thread)
-CloseHandle(jk2_starter_thread);
-TerminateFilter(HSE_TERM_MUST_UNLOAD);
-} __except(1) {
+while (!GetExitCodeThread(jk2_starter_thread, &dwRes)) {
+if (dwRes == STILL_ACTIVE) {
+++tcount;
+if (tcount > 30) {
+TerminateThread(jk2_starter_thread, -1);
+break;
+}
+Sleep(100);
+}
}
+CloseHandle(jk2_starter_thread);
break;
case DLL_PROCESS_ATTACH:
if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
_splitpath( file_name, drive, dir, fname, NULL );
_makepath( ini_file_name, drive, dir, fname, ".properties" );
+
+jk2_starter_event = CreateEvent(NULL,
+FALSE,
+FALSE,
+NULL);
jk2_starter_thread = CreateThread( NULL,
0,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/04 05:44:56
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Use the WaitForSingleObject instead of GetThreatExitCode.
There was a bug that caused terminating the starter thread
before the entire clenup finished.
The entire extinsion start/stop management is now done in a
separate thread.
Revision ChangesPath
1.33 +17 -29
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_isapi_plugin.c 4 Jul 2002 07:23:55 - 1.32
+++ jk_isapi_plugin.c 4 Jul 2002 12:44:56 - 1.33
@@ -521,28 +521,17 @@
}
HANDLE jk2_starter_event;
+HANDLE jk2_starter_thread = NULL;
BOOL WINAPI TerminateFilter(DWORD dwFlags)
{
/* detatch the starter thread */
SetEvent(jk2_starter_event);
-
-if (is_inited) {
-is_inited = JK_FALSE;
-if (workerEnv) {
-jk_env_t *env = workerEnv->globalEnv;
-workerEnv->close(env, workerEnv);
-}
-apr_pool_destroy(jk_globalPool);
-workerEnv=NULL;
-is_mapread = JK_FALSE;
-}
+WaitForSingleObject(jk2_starter_thread, 3000);
return TRUE;
}
-HANDLE jk2_starter_thread = NULL;
-
DWORD WINAPI jk2_isapi_starter( LPVOID lpParam )
{
Sleep(1000);
@@ -552,7 +541,17 @@
if (init_jk(NULL))
is_mapread = JK_TRUE;
}
+
WaitForSingleObject(jk2_starter_event, INFINITE);
+
+if (is_inited) {
+is_inited = JK_FALSE;
+if (workerEnv) {
+jk_env_t *env = workerEnv->globalEnv;
+workerEnv->close(env, workerEnv);
+}
+is_mapread = JK_FALSE;
+}
return 0;
}
@@ -566,25 +565,17 @@
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
DWORD dwThreadId;
-DWORD dwRes;
-int tcount = 0;
switch (ulReason) {
case DLL_PROCESS_DETACH:
-while (!GetExitCodeThread(jk2_starter_thread, &dwRes)) {
-if (dwRes == STILL_ACTIVE) {
-++tcount;
-if (tcount > 30) {
-TerminateThread(jk2_starter_thread, -1);
-break;
-}
-Sleep(100);
-}
-}
+WaitForSingleObject(jk2_starter_thread, INFINITE);
CloseHandle(jk2_starter_thread);
+apr_terminate();
break;
case DLL_PROCESS_ATTACH:
+apr_initialize();
+apr_pool_create( &jk_globalPool, NULL );
if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
_splitpath( file_name, drive, dir, fname, NULL );
_makepath( ini_file_name, drive, dir, fname, ".properties" );
@@ -754,9 +745,6 @@
jk_pool_t *globalPool;
jk_bean_t *jkb;
jk_env_t *env;
-
-apr_initialize();
-apr_pool_create( &jk_globalPool, NULL );
jk2_pool_apr_create( NULL, &globalPool, NULL, jk_globalPool );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/06 01:05:49
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Fix the Q250397 bug introducing authComplete registry param
that one when set enables the SF_NOTIFY_AUTH_COMPLETE
filter notification.
Remove the iis5 version checking acordingly using new approach.
Revision ChangesPath
1.35 +83 -46
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_isapi_plugin.c 5 Jul 2002 08:12:09 - 1.34
+++ jk_isapi_plugin.c 6 Jul 2002 08:05:49 - 1.35
@@ -85,6 +85,7 @@
#define SERVER_ROOT_TAG ("serverRoot")
#define EXTENSION_URI_TAG ("extensionUri")
#define WORKERS_FILE_TAG("workersFile")
+#define USE_AUTH_COMP_TAG ("authComplete")
static char file_name[_MAX_PATH];
@@ -93,7 +94,7 @@
static int is_inited = JK_FALSE;
static int is_mapread = JK_FALSE;
static int was_inited = JK_FALSE;
-static int iis5 = -1;
+static int auth_notification_flags = 0;
static jk_workerEnv_t *workerEnv;
static apr_pool_t *jk_globalPool;
@@ -117,7 +118,7 @@
static jk_env_t* jk2_create_config();
-
+static int get_auth_flags();
static void write_error_response(PHTTP_FILTER_CONTEXT pfc,char *status,char * msg)
@@ -151,20 +152,23 @@
if (pVer->dwFilterVersion > http_filter_revision) {
pVer->dwFilterVersion = http_filter_revision;
}
-
+auth_notification_flags = get_auth_flags();
#ifdef SF_NOTIFY_AUTH_COMPLETE
-
-pVer->dwFlags = SF_NOTIFY_ORDER_HIGH|
-SF_NOTIFY_SECURE_PORT |
-SF_NOTIFY_NONSECURE_PORT|
-SF_NOTIFY_PREPROC_HEADERS |
-SF_NOTIFY_AUTH_COMPLETE;
-#else
-pVer->dwFlags = SF_NOTIFY_ORDER_HIGH|
-SF_NOTIFY_SECURE_PORT |
-SF_NOTIFY_NONSECURE_PORT|
-SF_NOTIFY_PREPROC_HEADERS;
+if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
+pVer->dwFlags = SF_NOTIFY_ORDER_HIGH|
+SF_NOTIFY_SECURE_PORT |
+SF_NOTIFY_NONSECURE_PORT|
+SF_NOTIFY_PREPROC_HEADERS |
+SF_NOTIFY_AUTH_COMPLETE;
+}
+else
#endif
+{
+pVer->dwFlags = SF_NOTIFY_ORDER_HIGH|
+SF_NOTIFY_SECURE_PORT |
+SF_NOTIFY_NONSECURE_PORT|
+SF_NOTIFY_PREPROC_HEADERS;
+}
strcpy(pVer->lpszFilterDesc, VERSION_STRING);
@@ -201,28 +205,8 @@
}
if (is_inited && is_mapread) {
env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
-if (is_inited && (iis5 < 0) ) {
-char serverSoftware[256];
-DWORD dwLen = sizeof(serverSoftware);
-iis5=0;
-if (pfc->GetServerVariable(pfc,SERVER_SOFTWARE, serverSoftware,
&dwLen)){
-iis5=(atof(serverSoftware + 14) >= 5.0);
-if (iis5) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,"Detected IIS >=
5.0\n");
-} else {
-env->l->jkLog(env, env->l, JK_LOG_INFO,"Detected IIS < 5.0\n");
-}
-}
-}
-#ifdef SF_NOTIFY_AUTH_COMPLETE
-if (is_inited &&
- (((SF_NOTIFY_PREPROC_HEADERS == dwNotificationType) && !iis5) ||
- ((SF_NOTIFY_AUTH_COMPLETE == dwNotificationType) && iis5)
- )
-)
-#else
-if (is_inited && (SF_NOTIFY_PREPROC_HEADERS == dwNotificationType))
-#endif
+
+if (auth_notification_flags == dwNotificationType)
{
char uri[INTERNET_MAX_URL_LENGTH];
char snuri[INTERNET_MAX_URL_LENGTH]="/";
@@ -240,22 +224,18 @@
DWORD szTranslate = sizeof(Translate);
#ifdef SF_NOTIFY_AUTH_COMPLETE
-if (iis5) {
+if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->GetHeader;
SetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->SetHeader;
AddHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->AddHeader;
-
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h
mturk 2002/07/06 01:06:55
Modified:jk/native2/server/isapi jk_iis.h
Log:
Some #defines for getting the erver version from registry
Revision ChangesPath
1.9 +1 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
Index: jk_iis.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_iis.h 27 Apr 2002 00:48:33 - 1.8
+++ jk_iis.h 6 Jul 2002 08:06:55 - 1.9
@@ -100,6 +100,7 @@
#define SERVER_SOFTWARE ("SERVER_SOFTWARE")
#define REGISTRY_LOCATION("Software\\Apache Software Foundation\\Jakarta
Isapi Redirector\\2.0")
+#define W3SVC_REGISTRY_KEY
("SYSTEM\\CurrentControlSet\\Services\\W3SVC\\Parameters")
#define BAD_REQUEST -1
#define BAD_PATH-2
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi_redirector2.reg
mturk 2002/07/06 01:07:41 Modified:jk/native2/server/isapi isapi_redirector2.reg Log: The new DWORD param authComplete set to any nonzero value to activate. Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg Index: isapi_redirector2.reg === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- isapi_redirector2.reg 30 Jun 2002 10:11:11 - 1.3 +++ isapi_redirector2.reg 6 Jul 2002 08:07:41 - 1.4 @@ -4,4 +4,4 @@ "serverRoot"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat" "extensionUri"="/jakarta/isapi_redirector2.dll" "workersFile"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat\\conf\\workers2.properties" - +"authComplete"=dword: -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java
mturk 2002/07/07 04:09:01
Modified:jk/java/org/apache/jk/apr TomcatStarter.java
Log:
Fix the reporting of 'No class found' error message on the stderr.
Revision ChangesPath
1.12 +4 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TomcatStarter.java1 Jul 2002 23:12:33 - 1.11
+++ TomcatStarter.java7 Jul 2002 11:09:00 - 1.12
@@ -26,6 +26,7 @@
public static void main( String args[] ) {
System.err.println("TomcatStarter: main()");
+int nClasses = 0;
try {
AprImpl.jniMode();
@@ -39,13 +40,15 @@
continue;
}
if( c!= null ) {
+++nClasses;
Thread startThread=new Thread( new TomcatStarter(c, args));
c=null;
startThread.start();
break;
}
}
-System.err.println("No class found ");
+if (nClasses==0)
+System.err.println("No class found ");
} catch (Throwable t ) {
t.printStackTrace(System.err);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis_thread_pool.c
mturk 2002/07/08 00:43:51 Added: jk/native2/server/isapi jk_iis_thread_pool.c Log: IIS Thread pool. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c Index: jk_iis_thread_pool.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2002 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * "This product includes software developed by the Apache Software * *Foundation <http://www.apache.org/>." * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names "The Jakarta Project", "Jk", and "Apache Software * *Foundation" must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact <[EMAIL PROTECTED]>.* * * * 5. Products derived from this software may not be called "Apache" nor may * *"Apache" appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see <http://www.apache.org/>. * * * * = */ /*
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/08 00:45:32
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Move the init to the GetFilterVersion, allowing p file authComplete
config value.
Needed changes for the ThreadPool.
Revision ChangesPath
1.37 +160 -145
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_isapi_plugin.c 8 Jul 2002 00:26:07 - 1.36
+++ jk_isapi_plugin.c 8 Jul 2002 07:45:32 - 1.37
@@ -86,6 +86,7 @@
#define EXTENSION_URI_TAG ("extensionUri")
#define WORKERS_FILE_TAG("workersFile")
#define USE_AUTH_COMP_TAG ("authComplete")
+#define THREAD_POOL_TAG ("threadPool")
static char file_name[_MAX_PATH];
@@ -95,9 +96,10 @@
static int is_mapread = JK_FALSE;
static int was_inited = JK_FALSE;
static int auth_notification_flags = 0;
+static int use_auth_notification_flags = 0;
static jk_workerEnv_t *workerEnv;
-static apr_pool_t *jk_globalPool;
+apr_pool_t *jk_globalPool;
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
"/jakarta/isapi_redirector2.dll";
static char worker_file[MAX_PATH * 2] = "";
@@ -120,6 +122,10 @@
static jk_env_t* jk2_create_config();
static int get_auth_flags();
+/* ThreadPool support
+ *
+ */
+int use_thread_pool = 0;
static void write_error_response(PHTTP_FILTER_CONTEXT pfc,char *status,char * msg)
{
@@ -141,14 +147,58 @@
pfc->WriteClient(pfc, msg, &len, 0);
}
+HANDLE jk2_starter_event;
+HANDLE jk2_inited_event;
+HANDLE jk2_starter_thread = NULL;
+
+DWORD WINAPI jk2_isapi_starter( LPVOID lpParam )
+{
+Sleep(1000);
+
+apr_initialize();
+apr_pool_create( &jk_globalPool, NULL );
+initialize_extension();
+if (is_inited) {
+if (init_jk(NULL))
+is_mapread = JK_TRUE;
+}
+SetEvent(jk2_inited_event);
+WaitForSingleObject(jk2_starter_event, INFINITE);
+
+if (is_inited) {
+was_inited = JK_TRUE;
+is_inited = JK_FALSE;
+if (workerEnv) {
+jk_env_t *env = workerEnv->globalEnv;
+jk2_iis_close_pool(env);
+workerEnv->close(env, workerEnv);
+}
+is_mapread = JK_FALSE;
+}
+apr_pool_destroy(jk_globalPool);
+apr_terminate();
+return 0;
+}
BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
{
ULONG http_filter_revision = HTTP_FILTER_REVISION;
+DWORD dwThreadId;
+jk2_inited_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+jk2_starter_event = CreateEvent(NULL, FALSE, FALSE, NULL);
-pVer->dwFilterVersion = pVer->dwServerFilterVersion;
+jk2_starter_thread = CreateThread(NULL, 0,
+ jk2_isapi_starter,
+ NULL,
+ 0,
+ &dwThreadId);
+WaitForSingleObject(jk2_inited_event, INFINITE);
+if (!is_inited || !is_mapread) {
+return FALSE;
+}
+pVer->dwFilterVersion = pVer->dwServerFilterVersion;
if (pVer->dwFilterVersion > http_filter_revision) {
pVer->dwFilterVersion = http_filter_revision;
}
@@ -403,108 +453,109 @@
return TRUE;
}
-DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpEcb)
+DWORD WINAPI HttpExtensionProcWorker(LPEXTENSION_CONTROL_BLOCK lpEcb,
+ jk_ws_service_t *service)
{
DWORD rc = HSE_STATUS_ERROR;
jk_env_t *env;
-lpEcb->dwHttpStatusCode = HTTP_STATUS_SERVER_ERROR;
+jk_ws_service_t sOnStack;
+jk_ws_service_t *s;
+char *worker_name;
+char huge_buf[16 * 1024]; /* should be enough for all */
+DWORD huge_buf_sz;
+jk_worker_t *worker;
+jk_pool_t *rPool=NULL;
+int rc1;
-if (!is_inited) {
-initialize_extension();
-}
+if (service)
+s = service;
+else
+s = &sOnStack;
-/* Initialise jk */
-if (is_inited && !is_mapread) {
-char serverName[MAX_SERVERNAME];
-DWORD dwLen = sizeof(serverName);
-if (lpEcb->GetServerVariable(lpEcb->ConnID, SERVER_NAME, serverName,
&dwLen)){
-if (dwLen > 0) serverName[dwLen-1] = '\0';
-if (init_jk(serverName))
-is_mapread = JK_TRUE;
-}
-if (!is_maprea
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
mturk 2002/07/08 00:46:02 Modified:jk/native2/server/isapi isapi.dsp Log: Add the jk_iis_thread_pool.c to the build. Revision ChangesPath 1.17 +4 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- isapi.dsp 12 Jun 2002 23:26:35 - 1.16 +++ isapi.dsp 8 Jul 2002 07:46:02 - 1.17 @@ -145,6 +145,10 @@ # End Source File # Begin Source File +SOURCE=.\jk_iis_thread_pool.c +# End Source File +# Begin Source File + SOURCE=..\..\jni\jk_jni_aprImpl.c # End Source File # Begin Source File -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h
mturk 2002/07/08 00:48:47 Modified:jk/native2/server/isapi jk_iis.h Log: Add the needed prototypes for the ThreadPool. Revision ChangesPath 1.10 +7 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h Index: jk_iis.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_iis.h 6 Jul 2002 08:06:55 - 1.9 +++ jk_iis.h 8 Jul 2002 07:48:47 - 1.10 @@ -157,6 +157,13 @@ DWORD bufsz, char *def_val); +DWORD WINAPI HttpExtensionProcWorker(LPEXTENSION_CONTROL_BLOCK lpEcb, + jk_ws_service_t *service); + +int jk2_iis_init_pool(jk_env_t *env); +int jk2_iis_thread_pool(LPEXTENSION_CONTROL_BLOCK lpEcb); +int jk2_iis_close_pool(jk_env_t *env); + #ifdef __cplusplus } #endif /* __cplusplus */ -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_logger_apache2.c
mturk 2002/07/08 05:13:51
Modified:jk/native2/server/apache2 jk_logger_apache2.c
Log:
Change the JK_LOG_INFO to be logged as [notice] instead of [warning].
This is much more intuitive for the context we are logging.
Revision ChangesPath
1.27 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_logger_apache2.c 12 Jun 2002 12:42:25 - 1.26
+++ jk_logger_apache2.c 8 Jul 2002 12:13:51 - 1.27
@@ -136,7 +136,7 @@
if( level == JK_LOG_DEBUG_LEVEL ) {
ap_log_error( file, line, APLOG_DEBUG | APLOG_NOERRNO, 0, s, buf);
} else if( level == JK_LOG_INFO_LEVEL ) {
-ap_log_error( file, line, APLOG_WARNING | APLOG_NOERRNO, 0, s, buf);
+ap_log_error( file, line, APLOG_NOTICE | APLOG_NOERRNO, 0, s, buf);
} else {
ap_log_error( file, line, APLOG_ERR | APLOG_NOERRNO, 0, s, buf);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/07/08 06:30:57
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
no message
Revision ChangesPath
1.27 +5 -5
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_service_apache2.c 10 Jun 2002 21:55:08 - 1.26
+++ jk_service_apache2.c 8 Jul 2002 13:30:56 - 1.27
@@ -126,7 +126,7 @@
numheaders = headers->size(env, headers);
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
if( debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"service.head() %d %d %#lx\n", s->status,
numheaders, s->uriEnv);
@@ -137,7 +137,7 @@
val=s->pool->pstrdup( env, s->pool, val );
if( debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"service.head() %s: %s %d %d\n", name, val, h,
headers->size( env, headers ));
/* the cmp can also be avoided in we do this earlier and use
@@ -257,7 +257,7 @@
if(!s->response_started) {
if( debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"service.write() default head\n");
rc=s->head(env, s);
if( rc != JK_OK) {
@@ -273,7 +273,7 @@
if( debug > 0 ) {
for(i = 0 ; i < t->nelts ; i++) {
-env->l->jkLog(env, env->l, JK_LOG_INFO, "OutHeaders %s:
%s\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "OutHeaders %s:
%s\n",
elts[i].key, elts[i].val);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
mturk 2002/07/08 06:31:23
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
no message
Revision ChangesPath
1.39 +5 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_jk2.c 1 Jul 2002 15:46:20 - 1.38
+++ mod_jk2.c 8 Jul 2002 13:31:23 - 1.39
@@ -580,7 +580,7 @@
}
if( uriEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"mod_jk.handler() serving %s with %#lx %#lx %s\n",
uriEnv->mbean->localName, worker, worker->mbean,
worker->mbean->localName );
@@ -590,7 +590,7 @@
if( rPool == NULL ) {
rPool=worker->mbean->pool->create( env, worker->mbean->pool, HUGE_POOL_SIZE
);
if( uriEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"mod_jk.handler(): new rpool %#lx\n", rPool );
}
@@ -656,7 +656,7 @@
*/
if( uriEnv!= NULL && uriEnv->workerName != NULL) {
if( uriEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"PerDir mapping %s=%s\n",r->uri, uriEnv->workerName);
ap_set_module_config( r->request_config, &jk2_module, uriEnv );
@@ -692,7 +692,7 @@
r->handler=JK_HANDLER;
if( uriEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"mod_jk.translate(): uriMap %s %s %#lx\n",
r->uri, uriEnv->workerName, uriEnv->worker);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c
mturk 2002/07/08 06:32:15
Modified:jk/native2/common jk_workerEnv.c
Log:
no message
Revision ChangesPath
1.56 +5 -5 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- jk_workerEnv.c20 Jun 2002 18:45:01 - 1.55
+++ jk_workerEnv.c8 Jul 2002 13:32:14 - 1.56
@@ -326,7 +326,7 @@
if( wEnv->shm != NULL && wEnv->shm->head != NULL ) {
wEnv->shm->reset( env, wEnv->shm);
if( wEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_ERROR, "workerEnv.init() Reset shm\n"
);
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "workerEnv.init() Reset shm\n"
);
}
return JK_OK;
}
@@ -378,7 +378,7 @@
jk_bean_t *jkb=env->createBean2(env, wEnv->pool, "lb", "lb" );
w=jkb->object;
if( wEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_ERROR, "workerEnv.init() create
default worker %s\n", jkb->name );
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "workerEnv.init() create
default worker %s\n", jkb->name );
}
wEnv->defaultWorker= w;
}
@@ -427,7 +427,7 @@
}
if( wEnv->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"workerEnv.dispatch() Calling %d %s\n", handler->messageId,
handler->name);
@@ -470,7 +470,7 @@
handler=NULL;
if( ep->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"workerEnv.callbacks() %s\n",
ep->worker->channel->mbean->name);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
mturk 2002/07/08 06:32:49 Modified:jk/native2/common jk_worker_status.c Log: no message Revision ChangesPath 1.30 +1 -1 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_worker_status.c10 Jun 2002 21:55:06 - 1.29 +++ jk_worker_status.c8 Jul 2002 13:32:49 - 1.30 @@ -423,7 +423,7 @@ int didUpdate; if( w->mbean->debug > 0 ) -env->l->jkLog(env, env->l, JK_LOG_INFO, "status.service() %s %s\n", +env->l->jkLog(env, env->l, JK_LOG_DEBUG, "status.service() %s %s\n", JK_CHECK_NULL(uri), JK_CHECK_NULL(s->query_string)); /* Generate the header */ -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
mturk 2002/07/08 06:33:38
Modified:jk/native2/common jk_worker_lb.c
Log:
no message
Revision ChangesPath
1.23 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_worker_lb.c29 Jun 2002 18:28:10 - 1.22
+++ jk_worker_lb.c8 Jul 2002 13:33:38 - 1.23
@@ -374,7 +374,7 @@
}
if( lb->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"lb.service() try %s\n", rec->mbean->name );
if( rec->route==NULL ) {
@@ -446,7 +446,7 @@
* another worker... Lets try to do that.
*/
if( lb->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"lb_worker.service() try other hosts\n");
}
}
@@ -512,7 +512,7 @@
lb->lbWorkerMap->add(env, lb->lbWorkerMap, value, "");
if( lb->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"lb_worker.setAttribute(): Adding to %s: %s\n",
lb->mbean->localName, value);
jk2_lb_refresh( env, lb );
@@ -542,7 +542,7 @@
/* if( lb->workerEnv->shm != NULL && lb->workerEnv->shm->head != NULL) */
/* jk2_lb_updateWorkers(env, lb, lb->workerEnv->shm); */
if( lb->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "lb.init() %s %d workers\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "lb.init() %s %d workers\n",
lb->mbean->name, num_of_workers );
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
mturk 2002/07/08 06:34:26
Modified:jk/native2/common jk_worker_ajp13.c
Log:
no message
Revision ChangesPath
1.38 +15 -15jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_worker_ajp13.c 8 Jul 2002 00:26:07 - 1.37
+++ jk_worker_ajp13.c 8 Jul 2002 13:34:26 - 1.38
@@ -202,7 +202,7 @@
static void jk2_close_endpoint(jk_env_t *env, jk_endpoint_t *ae)
{
if( ae->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "endpoint.close() %s\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "endpoint.close() %s\n",
ae->worker->mbean->name);
/* ae->reuse = JK_FALSE; */
@@ -236,7 +236,7 @@
}
if( ae->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.connect() %s %s\n", ae->worker->channelName,
channel->mbean->name );
err=channel->open( env, channel, ae );
@@ -324,7 +324,7 @@
return err;
}
if( worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.service() connecting to endpoint \n");
}
@@ -422,16 +422,16 @@
int err;
if( e->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.forwardST() Before calling native channel %s\n",
e->worker->channel->mbean->name);
err=e->worker->channel->send( env, e->worker->channel, e,
e->request );
if( e->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.forwardST() After %d\n",err);
-
+
return err;
}
@@ -483,7 +483,7 @@
}
if( w->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.service() %s\n", w->channelName);
if( w->channel->beforeRequest != NULL ) {
@@ -502,7 +502,7 @@
}
if( w->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.service() done %s\n", e->worker->mbean->name);
if( w->channel->afterRequest != NULL ) {
@@ -547,7 +547,7 @@
return rc;
}
if( w->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.done() return to pool %s\n",
w->mbean->name );
return JK_OK;
@@ -603,11 +603,11 @@
if( ajp13->mbean->debug > 0 ) {
if (ret==JK_OK)
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.getEndpoint(): Created endpoint %s %s \n",
ajp13->mbean->name, jkb->name);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.getEndpoint(): endpoint creation %s %s failed\n",
ajp13->mbean->name, jkb->name);
}
@@ -725,7 +725,7 @@
lb->mbean->setAttribute(env, lb->mbean, "worker",
ajp13->mbean->name);
if( ajp13->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ajp13.init(): Adding %s to default lb\n",
ajp13->mbean->localName);
} else {
for( i=0; imbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c
mturk 2002/07/08 06:35:02
Modified:jk/native2/common jk_vm_default.c
Log:
no message
Revision ChangesPath
1.21 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_vm_default.c 5 Jul 2002 08:06:51 - 1.20
+++ jk_vm_default.c 8 Jul 2002 13:35:02 - 1.21
@@ -237,7 +237,7 @@
}
if( jkvm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"jni.loadJvm() %s symbols resolved\n",
jkvm->jvm_dll_path);
@@ -273,8 +273,8 @@
appropriate interface. There is no need to call the AttachCurrentThread.
*/
if( err == 0) {
-if( jkvm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.attach() allready
attached\n");
+if( jkvm->mbean->debug >= 0 )
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "vm.attach() allready
attached\n");
return (void *)rc;
}
/* The error code is either JNI_OK (allready attached) or JNI_EDETACHED.
@@ -295,8 +295,8 @@
"vm.attach() error %d\n", err);
return NULL;
}
-if( jkvm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.attach() ok\n");
+if( jkvm->mbean->debug >= 0 )
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "vm.attach() ok\n");
return (void *)rc;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
mturk 2002/07/08 06:35:53
Modified:jk/native2/common jk_uriMap.c
Log:
no message
Revision ChangesPath
1.35 +18 -18jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_uriMap.c 10 Jun 2002 21:55:06 - 1.34
+++ jk_uriMap.c 8 Jul 2002 13:35:53 - 1.35
@@ -144,7 +144,7 @@
{
uriMap->maps->put( env, uriMap->maps, uriEnv->name, uriEnv, NULL );
if( uriMap->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.addUriEnv() %s %s %s\n", uriEnv->name,
uriEnv->virtual, uriEnv->uri);
return JK_OK;
}
@@ -211,7 +211,7 @@
if(0 == strcmp(suffix, uwr->suffix)) {
#endif
if( uriMap->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l,JK_LOG_INFO,
+env->l->jkLog(env, env->l,JK_LOG_DEBUG,
"uriMap.mapUri() suffix match %s\n",
uwr->suffix );
}
@@ -336,7 +336,7 @@
uriMap->defaultVhost=mbean->object;
if( uriMap->mbean->debug > 5 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "uriMap.init() set default
host\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "uriMap.init() set default
host\n");
/* Initialize the vhosts table */
for(i = 0 ; i < uriMap->maps->size( env, uriMap->maps ) ; i++) {
@@ -350,7 +350,7 @@
uriEnv->virtual, uriEnv, NULL );
}
if( uriMap->mbean->debug > 5 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.init() loaded host %s\n",uriEnv->virtual);
}
}
@@ -390,7 +390,7 @@
env->createBean2( env, uriMap->mbean->pool, "uri", uriPath );
rootCtx=env->getByName2( env, "uri", uriPath );
if( uriMap->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.init() Create default context %s\n", uriPath
);
rootCtx->mbean->setAttribute( env, rootCtx->mbean, "context", "/" );
}
@@ -401,7 +401,7 @@
env->createBean2( env, uriMap->mbean->pool, "uri", "/" );
uriEnv=env->getByName2( env, "uri", "/" );
if( uriMap->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.init() Create default context / ( for default
host )\n" );
uriEnv->mbean->setAttribute( env, uriEnv->mbean, "context", "/" );
}
@@ -413,7 +413,7 @@
char *uri;
char *context;
if( uriEnv==NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.init() NPE\n");
}
uri=uriEnv->uri;
@@ -424,7 +424,7 @@
jk_uriEnv_t *hostEnv=jk2_uriMap_hostMap( env, uriMap, vhost );
if( uriMap->mbean->debug > 5 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.init() loaded context %s %s %#lx %#lx %#lx\n",
uriEnv->virtual, context, hostEnv, hostEnv->webapps,
uriMap->pool);
@@ -442,7 +442,7 @@
}
if( uriMap->mbean->debug > 5 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriMap.init() processing mappings\n");
/* All other mappings are added in the right context leaf.
@@ -487,7 +487,7 @@
{
if( uriMap->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "uriMap.destroy()\n")
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
mturk 2002/07/08 06:36:29
Modified:jk/native2/common jk_uriEnv.c
Log:
no message
Revision ChangesPath
1.24 +9 -9 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_uriEnv.c 10 Jun 2002 21:55:06 - 1.23
+++ jk_uriEnv.c 8 Jul 2002 13:36:29 - 1.24
@@ -260,16 +260,16 @@
}
if( uriEnv->mbean->debug > 0 ) {
if( uriEnv->match_type == MATCH_TYPE_CONTEXT ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() context mapping %s=%s \n",
uriEnv->prefix, uriEnv->workerName);
} else if( uriEnv->match_type == MATCH_TYPE_HOST ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() host mapping %s=%s \n",
uriEnv->virtual, uriEnv->workerName);
} else {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() exact mapping %s=%s \n",
uriEnv->prefix, uriEnv->workerName);
}
@@ -297,7 +297,7 @@
uriEnv->match_type = MATCH_TYPE_CONTEXT_PATH;
if( uriEnv->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"Into jk_uri_worker_map_t::uri_worker_map_open, "
"general context path rule %s * %s -> %s was added\n",
uri, asterisk + 2, uriEnv->workerName);
@@ -311,7 +311,7 @@
uriEnv->suffix = asterisk + 3;
uriEnv->match_type = MATCH_TYPE_SUFFIX;
if( uriEnv->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() suffix mapping %s .%s=%s was added\n",
uriEnv->prefix, uriEnv->suffix, uriEnv->workerName);
}
@@ -323,7 +323,7 @@
uriEnv->prefix_len =strlen( uriEnv->prefix );
uriEnv->match_type = MATCH_TYPE_GENERAL_SUFFIX;
if( uriEnv->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() general suffix mapping %s.%s=%s\n",
uri, asterisk + 2, uriEnv->workerName);
}
@@ -336,7 +336,7 @@
uriEnv->prefix_len =strlen( uriEnv->prefix );
uriEnv->match_type = MATCH_TYPE_PREFIX;
if( uriEnv->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() prefix mapping %s=%s\n",
uriEnv->prefix, uriEnv->workerName);
}
@@ -349,13 +349,13 @@
uriEnv->suffix = NULL;
uriEnv->match_type = MATCH_TYPE_PREFIX;
if( uriEnv->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.init() prefix mapping2 %s=%s\n",
uri, uriEnv->workerName);
}
}
if( uriEnv->mbean->debug > 0 )
-env->l->jkLog( env, env->l, JK_LOG_INFO,
+env->l->jkLog( env, env->l, JK_LOG_DEBUG,
"uriEnv.init() %s host=%s uri=%s type=%d ctx=%s prefix=%s
suffix=%s\n",
uriEnv->mbean->name, uriEnv->virtual, uriEnv->uri,
uriEnv->match_type, uriEnv->contextPath, uriEnv->prefix,
uriEnv->suffix );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
mturk 2002/07/08 06:37:10
Modified:jk/native2/common jk_shm.c
Log:
no message
Revision ChangesPath
1.28 +8 -8 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_shm.c 12 Jun 2002 12:40:17 - 1.27
+++ jk_shm.c 8 Jul 2002 13:37:10 - 1.28
@@ -128,12 +128,12 @@
shm->head = (jk_shm_head_t *)shm->image;
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.create(): GLOBAL_SHM %#lx\n", shm->image );
return JK_OK;
} else {
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.create(): NO GLOBAL_SHM %#lx\n", shm->image );
}
@@ -157,7 +157,7 @@
rc=apr_file_info_get(&finfo, APR_FINFO_SIZE, file);
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.create(): file open %s %d %d\n", shm->fname, shm->size,
finfo.size );
if( finfo.size < shm->size ) {
@@ -254,7 +254,7 @@
}
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.create(): file open %s %d %d\n", shm->fname, shm->size,
filestat.st_size );
if (filestat.st_size < shm->size ) {
@@ -342,7 +342,7 @@
}
if( shm->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.init(): file=%s size=%d\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "shm.init(): file=%s size=%d\n",
shm->fname, shm->size);
}
@@ -362,7 +362,7 @@
}
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.create(): shm created %#lx\n", shm->head );
return JK_OK;
@@ -383,7 +383,7 @@
shm->head->lastSlot = 1;
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.init() Reset %s %#lx\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "shm.init() Reset %s %#lx\n",
shm->fname, shm->image);
return JK_OK;
@@ -538,7 +538,7 @@
jk_shm_t *shm=(jk_shm_t *)bean->object;
if( shm->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"shm.%d() \n", code);
switch( code ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c
mturk 2002/07/08 06:37:54
Modified:jk/native2/common jk_requtil.c
Log:
no message
Revision ChangesPath
1.23 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_requtil.c 10 Jun 2002 21:55:06 - 1.22
+++ jk_requtil.c 8 Jul 2002 13:37:54 - 1.23
@@ -575,7 +575,7 @@
}
} else {
if( debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"serialize.request() Add headerName %s\n", name);
if (msg->appendString(env, msg, name)) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -700,7 +700,7 @@
if( debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"serialize.request() serialized %s\n", s->req_uri);
/* msg->dump( env, msg, "Dump: " ); */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_mutex.c
mturk 2002/07/08 06:38:26
Modified:jk/native2/common jk_mutex.c
Log:
no message
Revision ChangesPath
1.4 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c
Index: jk_mutex.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_mutex.c10 Jun 2002 21:55:06 - 1.3
+++ jk_mutex.c8 Jul 2002 13:38:26 - 1.4
@@ -77,23 +77,23 @@
int rc=JK_OK;
if( mutex->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"mutex.%d() \n", code);
switch( code ) {
case MUTEX_LOCK: {
if( mutex->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.open()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "mutex.open()\n");
return mutex->lock(env, mutex);
}
case MUTEX_TRYLOCK: {
if( mutex->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.close()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "mutex.close()\n");
return mutex->tryLock(env, mutex);
}
case MUTEX_UNLOCK: {
if( mutex->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.recv()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "mutex.recv()\n");
return mutex->unLock(env, mutex);
}
}/* switch */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_handler_response.c
mturk 2002/07/08 06:39:12 Modified:jk/native2/common jk_handler_response.c Log: no message Revision ChangesPath 1.23 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c Index: jk_handler_response.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_handler_response.c 20 Jun 2002 18:45:01 - 1.22 +++ jk_handler_response.c 8 Jul 2002 13:39:12 - 1.23 @@ -152,7 +152,7 @@ jk_xlate_from_ascii(valueS, strlen(valueS)); if(debug > 0 ) -env->l->jkLog(env, env->l, JK_LOG_INFO, +env->l->jkLog(env, env->l, JK_LOG_DEBUG, "handler.response() Header[%d] [%s] = [%s]\n", i, nameS, valueS); @@ -169,7 +169,7 @@ if(debug > 0 ) -env->l->jkLog(env, env->l, JK_LOG_INFO, +env->l->jkLog(env, env->l, JK_LOG_DEBUG, "handler.response(): status=%d headers=%d\n", s->status, headerCount); -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c
mturk 2002/07/08 06:40:02
Modified:jk/native2/common jk_env.c
Log:
no message
Revision ChangesPath
1.37 +7 -7 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_env.c 11 Jun 2002 02:51:18 - 1.36
+++ jk_env.c 8 Jul 2002 13:40:02 - 1.37
@@ -154,7 +154,7 @@
if( env->l == NULL )
fprintf( stderr, "env:Create child env %#lx %#lx\n", parentEnv,
env);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env:Create child env %#lx %#lx\n", parentEnv, env);
}
}
@@ -245,7 +245,7 @@
if( env->debug > 0 ) {
if( env->l != NULL ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.createBean2(): Create [%s] %s\n", type, localName);
} else {
fprintf(stderr, "env.createBean2(): Create [%s] %s\n", type, localName);
@@ -309,7 +309,7 @@
if( env->l == NULL )
fprintf(stderr,"env.createBean2(): register %s %#lx\n", result->name,
result->object);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.createBean2(): register %s %#lx\n", result->name,
result->object);
}
@@ -342,7 +342,7 @@
if( env->debug > 0 )
fprintf(stderr,"env.alias(): Not found %s\n", name);
} else {
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.alias(): Not found %s\n", name);
}
return ;
@@ -352,7 +352,7 @@
if( env->l == NULL )
fprintf(stderr,"env.alias(): alias %s %s\n", name, alias);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.alias(): alias %s %s\n", name, alias);
}
@@ -370,7 +370,7 @@
if( env->l == NULL )
fprintf(stderr,"env.getByName(): Can't find %#lx %s\n", env, name);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.getByName(): Can't find %#lx %s\n", env, name);
}
return NULL;
@@ -380,7 +380,7 @@
if( env->l == NULL )
fprintf(stderr,"env.getByName(): Get by name %s %#lx\n", name,
result->object);
else
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"env.getByName(): Get by name %s %#lx\n", name,
result->object);
}
return result->object;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_endpoint.c
mturk 2002/07/08 06:40:27
Modified:jk/native2/common jk_endpoint.c
Log:
no message
Revision ChangesPath
1.21 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Index: jk_endpoint.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_endpoint.c 5 Jul 2002 08:05:15 - 1.20
+++ jk_endpoint.c 8 Jul 2002 13:40:27 - 1.21
@@ -103,14 +103,14 @@
ep->workerEnv->epStat->structSize=sizeof( jk_stat_t );
ep->workerEnv->epStat->structCnt=ep->mbean->id + 1;
if( ep->worker != NULL && ep->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"SHM stats %d %#lx %#lx %s %s childId=%d\n",
ep->mbean->id,
ep->workerEnv->epStat->data, stats,
ep->mbean->localName, ep->mbean->name,
ep->workerEnv->childId);
} else {
stats = (jk_stat_t *)ep->mbean->pool->calloc( env, ep->mbean->pool, sizeof(
jk_stat_t ) );
if( ep->worker != NULL && ep->worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"Local stats %d %#lx %d\n", ep->mbean->id,
ep->workerEnv->epStat, ep->workerEnv->childId );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config_file.c
mturk 2002/07/08 06:40:41
Modified:jk/native2/common jk_config_file.c
Log:
no message
Revision ChangesPath
1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_config_file.c 10 Jun 2002 21:55:06 - 1.3
+++ jk_config_file.c 8 Jul 2002 13:40:41 - 1.4
@@ -265,7 +265,7 @@
if( !firstTime && statbuf.st_mtime < cfg->mtime ) {
if( cfg->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_ERROR,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"config.update(): No reload needed %s %ld %ld\n",
cfg->file,
cfg->mtime, statbuf.st_mtime );
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config.c
mturk 2002/07/08 06:40:54
Modified:jk/native2/common jk_config.c
Log:
no message
Revision ChangesPath
1.27 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_config.c 10 Jun 2002 21:55:06 - 1.26
+++ jk_config.c 8 Jul 2002 13:40:54 - 1.27
@@ -199,7 +199,7 @@
}
if( cfg->mbean->debug > 0 )
-env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / %#lx / %s =
%s\n",
+env->l->jkLog( env, env->l, JK_LOG_DEBUG, "config: set %s / %s / %#lx / %s
= %s\n",
mbean->name, name, mbean, pname, val);
if( strcmp( name, "name" ) == 0 ) {
@@ -234,7 +234,7 @@
/* 'file' property on ourself, avoid rec.
*/
if( cfg->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"config.setAttribute() ignore %s %s %s\n", mbean->name,
name, val );
return JK_OK;
@@ -247,7 +247,7 @@
"config.setAttribute() Error setting %s %s %s\n",
mbean->name, name, val );
}
if( cfg->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"config.setAttribute() %d setting %s %s %s\n",
cfg->mbean->debug, mbean->name, name, val );
return rc;
@@ -401,13 +401,13 @@
char *verString;
if( cfg->mbean->debug > 5 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"config.setConfig(): process %s\n", name );
bean=env->getBean( env, name );
if( bean==NULL ) {
if( cfg->mbean->debug > 0 ) {
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"config.setConfig(): Creating %s\n", name );
}
bean=env->createBean( env, cfg->pool, name );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_un.c
mturk 2002/07/08 06:41:13
Modified:jk/native2/common jk_channel_un.c
Log:
no message
Revision ChangesPath
1.13 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Index: jk_channel_un.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_channel_un.c 10 Jun 2002 21:55:06 - 1.12
+++ jk_channel_un.c 8 Jul 2002 13:41:13 - 1.13
@@ -160,7 +160,7 @@
strcpy(socketInfo->unix_addr.sun_path, socketInfo->file );
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelUn.init(): create AF_UNIX %s\n",
socketInfo->file );
} else {
env->l->jkLog(env, env->l, JK_LOG_ERROR, "channelUn.init(): "
@@ -263,7 +263,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelUn.open(): create unix socket %s %d\n",
socketInfo->file, unixsock );
if (connect(unixsock,(struct sockaddr *)&(socketInfo->unix_addr),
@@ -277,7 +277,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelUn.open(): connect unix socket %d %s\n", unixsock,
socketInfo->file );
/* store the channel information */
endpoint->sd=unixsock;
@@ -334,7 +334,7 @@
this_time = write(unixsock, (char *)b + sent , len - sent);
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channel.apr:send() write() %d %d %s\n", this_time, errno,
strerror( errno));
if(0 == this_time) {
@@ -436,7 +436,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelUn.receive(): Received len=%d type=%d\n",
blen, (int)msg->buf[hlen]);
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
mturk 2002/07/08 06:41:30
Modified:jk/native2/common jk_channel_socket.c
Log:
no message
Revision ChangesPath
1.38 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_channel_socket.c 2 Jul 2002 16:53:15 - 1.37
+++ jk_channel_socket.c 8 Jul 2002 13:41:30 - 1.38
@@ -193,7 +193,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channel_socket.init(): %s:%d \n", socketInfo->host,
socketInfo->port );
return rc;
@@ -304,7 +304,7 @@
/* Tries to connect to JServ (continues trying while error is EINTR) */
do {
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelSocket.open() connect on %d\n",sock);
ret = connect(sock,(struct sockaddr *)addr,
@@ -340,7 +340,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelSocket.connect(), sock = %d\n", sock);
endpoint->sd=sock;
@@ -545,7 +545,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelSocket.receive(): Received len=%d type=%d\n",
blen, (int)msg->buf[hlen]);
return JK_OK;
@@ -608,7 +608,7 @@
}
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelSocket.receive(): Received len=%d type=%d total=%d\n",
blen, (int)msg->buf[hlen], inBuf );
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/07/08 06:41:47
Modified:jk/native2/common jk_channel_jni.c
Log:
no message
Revision ChangesPath
1.32 +9 -10 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_channel_jni.c 2 Jul 2002 12:08:25 - 1.31
+++ jk_channel_jni.c 8 Jul 2002 13:41:46 - 1.32
@@ -367,7 +367,7 @@
(jk_ch_jni_ep_private_t *)endpoint->channelData;
if( _this->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() %#lx\n", epData
);
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,"channel_jni.send() %#lx\n", epData
);
if( epData == NULL ) {
jk2_channel_jni_open( env, _this, endpoint );
@@ -388,7 +388,7 @@
b=msg->buf;
if( _this->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() (1) %#lx\n",
epData );
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,"channel_jni.send() (1) %#lx\n",
epData );
jniEnv=NULL; /* epData->jniEnv; */
jbuf=epData->jarray;
@@ -409,7 +409,7 @@
}
if( _this->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channel_jni.send() getting byte array \n" );
/* Copy the data in the ( recycled ) jbuf, then call the
@@ -439,7 +439,7 @@
(*jniEnv)->ReleaseByteArrayElements(jniEnv, jbuf, nbuf, 0);
#endif
if( _this->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channel_jni.send() before send %#lx\n",
(void *)(long)epData->jniJavaContext);
@@ -449,7 +449,7 @@
(jlong)(long)(void *)env,
epData->jniJavaContext );
if( _this->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() result %d\n",
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,"channel_jni.send() result %d\n",
sent);
return JK_OK;
}
@@ -507,7 +507,7 @@
jk_workerEnv_t *we=worker->workerEnv;
if( worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "service() attaching to vm\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "service() attaching to vm\n");
return JK_OK;
}
@@ -527,9 +527,8 @@
return JK_OK;
}
we->vm->detach( env, we->vm );
-
if( worker->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelJni.afterRequest() ok\n");
return JK_OK;
}
@@ -567,13 +566,13 @@
int rc=JK_OK;
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ch.%d() \n", code);
code = (int)msg->getByte(env, msg);
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,"channelJni.java2cInvoke() %d\n",
code);
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,"channelJni.java2cInvoke() %d\n",
code);
return ep->worker->workerEnv->dispatch( env, ep->worker->workerEnv,
ep->currentRequest, ep, code, ep->reply
);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c
mturk 2002/07/08 06:42:03 Modified:jk/native2/common jk_channel_apr_socket.c Log: no message Revision ChangesPath 1.24 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c Index: jk_channel_apr_socket.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_channel_apr_socket.c 27 Jun 2002 17:19:09 - 1.23 +++ jk_channel_apr_socket.c 8 Jul 2002 13:42:03 - 1.24 @@ -289,7 +289,7 @@ } if( ch->mbean->debug > 0 ) -env->l->jkLog(env, env->l, JK_LOG_INFO, +env->l->jkLog(env, env->l, JK_LOG_DEBUG, "channelApr.open(), sock = %d\n", sock); /* store the channel information */ -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel.c
mturk 2002/07/08 06:42:14
Modified:jk/native2/common jk_channel.c
Log:
no message
Revision ChangesPath
1.6 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Index: jk_channel.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_channel.c 29 Jun 2002 18:32:30 - 1.5
+++ jk_channel.c 8 Jul 2002 13:42:14 - 1.6
@@ -108,27 +108,27 @@
int rc=JK_OK;
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO,
+env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"ch.%d() \n", code);
switch( code ) {
case CH_OPEN: {
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "ch.open()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "ch.open()\n");
if( ch->open != NULL )
rc=ch->open(env, ch, ep);
return rc;
}
case CH_CLOSE: {
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "ch.close()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "ch.close()\n");
if( ch->close != NULL )
rc=ch->close(env, ch, ep);
return rc;
}
case CH_READ: {
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "ch.recv()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "ch.recv()\n");
if( ch->recv != NULL )
rc=ch->recv(env, ch, ep, msg);
if( rc==JK_OK )
@@ -137,7 +137,7 @@
}
case CH_WRITE: {
if( ch->mbean->debug > 0 )
-env->l->jkLog(env, env->l, JK_LOG_INFO, "ch.send()\n");
+env->l->jkLog(env, env->l, JK_LOG_DEBUG, "ch.send()\n");
if( ch->serverSide )
msg->serverSide=JK_TRUE;
if( ch->send != NULL )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/10 10:36:09
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Fix the DllMain DLL_PROCESS_DETACH waitng for already closed thread.
Revision ChangesPath
1.38 +4 -4
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_isapi_plugin.c 8 Jul 2002 07:45:32 - 1.37
+++ jk_isapi_plugin.c 10 Jul 2002 17:36:09 - 1.38
@@ -561,6 +561,7 @@
/* detatch the starter thread */
SetEvent(jk2_starter_event);
WaitForSingleObject(jk2_starter_thread, 3000);
+CloseHandle(jk2_starter_thread);
return TRUE;
}
@@ -577,11 +578,10 @@
switch (ulReason) {
case DLL_PROCESS_DETACH:
-WaitForSingleObject(jk2_starter_thread, 120);
-CloseHandle(jk2_starter_thread);
/* Dirty hack to unload the jvm */
-if (was_inited && jk_jni_status_code)
+if (was_inited && jk_jni_status_code) {
ExitProcess(0);
+}
break;
case DLL_PROCESS_ATTACH:
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/07/10 10:41:40
Modified:jk/native2/common jk_worker_jni.c
Log:
Fix the reporting of stderr and stdout redirection and,
calling it if the methods are not set in the config.
Revision ChangesPath
1.25 +19 -17jakarta-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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_worker_jni.c 5 Jul 2002 08:09:37 - 1.24
+++ jk_worker_jni.c 10 Jul 2002 17:41:40 - 1.25
@@ -120,7 +120,7 @@
(*jniEnv)->GetStaticMethodID(jniEnv, p->jk_java_bridge_apri_class,
"setOut",
"(Ljava/lang/String;)V");
-if(!p->jk_main_method) {
+if(!p->jk_setout_method) {
env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find
AprImpl.setOut(String)");
return JK_ERR;
}
@@ -129,7 +129,7 @@
(*jniEnv)->GetStaticMethodID(jniEnv, p->jk_java_bridge_apri_class,
"setErr",
"(Ljava/lang/String;)V");
-if(!p->jk_main_method) {
+if(!p->jk_seterr_method) {
env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find
AprImpl.setErr(String)\n");
return JK_ERR;
}
@@ -318,21 +318,23 @@
}
/* Set out and err stadard files */
-
-env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jni.init() setting stdout=%s...\n",jniWorker->stdout_name);
-(*jniEnv)->CallStaticVoidMethod(jniEnv,
-jniWorker->jk_java_bridge_apri_class,
-jniWorker->jk_setout_method,
-stdout_name);
-
-env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jni.init() setting stderr=%s...\n",jniWorker->stderr_name);
-(*jniEnv)->CallStaticVoidMethod(jniEnv,
-jniWorker->jk_java_bridge_apri_class,
-jniWorker->jk_seterr_method,
-stderr_name);
-
+if (jniWorker->stdout_name && jniWorker->jk_setout_method) {
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jni.init() setting stdout=%s...\n",jniWorker->stdout_name);
+(*jniEnv)->CallStaticVoidMethod(jniEnv,
+jniWorker->jk_java_bridge_apri_class,
+jniWorker->jk_setout_method,
+stdout_name);
+}
+
+if (jniWorker->stderr_name && jniWorker->jk_seterr_method) {
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jni.init() setting stderr=%s...\n",jniWorker->stderr_name);
+(*jniEnv)->CallStaticVoidMethod(jniEnv,
+jniWorker->jk_java_bridge_apri_class,
+jniWorker->jk_seterr_method,
+stderr_name);
+}
env->l->jkLog(env, env->l, JK_LOG_INFO,
"jni.init() calling main()...\n");
(*jniEnv)->CallStaticVoidMethod(jniEnv,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/07/11 04:38:13
Modified:jk/native2/common jk_worker_jni.c
Log:
Introduce the worker.jni hooks.
There are 4 types of hooks right now:
1. onStartup : executes on load, redirect i/o and registeres natives
2. onInit : executes on load
3. onClose : executes on shutdown
4. onShutdown : executes on shutdown and unloads VM
All the hooks executes the java class=xxx but in the different process stages
of the connector.
Revision ChangesPath
1.26 +105 -70 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_worker_jni.c 10 Jul 2002 17:41:40 - 1.25
+++ jk_worker_jni.c 11 Jul 2002 11:38:12 - 1.26
@@ -84,6 +84,13 @@
#define JAVA_BRIDGE_CLASS_NAME ("org/apache/jk/apr/TomcatStarter")
#define JAVA_BRIDGE_CLASS_APRI ("org/apache/jk/apr/AprImpl")
+/* The class will be executed when the connector is started */
+#define JK2_WORKER_HOOK_STARTUP 0
+#define JK2_WORKER_HOOK_INIT1
+#define JK2_WORKER_HOOK_CLOSE 2
+/* The class will be executed when the connector is about to be destroyed */
+#define JK2_WORKER_HOOK_SHUTDOWN3
+
struct jni_worker_data {
jclass jk_java_bridge_class;
jclass jk_java_bridge_apri_class;
@@ -97,6 +104,7 @@
char **classNameOptions;
char **args;
int nArgs;
+int hook;
};
typedef struct jni_worker_data jni_worker_data_t;
@@ -112,30 +120,32 @@
"main",
"([Ljava/lang/String;)V");
if(!p->jk_main_method) {
- env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find main(String [])\n");
- return JK_ERR;
+env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find main(String [])\n");
+return JK_ERR;
}
-
-p->jk_setout_method =
+/* Only the startup hook can redirect the stdout/stderr */
+if (p->hook == JK2_WORKER_HOOK_STARTUP) {
+p->jk_setout_method =
(*jniEnv)->GetStaticMethodID(jniEnv, p->jk_java_bridge_apri_class,
"setOut",
"(Ljava/lang/String;)V");
-if(!p->jk_setout_method) {
- env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find
AprImpl.setOut(String)");
- return JK_ERR;
-}
+if(!p->jk_setout_method) {
+env->l->jkLog(env, env->l, JK_LOG_EMERG,
+ "Can't find AprImpl.setOut(String)");
+return JK_ERR;
+}
-p->jk_seterr_method =
+p->jk_seterr_method =
(*jniEnv)->GetStaticMethodID(jniEnv, p->jk_java_bridge_apri_class,
"setErr",
"(Ljava/lang/String;)V");
-if(!p->jk_seterr_method) {
- env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find
AprImpl.setErr(String)\n");
- return JK_ERR;
+if(!p->jk_seterr_method) {
+env->l->jkLog(env, env->l, JK_LOG_EMERG,
+ "Can't find AprImpl.setErr(String)\n");
+return JK_ERR;
+}
}
-
-
return JK_OK;
}
@@ -154,7 +164,7 @@
char *value=valueP;
jni_worker_data_t *jniWorker;
int mem_config = 0;
-
+
if(! _this || ! _this->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"In validate, assert failed - invalid parameters\n");
@@ -162,6 +172,16 @@
}
jniWorker = _this->worker_private;
+if (strcmp(mbean->name, "worker.jni:onStartup") == 0)
+jniWorker->hook = JK2_WORKER_HOOK_STARTUP;
+else if (strncmp(mbean->name, "worker.jni:onInit",
+sizeof("worker.jni:onInit") -1)== 0)
+jniWorker->hook = JK2_WORKER_HOOK_INIT;
+else if (strncmp(mbean->name, "worker.jni:onClose",
+sizeof("worker.jni:onClose") -1)== 0)
+jniWorker->hook = JK2_WORKER_HOOK_CLOSE;
+else if (strcmp(mbean->name, "worker.jni:onShutdown") == 0)
+jniWorker->hook = JK2_WORKER_HOOK_SHUTDOWN;
if( strcmp( name, "stdout" )==0 ) {
jniWorker->stdout_name = value;
@@ -178,10 +198,6 @@
} else
cvs commit: jakarta-tomcat-connectors/jk/conf workers2.properties
mturk 2002/07/11 04:40:48
Modified:jk/conf workers2.properties
Log:
Introduce the worker.jni hooks.
worker.jni:onStartup executes on load
worker.jni:onInit executes on load
can be followed by extra chars (worker.jni.onInit123)
worker.jni:onClose can be followed by extra chars
worker.jni:onShutdown executes on unload and destroys VM
Revision ChangesPath
1.15 +8 -2 jakarta-tomcat-connectors/jk/conf/workers2.properties
Index: workers2.properties
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- workers2.properties 1 Jul 2002 23:53:07 - 1.14
+++ workers2.properties 11 Jul 2002 11:40:48 - 1.15
@@ -75,13 +75,19 @@
#OPT=-Djava.compiler=NONE
disabled=1
-[worker.jni:jniCmd1]
-info=Command to be executed by the VM. This one will start tomcat.
+[worker.jni:onStartup]
+info=Command to be executed by the VM on startup. This one will start tomcat.
class=org/apache/jk/apr/TomcatStarter
ARG=start
disabled=1
stdout=${serverRoot}/logs/stdout.log
stderr=${serverRoot}/logs/stderr.log
+
+[worker.jni:onShutdown]
+info=Command to be executed by the VM on shutdown. This one will stop tomcat.
+class=org/apache/jk/apr/TomcatStarter
+ARG=stop
+disabled=1
[uri:/jkstatus/*]
info=Display status information and checks the config file for changes.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi_redirector2.reg
mturk 2002/07/13 00:30:51 Modified:jk/native2/server/isapi isapi_redirector2.reg Log: Change the authComplete to REG_SZ to be compatible with the p files. Add the threadPool registry value that sets the ThreadPool on. Revision ChangesPath 1.5 +2 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg Index: isapi_redirector2.reg === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- isapi_redirector2.reg 6 Jul 2002 08:07:41 - 1.4 +++ isapi_redirector2.reg 13 Jul 2002 07:30:51 - 1.5 @@ -4,4 +4,5 @@ "serverRoot"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat" "extensionUri"="/jakarta/isapi_redirector2.dll" "workersFile"="E:\\tomcat\\jakarta-tomcat\\build\\tomcat\\conf\\workers2.properties" -"authComplete"=dword: +"authComplete"="0" +"threadPool"="20" -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java
mturk 2002/07/14 06:30:04 Modified:jk/java/org/apache/jk/apr AprImpl.java Log: Added Apache Software License prolog Revision ChangesPath 1.25 +60 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java Index: AprImpl.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- AprImpl.java 1 Jul 2002 23:12:33 - 1.24 +++ AprImpl.java 14 Jul 2002 13:30:04 - 1.25 @@ -1,4 +1,63 @@ -package org.apache.jk.apr; +/* + * + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in + *the documentation and/or other materials provided with the + *distribution. + * + * 3. The end-user documentation included with the redistribution, if + *any, must include the following acknowlegement: + * "This product includes software developed by the + *Apache Software Foundation (http://www.apache.org/)." + *Alternately, this acknowlegement may appear in the software itself, + *if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + *Foundation" must not be used to endorse or promote products derived + *from this software without prior written permission. For written + *permission, please contact [EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called "Apache" + *nor may "Apache" appear in their names without prior written + *permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + * [Additional notices, if required by prior licensing conditions] + * + */ + + package org.apache.jk.apr; import java.io.*; import java.lang.reflect.*; -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java
mturk 2002/07/14 06:32:13
Modified:jk/java/org/apache/jk/apr TomcatStarter.java
Log:
Added Apache Software License prolog.
Check if TomcatStarter was called with the stop param.
If called that way sleep for 5 seconds to allow the server shutdown,
and then call the clear the Runtime and exit.
This will destroy JVM for sure.
Revision ChangesPath
1.13 +64 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TomcatStarter.java7 Jul 2002 11:09:00 - 1.12
+++ TomcatStarter.java14 Jul 2002 13:32:13 - 1.13
@@ -1,4 +1,63 @@
-package org.apache.jk.apr;
+/*
+ *
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ *Apache Software Foundation (http://www.apache.org/)."
+ *Alternately, this acknowlegement may appear in the software itself,
+ *if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *Foundation" must not be used to endorse or promote products derived
+ *from this software without prior written permission. For written
+ *permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *nor may "Apache" appear in their names without prior written
+ *permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * [Additional notices, if required by prior licensing conditions]
+ *
+ */
+
+ package org.apache.jk.apr;
import java.io.*;
import java.lang.reflect.*;
@@ -69,6 +128,10 @@
System.out.println("TomcatStarter: Done");
if (apr.isLoaded())
apr.jkSetAttribute(0, 0, "channel:jni", "done");
+if (args[0].equals("stop")) {
+ Thread.sleep(5000);
+ Runtime.getRuntime().exit(0);
+}
} catch( Throwable t ) {
t.printStackTrace(System.err);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
mturk 2002/07/14 06:33:56 Modified:jk/native2/common jk_worker_jni.c Log: Remove the destroying of the jvm from native code, the TomcatStarter will do that on Java side. Revision ChangesPath 1.27 +1 -2 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.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- jk_worker_jni.c 11 Jul 2002 11:38:12 - 1.26 +++ jk_worker_jni.c 14 Jul 2002 13:33:56 - 1.27 @@ -434,8 +434,7 @@ apr_thread_yield(); } #endif -(*jniEnv)->UnregisterNatives(jniEnv, jniWorker->jk_java_bridge_apri_class); -vm->destroy(env, vm); +vm->detach(env, vm); } } env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() done\n"); -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
mturk 2002/07/14 06:36:03
Modified:jk/native2/common jk_channel_jni.c
Log:
Remove the jvm detaching from channel ajp to the service.
Revision ChangesPath
1.33 +7 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_channel_jni.c 8 Jul 2002 13:41:46 - 1.32
+++ jk_channel_jni.c 14 Jul 2002 13:36:03 - 1.33
@@ -522,11 +522,15 @@
{
jk_workerEnv_t *we=worker->workerEnv;
-/* XXX Don't detach if worker is reused per thread */
-if( we==NULL || we->vm==NULL ) {
+if( we==NULL || we->vm==NULL) {
return JK_OK;
}
-we->vm->detach( env, we->vm );
+/*
+ * In case of not having the endpoint detach the jvm.
+ * XXX Remove calling this function from ajp13 worker?
+ */
+if (endpoint == NULL)
+we->vm->detach( env, we->vm );
if( worker->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"channelJni.afterRequest() ok\n");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/07/14 06:37:28
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Move the jvm detaching to the service afterRequest.
That way we are sure that the detaching is in the same thread.
Revision ChangesPath
1.28 +8 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_service_apache2.c 8 Jul 2002 13:30:56 - 1.27
+++ jk_service_apache2.c 14 Jul 2002 13:37:28 - 1.28
@@ -585,6 +585,13 @@
}
}
}
+if (s->realWorker) {
+struct jk_worker *w = s->realWorker;
+if (w != NULL && w->channel != NULL
+&& w->channel->afterRequest != NULL) {
+w->channel->afterRequest( env, w->channel, w, NULL, s );
+}
+}
}
int JK_METHOD jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/14 06:39:13
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Remove the hack for unloading the jvm. Now its done on the Java side.
Check for threadPool config value to be at least 10 or higher.
Revision ChangesPath
1.39 +9 -8
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_isapi_plugin.c 10 Jul 2002 17:36:09 - 1.38
+++ jk_isapi_plugin.c 14 Jul 2002 13:39:13 - 1.39
@@ -562,6 +562,7 @@
SetEvent(jk2_starter_event);
WaitForSingleObject(jk2_starter_thread, 3000);
CloseHandle(jk2_starter_thread);
+jk2_starter_thread = INVALID_HANDLE_VALUE;
return TRUE;
}
@@ -577,13 +578,6 @@
char fname[_MAX_FNAME];
switch (ulReason) {
-case DLL_PROCESS_DETACH:
-/* Dirty hack to unload the jvm */
-if (was_inited && jk_jni_status_code) {
-ExitProcess(0);
-}
- break;
-
case DLL_PROCESS_ATTACH:
if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
_splitpath( file_name, drive, dir, fname, NULL );
@@ -667,6 +661,8 @@
tmp = map->get(env,map,THREAD_POOL_TAG);
if (tmp) {
use_thread_pool = atoi(tmp);
+if (use_thread_pool < 10)
+use_thread_pool = 0;
}
tmp = map->get(env,map,USE_AUTH_COMP_TAG);
if (tmp) {
@@ -720,6 +716,11 @@
tmpbuf,
8)) {
use_thread_pool = atoi(tmpbuf);
+if (use_thread_pool < 10) {
+use_thread_pool = 0;
+env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "read_registry_init_data, ThreadPool must be set to the
value 10 or higher\n");
+}
}
if(get_registry_config_parameter(hkey,
USE_AUTH_COMP_TAG,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis_thread_pool.c
mturk 2002/07/14 06:41:36
Modified:jk/native2/server/isapi jk_iis_thread_pool.c
Log:
Detach the jvm when the thread receives the shudown signal.
There is a substantial performance gain using this approach.
Revision ChangesPath
1.2 +10 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c
Index: jk_iis_thread_pool.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_iis_thread_pool.c 8 Jul 2002 07:43:51 - 1.1
+++ jk_iis_thread_pool.c 14 Jul 2002 13:41:36 - 1.2
@@ -149,6 +149,15 @@
while (GetQueuedCompletionStatus(global_thread_pool.worker_port,
&n1, &n2, &pOverLapped, INFINITE)) {
if (pOverLapped == THREAD_POOL_SHUTDOWN) {
+jk_ws_service_t *s = &thread->service;
+if (s->workerEnv && s->realWorker) {
+struct jk_worker *w = s->realWorker;
+jk_env_t *env = s->workerEnv->globalEnv->getEnv(
s->workerEnv->globalEnv );
+if (w != NULL && w->channel != NULL
+&& w->channel->afterRequest != NULL) {
+w->channel->afterRequest( env, w->channel, w, NULL, s );
+}
+}
break;
}
else if (pOverLapped == THREAD_POOL_RECYCLE) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis_thread_pool.c
mturk 2002/07/16 10:27:21
Modified:jk/native2/server/isapi jk_iis_thread_pool.c
Log:
Make all thread function as void and use
ExitThread insted of return 0.
Revision ChangesPath
1.3 +9 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c
Index: jk_iis_thread_pool.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_iis_thread_pool.c 14 Jul 2002 13:41:36 - 1.2
+++ jk_iis_thread_pool.c 16 Jul 2002 17:27:21 - 1.3
@@ -112,7 +112,7 @@
/* Timeout for threads shutdown 2 minutes */
#define SHUTDOWN_TIMEOUT 12
-DWORD WINAPI thread_pool_manager(void *p)
+VOID WINAPI thread_pool_manager(void *p)
{
ULONG n1, n2;
OVERLAPPED *pOverLapped;
@@ -137,10 +137,11 @@
work = TRUE;
}
}
-return 0;
+/* Clean up and die. */
+ExitThread(0);
}
-DWORD WINAPI thread_worker(void *p)
+VOID WINAPI thread_worker(void *p)
{
ULONG n1, n2;
OVERLAPPED *pOverLapped;
@@ -174,7 +175,8 @@
InterlockedDecrement(&thread->busy);
}
}
-return 0;
+/* Clean up and die. */
+ExitThread(0);
}
int jk2_iis_init_pool(jk_env_t *env)
@@ -211,7 +213,7 @@
/* Create the ThreadPool manager thread */
global_thread_pool.manager_thread = CreateThread(NULL,
0,
-thread_pool_manager,
+(LPTHREAD_START_ROUTINE)thread_pool_manager,
NULL,
0,
&global_thread_pool.manager_id);
@@ -231,7 +233,7 @@
DWORD id;
global_thread_pool.handles[i] = CreateThread(NULL,
0,
-thread_worker,
+(LPTHREAD_START_ROUTINE)thread_worker,
global_thread_pool.threads[i],
0,
&id);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2002/07/16 10:29:20
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Make all thread function as void and use ExitThread insted of return 0.
Change the call to the write_error_response to use the defines from
jk_iis.h to skip multiple writting of the same thing.
Revision ChangesPath
1.40 +10 -18
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jk_isapi_plugin.c 14 Jul 2002 13:39:13 - 1.39
+++ jk_isapi_plugin.c 16 Jul 2002 17:29:20 - 1.40
@@ -130,14 +130,9 @@
static void write_error_response(PHTTP_FILTER_CONTEXT pfc,char *status,char * msg)
{
char crlf[3] = { (char)13, (char)10, '\0' };
-char ctype[30];
+char *ctype = "Content-Type:text/html\r\n\r\n";
DWORD len = strlen(msg);
-sprintf(ctype,
-"Content-Type:text/html%s%s",
-crlf,
-crlf);
-
/* reject !!! */
pfc->ServerSupportFunction(pfc,
SF_REQ_SEND_RESPONSE_HEADER,
@@ -151,7 +146,7 @@
HANDLE jk2_inited_event;
HANDLE jk2_starter_thread = NULL;
-DWORD WINAPI jk2_isapi_starter( LPVOID lpParam )
+VOID jk2_isapi_starter( LPVOID lpParam )
{
Sleep(1000);
@@ -177,7 +172,8 @@
}
apr_pool_destroy(jk_globalPool);
apr_terminate();
-return 0;
+/* Clean up and die. */
+ExitThread(0);
}
BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
@@ -189,7 +185,7 @@
jk2_starter_event = CreateEvent(NULL, FALSE, FALSE, NULL);
jk2_starter_thread = CreateThread(NULL, 0,
- jk2_isapi_starter,
+ (LPTHREAD_START_ROUTINE)jk2_isapi_starter,
NULL,
0,
&dwThreadId);
@@ -319,8 +315,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"HttpFilterProc [%s] contains one or more invalid escape
sequences.\n",
uri);
-write_error_response(pfc,"400 Bad Request",
-"Request contains invalid
encoding");
+write_error_response(pfc,"400 Bad Request", HTML_ERROR_400);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
return SF_STATUS_REQ_FINISHED;
}
@@ -328,8 +323,7 @@
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"HttpFilterProc [%s] contains forbidden escape
sequences.\n",
uri);
-write_error_response(pfc,"403 Forbidden",
-"Access is
Forbidden");
+write_error_response(pfc,"403 Forbidden", HTML_ERROR_403);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
return SF_STATUS_REQ_FINISHED;
}
@@ -374,8 +368,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"HttpFilterProc [%s] re-encoding request exceeds
maximum buffer size.\n",
uri);
-write_error_response(pfc,"400 Bad Request",
-"Request contains too many
characters that need to be encoded.");
+write_error_response(pfc,"400 Bad Request",
HTML_ERROR_400);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv,
env );
return SF_STATUS_REQ_FINISHED;
}
@@ -430,8 +423,7 @@
"HttpFilterProc [%s] points to the web-inf or meta-inf
directory.\nSomebody try to hack into the site!!!\n",
uri);
-write_error_response(pfc,"403 Forbidden",
-"Access is
Forbidden");
+write_error_response(pfc,"403 Forbidden", HTML_ERROR_403);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
return SF_STATUS_REQ_FINISHED;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_iis.h
mturk 2002/07/16 10:30:15
Modified:jk/native2/server/isapi jk_iis.h
Log:
Add the Error 400 and 403 as #define html.
Revision ChangesPath
1.11 +15 -3 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
Index: jk_iis.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_iis.h 8 Jul 2002 07:48:47 - 1.10
+++ jk_iis.h 16 Jul 2002 17:30:15 - 1.11
@@ -104,7 +104,19 @@
#define BAD_REQUEST -1
#define BAD_PATH-2
-#define MAX_SERVERNAME 128
+#define MAX_SERVERNAME 128
+
+#define HTML_ERROR_400 "" \
+"Bad request!" \
+"Bad request!\n" \
+"Your browser (or proxy) sent a request that " \
+"this server could not
understand."
+
+#define HTML_ERROR_403 "" \
+"Access
forbidden!!" \
+"Access forbidden!\n" \
+"You don't have permission to access the requested
object." \
+"It is either read-protected or not readable by the
server."
#define GET_SERVER_VARIABLE_VALUE(pool, name, place) {\
@@ -117,7 +129,7 @@
"")) { \
(place) = (pool)->pstrdup(env,(pool),huge_buf); \
} \
-}\
+}
#define GET_SERVER_VARIABLE_VALUE_INT(name, place, def) { \
huge_buf_sz = sizeof(huge_buf); \
@@ -133,7 +145,7 @@
} else {\
(place) = def; \
} \
-}\
+}
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
