[mapserver-commits] r12321 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:16:46 -0700 (Fri, 26 Aug 2011)
New Revision: 12321

Modified:
   trunk/mapserver/mapcache/src/core.c
Log:
use a different locking strategy when building for threaded mpms

closes issue 57
this commit adds an alternate method for waiting on a lock file. we loop with a sleep of half a second and check if the lockfile still exists.
thomas.bonfort | 2011-03-02 17:04:18 +0100 (Wed, 02 Mar 2011)

Modified: trunk/mapserver/mapcache/src/core.c
===================================================================
--- trunk/mapserver/mapcache/src/core.c	2011-08-26 11:16:42 UTC (rev 12320)
+++ trunk/mapserver/mapcache/src/core.c	2011-08-26 11:16:46 UTC (rev 12321)
@@ -24,16 +24,16 @@
       geocache_tileset_tile_get(ctx, tile);
       if(GC_HAS_ERROR(ctx))
          return NULL;
-      if(req_tile->ntiles == 1) {
-         rettile = req_tile->tiles[0];
-      } else {
-         rettile = (geocache_tile*)geocache_image_merge_tiles(ctx,ctx->config->merge_format,
-               req_tile->tiles,req_tile->ntiles);
-         if(GC_HAS_ERROR(ctx))
-            return NULL;
-         rettile->tileset = req_tile->tiles[0]->tileset;
-      }
    }
+   if(req_tile->ntiles == 1) {
+      rettile = req_tile->tiles[0];
+   } else {
+      rettile = (geocache_tile*)geocache_image_merge_tiles(ctx,ctx->config->merge_format,
+            req_tile->tiles,req_tile->ntiles);
+      if(GC_HAS_ERROR(ctx))
+         return NULL;
+      rettile->tileset = req_tile->tiles[0]->tileset;
+   }
    return rettile;
 }