[mapserver-commits] r10839 - trunk/mapserver

[svn at osgeo.org]

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

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
Fixed missing time in msDrawMap logging (#3651)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-01-06 19:42:22 UTC (rev 10838)
+++ trunk/mapserver/HISTORY.TXT	2011-01-06 21:18:02 UTC (rev 10839)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed missing time in msDrawMap logging (#3651)
+
 - Fixed Auto Angle - incorrectly placed Labels (#3648)
 
 - Fixed Improper validation of symbol index values (#3641)

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2011-01-06 19:42:22 UTC (rev 10838)
+++ trunk/mapserver/mapdraw.c	2011-01-06 21:18:02 UTC (rev 10839)
@@ -296,6 +296,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 
@@ -308,6 +312,7 @@
         numOWSLayers++;
   }
 
+
   if (numOWSLayers > 0) {
     /* Alloc and init pasOWSReqInfo...
      */
@@ -362,6 +367,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 */