Changeset 1155

Timestamp:

Sep 15, 2008 1:58:33 PM (16 years ago)

Author:

gah

Message:

added statistics for pymol

File:

• trunk/packages/vizservers/pymolproxy/pymolproxy.c (modified) (7 diffs)

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -47 +47 @@
 
 #define IO_TIMEOUT (30000)
+#define STATSFILE       "/var/tmp/pymolproxy.csv"
 
 typedef struct {
@@ -107 +108 @@
     struct timeval tv;
     double start, finish;
+    int result;
 
     gettimeofday(&tv, NULL);
     start = ((double)tv.tv_sec) + ((double)tv.tv_usec * 1.0e-6);
-    Tcl_Eval(interp, Tcl_DStringValue(dsPtr));
+    result = Tcl_Eval(interp, Tcl_DStringValue(dsPtr));
     trace("Executed (%s)", Tcl_DStringValue(dsPtr));
     Tcl_DStringSetLength(dsPtr, 0);
@@ -118 +120 @@
     statsPtr->cmdTime += finish - start;
     statsPtr->nCommands++;
-}
+    return result;
+}
+
+#ifdef KEEPSTATS
 
 static int
@@ -125 +130 @@
     struct timeval tv;
     double start, finish;
-    int lockf;
-    FILE *f;
-    char *lockFileName, *statsFileName;
+    int f;
+    size_t length;
+    char buf[4000];
 
     /* Get ending time.  */
@@ -134 +139 @@
     tv = statsPtr->start;
     start = ((double)tv.tv_sec) + ((double)tv.tv_usec * 1.0e-6);
-    for(;;) {
-        lockf = open(lockFileName, O_EXCL | O_CREAT | O_TRUNC | O_WRONLY, 0600);
-        if (lockf >= 0) {
-            break;
-        }
-        if (errno != EEXIST) {
-            fprintf(stderr, "can't open lock file \"%s\"\n: %s\n",
-                    lockFileName, strerror(errno));
-            return 0;
-        }
-        /* Need to turn off alarms first. */
-        alarm(0);
-        sleep(1);
-    }
-    f = fopen(statsFileName, "a+");
-    if (f == NULL) {
-        fprintf(f, "\"pymolproxy\",%d,%d,%d,%d,%d,%d,%g,%g", 
-                getpid(),
-                code,
-                statsPtr->date, 
-                statsPtr->nFrames, 
-                statsPtr->nBytes, 
-                statsPtr->nCommands, 
-                statsPtr->cmdTime, 
-                finish - start);
-        fclose(f);
-    }
-    close(lockf);
-    unlink(lockFileName);
+    sprintf(buf, "\"pymolproxy\",%d,%d,%d,%d,%d,%d,%g,%g", 
+            getpid(),
+            code,
+            statsPtr->date, 
+            statsPtr->nFrames, 
+            statsPtr->nBytes, 
+            statsPtr->nCommands, 
+            statsPtr->cmdTime, 
+            finish - start);
+    f = open(STATSFILE, O_APPEND | O_CREAT | O_WRONLY, 0600);
+    if (f < 0) {
+        return 0;
+    }
+    length = strlen(buf);
+    if (write(f, buf, length) != length) {
+        return 0;
+    }
+    close(f);
     return 1;
 }
+#endif
 
 INLINE static void
@@ -1361 +1356 @@
                     
                     if (ch == '\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
-                        ExecuteCommand(interp, &cmdbuffer, &stats);
+                        int result;
+
+                        result = ExecuteCommand(interp, &cmdbuffer, &stats);
                         if (timeout == 0) status = 0; // send update
                     }
@@ -1423 +1420 @@
     
     status = waitpid(pid, &result, WNOHANG);
+#ifdef KEEPSTATS
     WriteStats(&stats, status);
+#endif
     if (status == -1) {
         trace("pymolproxy: error waiting on pymol server to exit (%d)\n", errno);