On 19.02.2009 16:28, mt...@apache.org wrote:
Author: mturk
Date: Thu Feb 19 15:28:47 2009
New Revision: 745898
URL: http://svn.apache.org/viewvc?rev=745898&view=rev
Log:
Update uriworkermap on watchog interval
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=745898&r1=745897&r2=745898&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Thu Feb 19 15:28:47
2009
@@ -2377,6 +2377,11 @@
jk_log(logger, JK_LOG_DEBUG,
"Watchdog thread running");
}
+ if (worker_mount_file[0]) {
+ jk_shm_lock();
+ uri_worker_map_update(uw_map, 0, logger);
+ jk_shm_unlock();
+ }
Why the shm lock/unlock? The map itself has a lock that gets used. We
don't use the shm lock around map_uri_to_worker_ext(), which also goes
down to map_uri_to_worker_ext().
Another thing: do you think it's useful to add this to Apache 2.0 too?
What's the reason for it (the map is automatically updated when a
request comes in).
wc_maintain(logger);
}
if (JK_IS_DEBUG_LEVEL(logger)) {
@@ -2499,10 +2504,11 @@
uw_map->reject_unsafe = 1;
else
uw_map->reject_unsafe = 0;
- uw_map->fname = worker_mount_file;
uw_map->reload = worker_mount_reload;
- if (worker_mount_file[0])
+ if (worker_mount_file[0]) {
+ uw_map->fname = worker_mount_file;
rc = uri_worker_map_load(uw_map, logger);
+ }
Moving the uw_map->fname assignment makes it now undefined, in case
worker_mount_file is an empty string. Of course that's not a useful
worker mount file, but I'm a little worried by letting fname be undefined.
}
if (rc) {
rc = JK_FALSE;
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
