Changeset 2381 for trunk/packages

Timestamp:

Aug 16, 2011, 9:22:50 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanoscale/server2.c (modified) (1 diff)
• nanovis/nanovis.cpp (modified) (1 diff)
• nanovis/nanovis.h (modified) (1 diff)
• pymolproxy/pymolproxy.c (modified) (39 diffs)
• vtkvis/RpVtkRenderServer.cpp (modified) (1 diff)

trunk/packages/vizservers/nanoscale/server2.c

@@ -23 +23 @@
 
 #define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
-#ifdef WANT_TRACE
 #define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
-#else
-#define TRACE(...) 
-#endif
 #define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
 #define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -2250 +2250 @@
     NanoVis::stdin = stdin;
 
-    if ((n = write(1, "NanoVis ", 8)) != 8) {
-       INFO("short write %d", n);
-    }
+    fprintf(stdout, "NanoVis %s\n", NANOVIS_VERSION);
+    fflush(stdout);
+
     /* openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER); */
-    INFO("writing marker to stdout");
     gettimeofday(&tv, NULL);
     stats.start = tv;

trunk/packages/vizservers/nanovis/nanovis.h

@@ -68 +68 @@
 #include "config.h"
 
+#define NANOVIS_VERSION         "1.0"
 
 //defines for the image based flow visualization

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -67 +67 @@
 #include <sys/wait.h>
 #include <time.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <tcl.h>
@@ -173 +174 @@
 } PymolProxy;
 
+#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
+
+static const char *syslogLevels[] = {
+    "emergency",                        /* System is unusable */
+    "alert",                            /* Action must be taken immediately */
+    "critical",                         /* Critical conditions */
+    "error",                            /* Error conditions */
+    "warning",                          /* Warning conditions */
+    "notice",                           /* Normal but significant condition */
+    "info",                             /* Informational */
+    "debug",                            /* Debug-level messages */
+};
+
+void
+LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
+{
+#define MSG_LEN (2047)
+    char message[MSG_LEN+1];
+    const char *s;
+    int length;
+    va_list lst;
+
+    va_start(lst, fmt);
+    s = strrchr(path, '/');
+    if (s == NULL) {
+        s = path;
+    } else {
+        s++;
+    }
+    length = snprintf(message, MSG_LEN, "pymolproxy (%d) %s: %s:%d ", 
+                      getpid(), syslogLevels[priority],  s, lineNum);
+    length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
+    message[MSG_LEN] = '\0';
+    if (debug) {
+        fprintf(stderr, "%s\n", message);
+    } else {
+        syslog(priority, message, length);
+    }
+}
 
 static void PollForEvents(PymolProxy *proxyPtr);
 static void
