[mapserver-commits] r12186 - in trunk/mapserver/mapcache: include src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:05:22 -0700 (Fri, 26 Aug 2011)
New Revision: 12186

Modified:
   trunk/mapserver/mapcache/include/geocache.h
   trunk/mapserver/mapcache/src/cache_disk.c
   trunk/mapserver/mapcache/src/fastcgi_geocache.c
   trunk/mapserver/mapcache/src/geocache_seed.c
   trunk/mapserver/mapcache/src/mod_geocache.c
   trunk/mapserver/mapcache/src/tileset.c
Log:
add standard header
thomas.bonfort | 2010-12-21 17:20:35 +0100 (Tue, 21 Dec 2010)

Modified: trunk/mapserver/mapcache/include/geocache.h
===================================================================
--- trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:05:22 UTC (rev 12186)
@@ -123,7 +123,7 @@
      * \returns GEOCACHE_LOCKED if \param nonblocking was set to 1 and another instance has already aquired
      *          the lock
      */
-    void (*global_lock_aquire)(geocache_context *ctx, int nonblocking);
+    void (*global_lock_aquire)(geocache_context *ctx);
 
     /**
      * \brief release a previously aquired lock

Modified: trunk/mapserver/mapcache/src/cache_disk.c
===================================================================
--- trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:05:22 UTC (rev 12186)
@@ -183,7 +183,7 @@
          char *blankname;
          _geocache_cache_disk_blank_tile_key(ctx,tile,image->data,&blankname);
          GC_CHECK_ERROR(ctx);
-         ctx->global_lock_aquire(ctx, 0);
+         ctx->global_lock_aquire(ctx);
          GC_CHECK_ERROR(ctx);
          if(apr_file_open(&f, blankname, APR_FOPEN_READ, APR_OS_DEFAULT, ctx->pool) != APR_SUCCESS) {
             /* create the blank file */

Modified: trunk/mapserver/mapcache/src/fastcgi_geocache.c
===================================================================
--- trunk/mapserver/mapcache/src/fastcgi_geocache.c	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/src/fastcgi_geocache.c	2011-08-26 11:05:22 UTC (rev 12186)
@@ -54,7 +54,7 @@
    ctx->mutex_fname="/tmp/geocache.fcgi.lock";
 }
 
-void geocache_fcgi_mutex_aquire(geocache_context *gctx, int nonblocking) {
+void geocache_fcgi_mutex_aquire(geocache_context *gctx) {
    geocache_context_fcgi *ctx = (geocache_context_fcgi*)gctx;
    int ret;
 #ifdef DEBUG

Modified: trunk/mapserver/mapcache/src/geocache_seed.c
===================================================================
--- trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:05:22 UTC (rev 12186)
@@ -49,7 +49,7 @@
     }
 }
 
-void geocache_context_seeding_lock_aquire(geocache_context *gctx, int blocking) {
+void geocache_context_seeding_lock_aquire(geocache_context *gctx) {
     int ret;
     geocache_context_seeding *ctx = (geocache_context_seeding*)gctx;
     ret = apr_thread_mutex_lock(ctx->mutex);
@@ -92,7 +92,7 @@
 int geocache_context_seeding_get_next_tile(geocache_context_seeding *ctx, geocache_tile *tile, geocache_context *tmpcontext) {
     geocache_context *gctx= (geocache_context*)ctx;
 
-    gctx->global_lock_aquire(gctx,0);
+    gctx->global_lock_aquire(gctx);
     if(ctx->nextz > ctx->maxzoom) {
         gctx->global_lock_release(gctx);
         return GEOCACHE_FAILURE;
@@ -146,7 +146,7 @@
     ctx->tileset = tileset;
 }
 
-void dummy_lock_aquire(geocache_context *ctx, int nonblocking){
+void dummy_lock_aquire(geocache_context *ctx){
 
 }
 

Modified: trunk/mapserver/mapcache/src/mod_geocache.c
===================================================================
--- trunk/mapserver/mapcache/src/mod_geocache.c	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/src/mod_geocache.c	2011-08-26 11:05:22 UTC (rev 12186)
@@ -87,7 +87,7 @@
    va_end(args);
 }
 
-void geocache_util_mutex_aquire(geocache_context *gctx, int nonblocking) {
+void geocache_util_mutex_aquire(geocache_context *gctx) {
    int ret;
    geocache_context_apache_request *ctx = (geocache_context_apache_request*)gctx;
    geocache_server_cfg *cfg = ap_get_module_config(ctx->request->server->module_config, &geocache_module);

Modified: trunk/mapserver/mapcache/src/tileset.c
===================================================================
--- trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:05:16 UTC (rev 12185)
+++ trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:05:22 UTC (rev 12186)
@@ -255,7 +255,7 @@
        * - if the lock exists, we should wait for the other thread to finish
        */
 
-      ctx->global_lock_aquire(ctx,0);
+      ctx->global_lock_aquire(ctx);
       GC_CHECK_ERROR(ctx);
 
       isLocked = geocache_tileset_tile_lock_exists(ctx, tile);
@@ -287,7 +287,7 @@
          _geocache_tileset_render_metatile(ctx, mt);
          
          /* remove the lockfiles */
-         ctx->global_lock_aquire(ctx,0);
+         ctx->global_lock_aquire(ctx);
          _geocache_tileset_metatile_unlock(ctx,mt);
          ctx->global_lock_release(ctx);
          GC_CHECK_ERROR(ctx);