Changeset 6386 for geovis

Timestamp:

Jun 16, 2016 4:08:02 PM (8 years ago)

Author:

ldelgass

Message:

Fix render_info time stats

Location:

geovis/trunk

Files:

• RenderServer.cpp (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/RenderServer.cpp

@@ -241 +241 @@
     if (g_fLog != NULL) {
         fclose(g_fLog);
-        g_fLog = NULL;
+        g_fLog = NULL;
     }
 }

geovis/trunk/RendererCmd.cpp

@@ -749 +749 @@
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK ||
         numItems % 2 != 0) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     const char *username = NULL;
@@ -805 +805 @@
         objPtr = Tcl_NewStringObj(buf, -1);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+        /* date */
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
+        strcpy(buf, ctime(&GeoVis::g_stats.start.tv_sec));
+        buf[strlen(buf) - 1] = '\0';
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
+        /* date_secs */
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                                 Tcl_NewStringObj("date_secs", 9));
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                                 Tcl_NewLongObj(GeoVis::g_stats.start.tv_sec));
     } else {
         objPtr = Tcl_NewStringObj("render_info", 11);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-    }
-    /* date */
-    Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
-    strcpy(buf, ctime(&GeoVis::g_stats.start.tv_sec));
-    buf[strlen(buf) - 1] = '\0';
-    Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
-    /* date_secs */
-    Tcl_ListObjAppendElement(interp, listObjPtr, 
-                             Tcl_NewStringObj("date_secs", 9));
-    Tcl_ListObjAppendElement(interp, listObjPtr, 
-                             Tcl_NewLongObj(GeoVis::g_stats.start.tv_sec));
+        struct timeval now;
+        gettimeofday(&now, NULL);
+        /* date */
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
+        strcpy(buf, ctime(&now.tv_sec));
+        buf[strlen(buf) - 1] = '\0';
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
+        /* date_secs */
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                                 Tcl_NewStringObj("date_secs", 9));
+        Tcl_ListObjAppendElement(interp, listObjPtr,
+                                 Tcl_NewLongObj(now.tv_sec));
+    }
     /* client items */
     for (int i = 0; i < numItems; i++) {