Changeset 3376 for trunk/packages/vizservers/nanovis

Timestamp:

Feb 27, 2013, 9:39:10 PM (12 years ago)

Author:

gah

Message:

new version of stats file handling without file locking

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (3 diffs)
• nanovis.cpp (modified) (3 diffs)
• nanovis.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -749 +749 @@
  *      Log initial values to stats file.
  *        
+ *      clientinfo path list
  */
 static int
@@ -756 +757 @@
     Tcl_DString ds;
     int result;
-    int i;
+    int i, numElems;
+    Tcl_Obj **elems;
     char buf[BUFSIZ];
-
+    static int first = 1;
+
+    if (objc != 3) {
+        Tcl_AppendResult(interp, "wrong # of arguments: should be \"", 
+                Tcl_GetString(objv[0]), " path list\"", (char *)NULL);
+        return TCL_ERROR;
+    }
+#ifdef KEEPSTATS
+    const char *path;
+
+    path = Tcl_GetString(objv[1]);
+    if (NanoVis::openStatsFile(path) < 0) {
+        Tcl_AppendResult(interp, "can't open stats file: ", 
+                Tcl_PosixError(interp), (char *)NULL);
+        return TCL_ERROR;
+    }
+#endif
     Tcl_DStringInit(&ds);
-    Tcl_DStringAppendElement(&ds, "render_start");
+    if (first) {
+        Tcl_DStringAppendElement(&ds, "render_start");
+        first = 0;
+    } else {
+        Tcl_DStringAppendElement(&ds, "render_info");
+    }
     /* renderer */
     Tcl_DStringAppendElement(&ds, "renderer");
@@ -783 +806 @@
     Tcl_DStringAppendElement(&ds, buf);
     /* Client arguments. */
-    for (i = 1; i < objc; i++) {
-        Tcl_DStringAppendElement(&ds, Tcl_GetString(objv[i]));
+    if (Tcl_ListObjGetElements(interp, objv[2], &numElems, &elems) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    for (i = 0; i < numElems; i++) {
+        Tcl_DStringAppendElement(&ds, Tcl_GetString(elems[i]));
     }
     Tcl_DStringAppend(&ds, "\n", 1);
+
 #ifdef KEEPSTATS
     result = NanoVis::writeToStatsFile(Tcl_DStringValue(&ds), 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -143 +143 @@
 FILE *NanoVis::recfile = NULL;
 
+int NanoVis::statsFile = -1;
+
 bool NanoVis::axisOn = true;
 bool NanoVis::debugFlag = false;
@@ -293 +295 @@
 
 #define STATSDIR        "/var/tmp/visservers"
-#define STATSFILE       STATSDIR "/" "nanovis_log.tcl"
-#define LOCKFILE        STATSDIR "/" "LCK..nanovis"
 
 static int
-getFileLock()
-{
-    int numTries;
-
-    for (numTries = 0; numTries < 10; numTries++) {
-        int f;
-
-        f = open(LOCKFILE, O_TRUNC | O_CREAT | O_EXCL | O_WRONLY, 0600);
-        if (f >= 0) {
-            char buf[200];
-            ssize_t numWritten;
-            size_t numBytes;
-
-            sprintf(buf, "%d\n", getpid());
-            numBytes = strlen(buf);
-            numWritten = write(f, buf, numBytes);
-            if (numWritten != (ssize_t)numBytes) {
-                ERROR("Wrote short lock file");
-            }
-            close(f);
-            return 0;
-        }
-        sleep(1);                       /* Wait for lock to release. */
-    }
-    ERROR("Failed to open lock file");
-    return -1;
-}
-
-static void
-releaseFileLock()
-{
-    unlink(LOCKFILE);
+SplitPath(const char *path, int *argcPtr, char ***argvPtr)
+{
+    char **array;
+    int count;
+    char *p;
+    char *s;
+    size_t addrsize;
+
+    count = 0;
+    for (p = strchr((char *)path, '/'); p != NULL; p = strchr(p+1, '/')) {
+        count++;
+    }
+    addrsize = (count + 1) * sizeof(char *);
+    array = (char **)malloc(addrsize + strlen(path) + 1);
+    s = (char *)array + addrsize;
+    strcpy(s, path);
+    
+    count = 0;
+    for (p = strtok(s, "/"); p != NULL; p = strtok(NULL, "/")) {
+        array[count++] = p;
+    }
+    *argcPtr = count;
+    *argvPtr = array;
+    return count;
+}
+
+int
+NanoVis::openStatsFile(const char *path)
+{
+    Tcl_DString ds;
+    char **argv;
+    int argc;
+    int i;
+    const char *fileName;
+    char string[200];
+
+    Tcl_DStringInit(&ds);
+    Tcl_DStringAppend(&ds, STATSDIR, -1);
+    SplitPath(path, &argc, &argv);
+    for (i = 0; i < argc; i++) {
+        char *p;
+
+        Tcl_DStringAppend(&ds, "/", 1);
+        Tcl_DStringAppend(&ds, argv[i], -1);
+        p = Tcl_DStringValue(&ds);
+        if (access(p, X_OK) != 0) {
+            mkdir(p, 0770);
+        }
+    }
+    Tcl_DStringAppend(&ds, "/", 1);
+    sprintf(string, "%d", getpid());
+    Tcl_DStringAppend(&ds, string, -1);
+    fileName = Tcl_DStringValue(&ds);
+    free(argv);
+    statsFile = open(fileName, O_EXCL | O_CREAT | O_WRONLY, 0600);
+    Tcl_DStringFree(&ds);
+    if (statsFile < 0) {
+        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
+        return -1;
+    }
+    return statsFile;
 }
 
@@ -334 +363 @@
 NanoVis::writeToStatsFile(const char *s, size_t length)
 {
-    int f;
     ssize_t numWritten;
-    if (access(STATSDIR, X_OK) != 0) {
-        mkdir(STATSDIR, 0770);
-    }
-    if (getFileLock() < 0) {
-        return -1;
-    }
-    f = open(STATSFILE, O_APPEND | O_CREAT | O_WRONLY, 0600);
-    releaseFileLock();
-    if (f < 0) {
-        return -1;
-    }
-    numWritten = write(f, s, length);
-    if (numWritten != (ssize_t)length) {
-        close(f);
-        return -1;
-    }
-    close(f);
+
+    if (statsFile >= 0) {
+        numWritten = write(statsFile, s, length);
+        if (numWritten == (ssize_t)length) {
+            close(dup(statsFile));
+        }
+    }
     return 0;
 }

trunk/packages/vizservers/nanovis/nanovis.h

@@ -97 +97 @@
 
 #ifdef KEEPSTATS
+    static int openStatsFile(const char *path);
     static int writeToStatsFile(const char *s, size_t length);
 #endif
@@ -152 +153 @@
 
     static FILE *stdin, *logfile, *recfile;
-
+    static int statsFile;
     static unsigned int flags;
     static bool debugFlag;