[mapserver-commits] r10840 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2011-01-06 13:18:11 -0800 (Thu, 06 Jan 2011)
New Revision: 10840

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapdraw.c
Log:
Fixed missing time in msDrawMap logging (#3651)



Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-01-06 21:18:02 UTC (rev 10839)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-01-06 21:18:11 UTC (rev 10840)
@@ -14,6 +14,8 @@
 Current Version
 ---------------
 
+- Fixed missing time in msDrawMap logging (#3651)
+
 - Fixed Internal error with Oracle Spatial multi point geometries (#3627)
 
 - Fixed double free in shp2img.c (#3497)

Modified: branches/branch-5-6/mapserver/mapdraw.c
===================================================================
--- branches/branch-5-6/mapserver/mapdraw.c	2011-01-06 21:18:02 UTC (rev 10839)
+++ branches/branch-5-6/mapserver/mapdraw.c	2011-01-06 21:18:11 UTC (rev 10840)
@@ -327,6 +327,10 @@
   }
 
 #if defined(USE_WMS_LYR) || defined(USE_WFS_LYR)
+
+  /* Time the OWS query phase */
+  if(map->debug >= MS_DEBUGLEVEL_TUNING ) msGettimeofday(&starttime, NULL);
+
   /* How many OWS (WMS/WFS) layers do we have to draw?
    * Note: numOWSLayers is the number of actual layers and numOWSRequests is
    * the number of HTTP requests which could be lower if multiple layers 
@@ -339,6 +343,7 @@
         numOWSLayers++;
   }
 
+
   if (numOWSLayers > 0) {
     /* Alloc and init pasOWSReqInfo...
      */
@@ -393,6 +398,14 @@
     msFree(pasOWSReqInfo);
     return NULL;
   }
+
+  if(map->debug >= MS_DEBUGLEVEL_TUNING) {
+    msGettimeofday(&endtime, NULL);
+    msDebug("msDrawMap(): WMS/WFS set-up and query, %.3fs\n", 
+            (endtime.tv_sec+endtime.tv_usec/1.0e6)-
+            (starttime.tv_sec+starttime.tv_usec/1.0e6) );
+  }
+
 #endif /* USE_WMS_LYR || USE_WFS_LYR */
 
   /* OK, now we can start drawing */