Changeset 410

Timestamp:

11/08/08 17:29:30 (2 months ago)

Author:

arneke

Message:

Fixes seeding progress reports.

Location:

trunk/geowebcache/src/main/java/org/geowebcache/rest

Files:

• GWCTask.java (modified) (1 diff)
• RESTDispatcher.java (modified) (1 diff)
• SeedResource.java (modified) (1 diff)
• SeedTask.java (modified) (7 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/rest/GWCTask.java

@@ -19 +19 @@
 import org.geowebcache.GeoWebCacheException;
 
+/**
+ * 
+ */
 public abstract class GWCTask {
     

trunk/geowebcache/src/main/java/org/geowebcache/rest/RESTDispatcher.java

@@ -52 +52 @@
     private static final int THREAD_NUMBER = 4;
     
-    private static final int THREAD_MAX_NUMBER = 32;
+    static final int THREAD_MAX_NUMBER = 32;
     
     private final XMLConfiguration xmlConfig;

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedResource.java

@@ -49 +49 @@
 
 public class SeedResource extends GWCResource {
-    private static int[][] statusArray = new int[RESTDispatcher.getInstance().getExecutor().getCorePoolSize()][3]; 
+    private static int[][] statusArray = new int[RESTDispatcher.THREAD_MAX_NUMBER][3]; 
     public JSONObject myrequest; 
     private static Log log = LogFactory.getLog(org.geowebcache.rest.SeedResource.class);

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedTask.java

@@ -59 +59 @@
             tl.isInitialized();
             
-            log.info("Begin seeding layer : " + tl.getName());
+            log.info("Thread "+threadOffset+" begins seeding layer : " + tl.getName());
             int zoomStart = req.getZoomStart().intValue();
             int zoomStop = req.getZoomStop().intValue();
@@ -83 +83 @@
             
             int arrayIndex = getCurrentThreadArrayIndex();
-            int TOTAL_TILES = tileCount(coveredGridLevels, zoomStart, zoomStop); 
+            int TOTAL_TILES = tileCount(coveredGridLevels, zoomStart, zoomStop);
+            int tilesPerThread = TOTAL_TILES / threadCount;
+            int[][] list = SeedResource.getStatusList();
+            
             int count = 0;
             boolean tryCache = !reseed;
@@ -91 +94 @@
                 for (int gridy = gridBounds[1]; gridy <= gridBounds[3];) {
 
-                    for (int gridx = gridBounds[0]; gridx <= gridBounds[2];) {
+                    for (int gridx = gridBounds[0] + threadOffset; gridx <= gridBounds[2];) {
                         
                         int[] gridLoc = { gridx, gridy, level };
@@ -106 +109 @@
 
                         // Next column
-                        gridx += metaTilingFactors[0] * (1 + threadOffset);
+                        gridx += metaTilingFactors[0];
                         
                         count += tilesPerMetaTile;
-                        
-                        int[][] list = SeedResource.getStatusList();
                         
                         // Threads don't really collide
                         //synchronized(list) {
                             // This is not quite right...
-                            list[arrayIndex]= getStatusInfo(arrayIndex, tl, count, (TOTAL_TILES / threadCount), START_TIME);
+                            list[arrayIndex]= getStatusInfo(arrayIndex, tl, count, tilesPerThread, START_TIME);
                         //}
                     }
@@ -124 +125 @@
                 }
 
-                log.info("Completed seeding level " + level + " for layer "
-                        + tl.getName());
-            }
-            log.info("Completed seeding layer " + tl.getName());
-            int[][] list = SeedResource.getStatusList();
-            synchronized(list) {                
+                double percCompl = (100.0 * count)/ (double) (tilesPerThread * tilesPerMetaTile);
+                int intPercCompl = (int) Math.floor(percCompl);
+                int decPercCompl = (int) Math.round((percCompl - intPercCompl) * 100);
+                
+                log.info("Thread "+threadOffset+" completed seeding level " + level + " for layer "
+                        + tl.getName() +" (ca. "+intPercCompl+"."+decPercCompl+"%)");
+            }
+            log.info("Thread "+threadOffset+" completed seeding layer " + tl.getName());
+            
+            //int[][] list = SeedResource.getStatusList();
+            //synchronized(list) {                
                     list[arrayIndex] = new int[3];
-            }
+            //}
         //} catch (Exception e) {
         //    log.error(e.getMessage());
@@ -167 +173 @@
         int indexOfnumber = tn.indexOf('d')+2;
         String tmp = tn.substring(indexOfnumber);
-        int arrayIndex = Integer.parseInt(tmp);        
-        arrayIndex--;
-        
-        return arrayIndex;
+        return Integer.parseInt(tmp) - 1;
     }
     
@@ -188 +191 @@
         //working on tile
         temp[0] = tilesCount;
+        
         //out of
         temp[1] = tilesTotal;
         
         //estimated time of completion in seconds, use a moving average over the last 
-        long timeSpent = (System.currentTimeMillis() - start_time) / 1000;
-        
-        long timeTotal = Math.round(timeSpent * ((double) tilesTotal / (double) tilesCount));
-        
-        int timeRemaining = (int) (timeTotal - timeSpent);
-        
-        temp[2] = timeRemaining;
+        long timeSpent = (System.currentTimeMillis() - start_time);
+        
+        long timeTotal = Math.round((double) timeSpent * ((double) tilesTotal / (double) tilesCount));
+        
+        temp[2] = (int) (timeTotal - timeSpent) / 1000;
         
         return temp;