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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:24:24 -0700 (Fri, 26 Aug 2011)
New Revision: 12422

Modified:
   trunk/mapserver/mapcache/src/geocache_seed.c
Log:
refactor getmap_strategy and resample_mode into the wms service and geocache_requests
instead of at a globl configuration level (syntax has changed)

finish the json parser
thomas.bonfort | 2011-08-04 16:27:57 +0200 (Thu, 04 Aug 2011)

Modified: trunk/mapserver/mapcache/src/geocache_seed.c
===================================================================
--- trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:24:20 UTC (rev 12421)
+++ trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:24:24 UTC (rev 12422)
@@ -130,8 +130,13 @@
       float duration = ((now_t.tv_sec-lastlogtime.tv_sec)*1000000+(now_t.tv_usec-lastlogtime.tv_usec))/1000000.0;
       float totalduration = ((now_t.tv_sec-starttime.tv_sec)*1000000+(now_t.tv_usec-starttime.tv_usec))/1000000.0;
       if(duration>=5) {
+         int Nx, Ny;
+         Nx = (grid_link->grid_limits[z][2]-grid_link->grid_limits[z][0])/tileset->metasize_x;
+         Ny = (grid_link->grid_limits[z][3]-grid_link->grid_limits[z][1])/tileset->metasize_y;
+         int Ntot = Nx*Ny;
+         int Ncur = (y-grid_link->grid_limits[z][1])/tileset->metasize_y*Nx+(x-grid_link->grid_limits[z][0]+1)/tileset->metasize_x;
          int ntilessincelast = seededtilestot-seededtiles;
-         sprintf(msg,"seeding level %d: %f metatiles/sec (avg since start: %f)",z,ntilessincelast/duration,
+         sprintf(msg,"seeding level %d [%d/%d]: %f metatiles/sec (avg since start: %f)",z,Ncur,Ntot,ntilessincelast/duration,
                seededtilestot/totalduration);
          lastlogtime=now_t;
          seededtiles=seededtilestot;