-trace TCL_VARARGS_DEF(const char *, arg1)
+Debug TCL_VARARGS_DEF(const char *, arg1)
 {
     if (debug) {
@@ -225 +268 @@
 
 #if READTRACE
-    trace("Entering FillBuffer (mark=%d, fill=%d)\n", readPtr->mark, 
+    Debug("Entering FillBuffer (mark=%d, fill=%d)\n", readPtr->mark, 
           readPtr->fill);
 #endif
@@ -248 +291 @@
         if (errno != EAGAIN) {
 #if READTRACE
-            trace("in FillBuffer: read failed %d: %s", errno, strerror(errno));
-            trace("Leaving FillBuffer FAIL(read %d bytes) mark=%d, fill=%d\n", 
+            Debug("in FillBuffer: read failed %d: %s", errno, strerror(errno));
+            Debug("Leaving FillBuffer FAIL(read %d bytes) mark=%d, fill=%d\n", 
                   nRead, readPtr->mark, readPtr->fill);
 #endif
@@ -258 +301 @@
     readPtr->fill += nRead;
 #if READTRACE
-    trace("Leaving FillBuffer (read %d bytes) mark=%d, fill=%d\n", 
+    Debug("Leaving FillBuffer (read %d bytes) mark=%d, fill=%d\n", 
           nRead, readPtr->mark, readPtr->fill);
 #endif
@@ -271 +314 @@
 
 #if READTRACE
-    trace("Entering GetLine (mark=%d, fill=%d)\n",readPtr->mark, readPtr->fill);
+    Debug("Entering GetLine (mark=%d, fill=%d)\n",readPtr->mark, readPtr->fill);
 #endif
     status = BUFFER_OK;
@@ -277 +320 @@
         /* Look for the next newline (the next full line). */
 #if READTRACE
-        trace("in GetLine: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
+        Debug("in GetLine: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
 #endif
         for (i = readPtr->mark; i < readPtr->fill; i++) {
@@ -289 +332 @@
                 readPtr->mark = i;
 #if READTRACE
-                trace("Leaving GetLine(%.*s)\n", *nBytesPtr, p);
+                Debug("Leaving GetLine(%.*s)\n", *nBytesPtr, p);
 #endif
                 return p;
@@ -306 +349 @@
     }
 #if READTRACE
-    trace("Leaving GetLine failed to read line\n");
+    Debug("Leaving GetLine failed to read line\n");
 #endif
     *nBytesPtr = BUFFER_CONTINUE;
@@ -316 +359 @@
 {
 #if READTRACE
-    trace("Entering GetBytes(%d)\n", nBytes);
+    Debug("Entering GetBytes(%d)\n", nBytes);
 #endif
     while (nBytes > 0) {
@@ -335 +378 @@
             /* Received requested # bytes. */
 #if READTRACE
-            trace("Leaving GetBytes(%d)\n", nBytes);
+            Debug("Leaving GetBytes(%d)\n", nBytes);
 #endif
             return BUFFER_OK;
@@ -345 +388 @@
         }
 #if READTRACE
-        trace("in GetBytes: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
+        Debug("in GetBytes: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
 #endif
     }
 #if READTRACE
-    trace("Leaving GetBytes(%d)\n", nBytes);
+    Debug("Leaving GetBytes(%d)\n", nBytes);
 #endif
     return BUFFER_OK;
@@ -381 +424 @@
     sprintf(cmd, "/bin/rm -rf /tmp/pymol%d", getpid());
     if (system(cmd) < 0) {
-        trace("can't delete tmp directory: %s\n", strerror(errno));
+        ERROR("can't delete tmp directory: %s\n", strerror(errno));
     }
 }
@@ -395 +438 @@
     }
 #if EXPECTTRACE
-    trace("Entering Expect(want=\"%s\", maxSize=%d)\n", match, maxSize);
+    Debug("Entering Expect(want=\"%s\", maxSize=%d)\n", match, maxSize);
 #endif
     c = match[0];
@@ -406 +449 @@
         if (line != NULL) {
 #if EXPECTTRACE
-            trace("pymol says (read %d bytes):%.*s", nBytes, nBytes, line);
+            Debug("pymol says (read %d bytes):%.*s", nBytes, nBytes, line);
 #endif
             if ((c == line[0]) && (strncmp(line, match, length) == 0)) {
@@ -415 +458 @@
                 clear_error(proxyPtr);
 #if EXPECTTRACE
-                trace("Leaving Expect: got (%.*s)\n", nBytes, out);
+                Debug("Leaving Expect: got (%.*s)\n", nBytes, out);
 #endif
                 return BUFFER_OK;
@@ -425 +468 @@
         }
     }
-    trace("Leaving Expect: failed to find (%s)\n", match);
+    ERROR("Leaving Expect: failed to find (%s)\n", match);
     proxyPtr->error = 2;
     proxyPtr->status = TCL_ERROR;
@@ -561 +604 @@
     start = CVT2SECS(tv);
 
-    trace("command from client is (%s)", cmd);
+    Debug("command from client is (%s)", cmd);
     result = Tcl_Eval(interp, cmd);
 
@@ -579 +622 @@
     imgPtr = malloc(sizeof(Image) + dataLength);
     if (imgPtr == NULL) {
-        fprintf(stderr, "can't allocate image of %lu bytes", 
-                (unsigned long)(sizeof(Image) + dataLength));
+        ERROR("can't allocate image of %lu bytes", 
+              (unsigned long)(sizeof(Image) + dataLength));
         abort();
     }
@@ -610 +653 @@
 
     if (proxyPtr->tailPtr == NULL) {
-        trace("Should not be here: no image available to write");
+        ERROR("Should not be here: no image available to write");
         return;
     }
@@ -619 +662 @@
         prevPtr = imgPtr->prevPtr;
 #if WRITETRACE
-        trace("WriteImage: want to write %d bytes.", imgPtr->bytesLeft);
+        Debug("WriteImage: want to write %d bytes.", imgPtr->bytesLeft);
 #endif
         for (bytesLeft = imgPtr->bytesLeft; bytesLeft > 0; /*empty*/) {
             ssize_t nWritten;
 #if WRITETRACE
-            trace("WriteImage: try to write %d bytes.", bytesLeft);
+            Debug("WriteImage: try to write %d bytes.", bytesLeft);
 #endif
             nWritten = write(fd, imgPtr->data + imgPtr->nWritten, bytesLeft);
 #if WRITETRACE
-            trace("WriteImage: wrote %d bytes.", nWritten);
+            Debug("WriteImage: wrote %d bytes.", nWritten);
 #endif
             if (nWritten < 0) {
-                trace("Error writing fd(%d), %d/%s.", fd, errno, 
+                ERROR("Error writing fd(%d), %d/%s.", fd, errno, 
                       strerror(errno));
                 return;
@@ -673 +716 @@
     va_end(ap);
     
-    trace("to-pymol>(%s) code=%d", buffer, result);
+    Debug("to-pymol>(%s) code=%d", buffer, result);
     script("%s\n", buffer);
     
@@ -681 +724 @@
     nWritten = write(proxyPtr->sin, buffer, length);
     if (nWritten != length) {
-        trace("short write to pymol (wrote=%d, should have been %d)",
+        ERROR("short write to pymol (wrote=%d, should have been %d)",
               nWritten, length);
     }
@@ -694 +737 @@
     result = Expect(proxyPtr, expect, buffer, BUFSIZ);
     if (result == BUFFER_ERROR) {
-        trace("timeout reading data (buffer=%s)", buffer);
+        ERROR("timeout reading data (buffer=%s)", buffer);
         proxyPtr->error = 1;
         proxyPtr->status = TCL_ERROR;
@@ -806 +849 @@
     Pymol(proxyPtr, "bmp -\n");
     if (Expect(proxyPtr, "bmp image follows: ", buffer, BUFSIZ) != BUFFER_OK) {
-        trace("can't find image follows line (%s)", buffer);
+        ERROR("can't find image follows line (%s)", buffer);
     }
     if (sscanf(buffer, "bmp image follows: %d\n", &nBytes) != 1) {
@@ -820 +863 @@
     strcpy(imgPtr->data, buffer);
     if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        trace("can't read %d bytes for \"image follows\" buffer", nBytes);
+        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
         return  TCL_ERROR;
     }
@@ -1300 +1343 @@
     strcpy(imgPtr->data, buffer);
     if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        trace("can't read %d bytes for \"image follows\" buffer", nBytes);
+        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
         return  TCL_ERROR;
     }
@@ -1359 +1402 @@
     sprintf(buffer, "nv>image %d print \"%s\" %d\n", nBytes, token, 
             proxyPtr->rockOffset);
-    trace("header is png is (%s)\n", buffer);
+    Debug("header is png is (%s)\n", buffer);
     length = strlen(buffer);
     imgPtr = NewImage(proxyPtr, nBytes + length);
     strcpy(imgPtr->data, buffer);
     if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        trace("can't read %d bytes for \"image follows\" buffer", nBytes);
+        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
         return  TCL_ERROR;
     }
@@ -1929 +1972 @@
     child = fork();
     if (child < 0) {
-        fprintf(stderr, "can't fork process: %s\n", strerror(errno));
+        ERROR("can't fork process: %s\n", strerror(errno));
         return -3;
     }
@@ -1956 +1999 @@
         
         execvp(argv[0], argv);
-        trace("Failed to start pymol `%s'", argv[0]);
+        ERROR("Failed to start pymol `%s'", argv[0]);
         exit(-1);
     }
     stats.child = child;
 
-    trace("Started %s DISPLAY=%s\n", argv[0], getenv("DISPLAY"));
+    Debug("Started %s DISPLAY=%s\n", argv[0], getenv("DISPLAY"));
 
     /* close opposite end of pipe, these now belong to the child process  */
@@ -1982 +2025 @@
     interp = Tcl_CreateInterp();
     if (CreateTmpDir(interp) != TCL_OK) {
-        trace(Tcl_GetStringResult(interp));
+        ERROR(Tcl_GetStringResult(interp));
     }
     Tcl_MakeSafe(interp);
@@ -2016 +2059 @@
     stats.start = end;
 
-    write(cout, "pymol   ", 8);
+    if (write(cout, "PyMol 1.0\n", 10) != 10) {
+        ERROR("short write of signature");
+    }
     
     // Main Proxy Loop
@@ -2032 +2077 @@
     status = waitpid(child, &result, WNOHANG);
     if (status == -1) {
-        trace("error waiting on pymol server to exit: %s", strerror(errno));
+        ERROR("error waiting on pymol server to exit: %s", strerror(errno));
     } else if (status == 0) {
-        trace("attempting to signal (SIGTERM) pymol server.");
+        ERROR("attempting to signal (SIGTERM) pymol server.");
         kill(-child, SIGTERM);          // Kill process group
         alarm(5);
@@ -2041 +2086 @@
         
         while ((status == -1) && (errno == EINTR)) {
-            trace("Attempting to signal (SIGKILL) pymol server.");
+            ERROR("Attempting to signal (SIGKILL) pymol server.");
             kill(-child, SIGKILL);      // Kill process group
             alarm(10);
@@ -2049 +2094 @@
     }
     
-    trace("pymol server process ended (result=%d)", result);
+    ERROR("pymol server process ended (result=%d)", result);
     DestroyTmpDir();
 
@@ -2094 +2139 @@
         nChannels = poll(pollResults, nChannels, timeout);
         if (nChannels < 0) {
-            trace("POLL ERROR: %s", strerror(errno));
+            ERROR("POLL ERROR: %s", strerror(errno));
             continue;           /* or exit? */
         }
@@ -2107 +2152 @@
             char *line;
             
-            trace("Reading pymol stdout\n");
+            Debug("Reading pymol stdout\n");
             /* Don't care what's in the server output buffer. */
             FlushBuffer(&proxyPtr->server);
             line = GetLine(&proxyPtr->server, &nBytes);
             if (line != NULL) {
-                trace("STDOUT>%.*s", nBytes, line);
-                trace("Done with pymol stdout\n");
+                Debug("STDOUT>%.*s", nBytes, line);
+                Debug("Done with pymol stdout\n");
             } else if (nBytes == BUFFER_CONTINUE) {
-                trace("Done with pymol stdout\n");
+                Debug("Done with pymol stdout\n");
             } else {
-                trace("Failed reading pymol stdout (nBytes=%d)\n", nBytes);
+                ERROR("Failed reading pymol stdout (nBytes=%d)\n", nBytes);
                 goto error;     /* Get out on EOF or error. */
             }
@@ -2126 +2171 @@
             char buf[BUFSIZ];
             
-            trace("Reading pymol stderr\n");
+            Debug("Reading pymol stderr\n");
             /* pyMol Stderr Connection: pymol standard error output */
             
             nRead = read(pollResults[2].fd, buf, BUFSIZ-1);
             if (nRead <= 0) {
-                trace("unexpected read error from server (stderr): %s",
+                ERROR("unexpected read error from server (stderr): %s",
                       strerror(errno));
                 if (errno != EINTR) { 
-                    trace("lost connection (stderr) to pymol server.");
+                    ERROR("lost connection (stderr) to pymol server.");
                     return;
                 }
             }
             buf[nRead] = '\0';
-            trace("stderr>%s", buf);
-            trace("Done reading pymol stderr\n");
+            Debug("stderr>%s", buf);
+            Debug("Done reading pymol stderr\n");
         }
 
         /* We have some descriptors ready. */
         if (pollResults[0].revents & POLLIN) { 
-            trace("Reading client stdout\n");
+            Debug("Reading client stdout\n");
             for (;;) {
                 int nBytes;
@@ -2166 +2211 @@
                     break;
                 }
-                trace("Failed reading client stdout (nBytes=%d)\n", nBytes);
+                ERROR("Failed reading client stdout (nBytes=%d)\n", nBytes);
                 goto error;             /* Get out on EOF or error. */
             }
-            trace("done with client stdout\n");
+            Debug("done with client stdout\n");
         }
         /* 

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -172 +172 @@
      * also be used to supply information about the server (version, memory
      * size, etc). */
-    write(g_fdOut, "vtkvis  ", 8);
+    fprintf(stdout, "VtkVis 1.0\n");
+    fflush(stdout);
 
     g_renderer = new Renderer();