Changeset 4794

Timestamp:

Nov 26, 2014 1:40:30 AM (9 years ago)

Author:

ldelgass

Message:

Don't add extra pid to stats log line

Location:

nanovis/trunk

Files:

• Command.cpp (modified) (2 diffs)
• nanovisServer.cpp (modified) (6 diffs)
• nanovisServer.h (modified) (1 diff)

nanovis/trunk/Command.cpp

@@ -846 +846 @@
     /* Use the initial client key value pairs as the parts for a generating
      * a unique file name. */
-    int f = getStatsFile(interp, objv[1]);
+    int f = getStatsFile(objv[1]);
     if (f < 0) {
         Tcl_AppendResult(interp, "can't open stats file: ", 
@@ -867 +867 @@
         objPtr = Tcl_NewStringObj("pid", 3);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewIntObj(getpid()));
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewLongObj((long)g_stats.pid));
         /* host */
         objPtr = Tcl_NewStringObj("host", 4);

nanovis/trunk/nanovisServer.cpp

@@ -84 +84 @@
     std::ostringstream oss;
     oss << "nv>ok -token " << g_stats.nCommands <<  "\n";
-    size_t numBytes = oss.str().length();
+    std::string str = oss.str();
+    size_t numBytes = str.length();
 
     TRACE("Sending OK for commands through %lu", g_stats.nCommands);
 #ifdef USE_THREADS
-    queueResponse(oss.str().c_str(), numBytes, Response::VOLATILE, Response::OK);
+    queueResponse(str.c_str(), numBytes, Response::VOLATILE, Response::OK);
 #else
-    if (write(g_fdOut, oss.str().c_str(), numBytes) < 0) {
+    if (write(g_fdOut, str.c_str(), numBytes) < 0) {
         ERROR("write failed: %s", strerror(errno));
         return -1;
@@ -105 +106 @@
 
 int
-nv::getStatsFile(Tcl_Interp *interp, Tcl_Obj *objPtr)
+nv::getStatsFile(Tcl_Obj *objPtr)
 {
     Tcl_DString ds;
-    Tcl_Obj **objv;
-    int objc;
-    int i;
     char fileName[33];
+    char pidstr[200];
     const char *path;
     md5_state_t state;
@@ -121 +120 @@
         return g_statsFile;
     }
-    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return -1;
-    }
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("pid", 3));
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewIntObj(getpid()));
+    /* By itself the client's key/value pairs aren't unique.  Add in the
+     * process id of this render server. */
+    sprintf(pidstr, "%ld", (long)g_stats.pid);
+
+    /* Create an md5 hash of the key/value pairs and use it as the file name. */
     string = Tcl_GetStringFromObj(objPtr, &length);
-
     md5_init(&state);
-    md5_append(&state, (const md5_byte_t *)string, length);
+    md5_append(&state, (const md5_byte_t *)string, strlen(string));
+    md5_append(&state, (const md5_byte_t *)pidstr, strlen(pidstr));
     md5_finish(&state, digest);
-    for (i = 0; i < 16; i++) {
+    for (int i = 0; i < 16; i++) {
         sprintf(fileName + i * 2, "%02x", digest[i]);
     }
@@ -208 +207 @@
     /* pid */
     Tcl_DStringAppendElement(&ds, "pid");
-    sprintf(buf, "%d", getpid());
+    sprintf(buf, "%ld", (long)g_stats.pid);
     Tcl_DStringAppendElement(&ds, buf);
     /* host */
@@ -273 +272 @@
     }
     Tcl_DStringAppend(&ds, "\n", -1);
-    f = getStatsFile(NULL, NULL);
+    f = getStatsFile(NULL);
     result = writeToStatsFile(f, Tcl_DStringValue(&ds), 
                               Tcl_DStringLength(&ds));
@@ -510 +509 @@
 
     memset(&g_stats, 0, sizeof(g_stats));
+    g_stats.pid = getpid();
     gettimeofday(&g_stats.start, NULL);
 

nanovis/trunk/nanovisServer.h

@@ -51 +51 @@
 
 #ifdef KEEPSTATS
-    extern int getStatsFile(Tcl_Interp *interp, Tcl_Obj *objPtr);
+    extern int getStatsFile(Tcl_Obj *objPtr);
     extern int writeToStatsFile(int f, const char *s, size_t length);
 #endif