[mapserver-commits] r13201 - in trunk/mapserver/mapcache: apache include lib util

[svn at osgeo.org]

Author: tbonfort
Date: 2012-03-05 05:50:45 -0800 (Mon, 05 Mar 2012)
New Revision: 13201

Modified:
   trunk/mapserver/mapcache/apache/mod_mapcache.c
   trunk/mapserver/mapcache/include/mapcache.h
   trunk/mapserver/mapcache/lib/util.c
   trunk/mapserver/mapcache/util/mapcache_seed.c
Log:
remove unused code


Modified: trunk/mapserver/mapcache/apache/mod_mapcache.c
===================================================================
--- trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-03-05 13:40:51 UTC (rev 13200)
+++ trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-03-05 13:50:45 UTC (rev 13201)
@@ -51,8 +51,6 @@
 
 module AP_MODULE_DECLARE_DATA mapcache_module;
 
-int is_threaded;
-
 typedef struct mapcache_context_apache mapcache_context_apache;
 typedef struct mapcache_context_apache_request mapcache_context_apache_request;
 typedef struct mapcache_context_apache_server mapcache_context_apache_server;
@@ -184,9 +182,6 @@
    config = apr_hash_get(cfg->aliases,(void*)r->filename,APR_HASH_KEY_STRING);
    ctx->ctx.ctx.config = config;
    ctx->request = r;
-   if(is_threaded) {
-      ctx->ctx.ctx.has_threads = 1;
-   }
    init_apache_request_context(ctx);
    return ctx;
 }
@@ -315,10 +310,6 @@
 
 static int mod_mapcache_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) {
    mapcache_server_cfg* cfg = ap_get_module_config(s->module_config, &mapcache_module);
-   server_rec *sconf;
-   apr_status_t rv;
-   mapcache_context *ctx = (mapcache_context*)apache_server_context_create(s,p);
-
    if(!cfg) {
       ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, "configuration not found in server context");
       return 1;
@@ -328,12 +319,9 @@
    ap_add_version_component(p, MAPCACHE_USERAGENT);
 #endif
 
-   rv = ap_mpm_query(AP_MPMQ_IS_THREADED,&is_threaded);
+   return 0;
 }
 
-static void mod_mapcache_child_init(apr_pool_t *pool, server_rec *s) {
-}
-
 static int mapcache_alias_matches(const char *uri, const char *alias_fakename)
 {
     /* Code for this function from Apache mod_alias module. */
@@ -413,7 +401,6 @@
    static const char * const p1[] = { "mod_alias.c", "mod_rewrite.c", NULL };
    static const char * const n1[]= { "mod_userdir.c",
                                       "mod_vhost_alias.c", NULL };
-   ap_hook_child_init(mod_mapcache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_post_config(mod_mapcache_post_config, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_handler(mod_mapcache_request_handler, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_translate_name(mapcache_hook_intercept, p1, n1, APR_HOOK_MIDDLE);

Modified: trunk/mapserver/mapcache/include/mapcache.h
===================================================================
--- trunk/mapserver/mapcache/include/mapcache.h	2012-03-05 13:40:51 UTC (rev 13200)
+++ trunk/mapserver/mapcache/include/mapcache.h	2012-03-05 13:50:45 UTC (rev 13201)
@@ -185,7 +185,6 @@
 
     const char* (*get_instance_id)(mapcache_context * ctx);
     mapcache_context* (*clone)(mapcache_context *ctx);
-    int has_threads;
     apr_pool_t *pool;
     char *_contenttype;
     char *_errmsg;

Modified: trunk/mapserver/mapcache/lib/util.c
===================================================================
--- trunk/mapserver/mapcache/lib/util.c	2012-03-05 13:40:51 UTC (rev 13200)
+++ trunk/mapserver/mapcache/lib/util.c	2012-03-05 13:50:45 UTC (rev 13201)
@@ -211,7 +211,6 @@
    dst->pool = src->pool;
    dst->set_exception = src->set_exception;
    dst->service = src->service;
-   dst->has_threads = src->has_threads;
    dst->exceptions = src->exceptions;
 }
 

Modified: trunk/mapserver/mapcache/util/mapcache_seed.c
===================================================================
--- trunk/mapserver/mapcache/util/mapcache_seed.c	2012-03-05 13:40:51 UTC (rev 13200)
+++ trunk/mapserver/mapcache/util/mapcache_seed.c	2012-03-05 13:50:45 UTC (rev 13201)
@@ -615,7 +615,6 @@
     cfg = mapcache_configuration_create(ctx.pool);
     ctx.config = cfg;
     ctx.log= mapcache_context_seeding_log;
-    ctx.has_threads = 1;
     apr_getopt_init(&opt, ctx.pool, argc, argv);
 
     seededtiles=seededtilestot=queuedtilestot=0;