Changeset 6392

Timestamp:

Jun 16, 2016, 6:35:08 PM (8 years ago)

Author:

ldelgass

Message:

merge r6390 from nanovis trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (1 diff)
• nanovisServer.cpp (modified) (5 diffs)

nanovis/branches/1.2/Command.cpp

@@ -905 +905 @@
         objPtr = Tcl_NewStringObj(buf, -1);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+        /* date */
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
+        strcpy(buf, ctime(&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(g_stats.start.tv_sec));
     } else {
         objPtr = Tcl_NewStringObj("render_info", 11);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-    }
-    Tcl_DStringInit(&ds);
-    /* date */
-    Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
-    strcpy(buf, ctime(&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(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 arguments. */
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {

nanovis/branches/1.2/nanovisServer.cpp

@@ -168 +168 @@
 serverStats(int code) 
 {
-    double start, finish;
     char buf[BUFSIZ];
     Tcl_DString ds;
     int result;
 
-    {
-        struct timeval tv;
-
-        /* Get ending time.  */
-        gettimeofday(&tv, NULL);
-        finish = CVT2SECS(tv);
-        tv = g_stats.start;
-        start = CVT2SECS(tv);
-    }
+    /* Get ending time.  */
+    struct timeval now;
+    gettimeofday(&tv, NULL);
+    double session_time = CVT2SECS(now) - CVT2SECS(g_stats.start);
+
     /* 
      * Session information:
@@ -187 +182 @@
      *   - Process ID
      *   - Hostname where server is running
-     *   - Start date of session
-     *   - Start date of session in seconds
+     *   - Stop date of session
+     *   - Stop date of session in seconds
      *   - Number of frames returned
      *   - Number of bytes total returned (in frames)
@@ -218 +213 @@
     /* date */
     Tcl_DStringAppendElement(&ds, "date");
-    strcpy(buf, ctime(&g_stats.start.tv_sec));
+    strcpy(buf, ctime(&now.tv_sec));
     buf[strlen(buf) - 1] = '\0';
     Tcl_DStringAppendElement(&ds, buf);
     /* date_secs */
     Tcl_DStringAppendElement(&ds, "date_secs");
-    sprintf(buf, "%ld", g_stats.start.tv_sec);
+    sprintf(buf, "%ld", now.tv_sec);
     Tcl_DStringAppendElement(&ds, buf);
     /* num_frames */
@@ -243 +238 @@
     /* session_time */
     Tcl_DStringAppendElement(&ds, "session_time");
-    sprintf(buf, "%g", finish - start);
+    sprintf(buf, "%g", session_time);
     Tcl_DStringAppendElement(&ds, buf);
     /* status */
@@ -274 +269 @@
     }
     Tcl_DStringAppend(&ds, "\n", -1);
-    int f = getStatsFile(NULL);
-    result = writeToStatsFile(f, Tcl_DStringValue(&ds), 
+    int fd = getStatsFile(NULL);
+    result = writeToStatsFile(fd, Tcl_DStringValue(&ds), 
                               Tcl_DStringLength(&ds));
-    close(f);
+    close(fd);
     Tcl_DStringFree(&ds);
     return result;