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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:01:45 -0700 (Fri, 26 Aug 2011)
New Revision: 12146

Modified:
   trunk/mapserver/mapcache/src/cache_disk.c
   trunk/mapserver/mapcache/src/tileset.c
Log:
add missing file
thomas.bonfort | 2010-11-02 18:14:21 +0100 (Tue, 02 Nov 2010)

Modified: trunk/mapserver/mapcache/src/cache_disk.c
===================================================================
--- trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:01:41 UTC (rev 12145)
+++ trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:01:45 UTC (rev 12146)
@@ -313,13 +313,17 @@
                return GEOCACHE_FAILURE;
             }
             apr_file_close(f);
+#ifdef DEBUG
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "created blank tile %s",blankname);
+#endif
          }
          if(apr_file_link(blankname,filename) != GEOCACHE_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "failed to link tile %s to %s",filename, blankname);
             return GEOCACHE_FAILURE; /* we could not create the file */
          }
+#ifdef DEBUG        
          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "linked blank tile %s to %s",filename,blankname);
+#endif
          return GEOCACHE_SUCCESS;
       }
    }

Modified: trunk/mapserver/mapcache/src/tileset.c
===================================================================
--- trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:01:41 UTC (rev 12145)
+++ trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:01:45 UTC (rev 12146)
@@ -246,14 +246,17 @@
 
       if(isLocked == GEOCACHE_TRUE) {
          /* another thread is rendering the tile, we should wait for it to finish */
+#ifdef DEBUG
          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"cache wait: tileset %s - tile %d %d %d",
                tile->tileset->name,tile->x, tile->y,tile->z);
+#endif
          tile->tileset->cache->tile_lock_wait(tile,r);
       } else {
          /* no other thread is doing the rendering, do it ourselves */
+#ifdef DEBUG
          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"cache miss: tileset %s - tile %d %d %d",
                tile->tileset->name,tile->x, tile->y,tile->z);
-         
+#endif
          /* this will query the source to create the tiles, and save them to the cache */
          ret = _geocache_tileset_render_metatile(mt,r);