Changeset 6606

Timestamp:

Nov 11, 2016 12:43:23 AM (8 years ago)

Author:

ldelgass

Message:

merge r6598:6605 from pymolproxy trunk

Location:

pymolproxy/branches/1.0

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (1 diff)
• pymolproxy.c (modified) (29 diffs)

pymolproxy/branches/1.0/Makefile.in

@@ -64 +64 @@
 
 clean:
-        $(RM) a.out *.o *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
+        $(RM) a.out *.o *~ core* $(TARGETS) .deps/*.d
 
 distclean: clean

pymolproxy/branches/1.0/pymolproxy.c

@@ -12 +12 @@
  * image rendered offscreen is returned as ppm-formatted image data.
  *
- *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+ *  Copyright (c) 2004-2016  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  * ======================================================================
+ *
+ * Authors:
+ *   Nicholas Kisseberth <nkissebe@purdue.edu>
+ *   George A. Howlett <gah@purdue.edu>
+ *   Leif Delgass <ldelgass@purdue.edu>
  */
 
@@ -124 +129 @@
 #endif /* LOGDIR */
 
+#ifndef STATSDIR
+#define STATSDIR "/var/tmp/visservers"
+#endif  /*STATSDIR*/
+
 #define CVT2SECS(x)  ((double)(x).tv_sec) + ((double)(x).tv_usec * 1.0e-6)
 
@@ -191 +200 @@
     int rockOffset;
     int cacheId;
-    int error;
     int status;
     int width, height;                  /* Size of viewport. */
@@ -228 +236 @@
 #if WANT_DEBUG
 static void
-PrintToLog TCL_VARARGS_DEF(const char *, arg1)
-{
-    const char *format;
+PrintToLog(const char *format, ...)
+{
     va_list args;
 
-    format = TCL_VARARGS_START(const char *, arg1, args);
+    va_start(args, format);
     fprintf(stderr, "pymolproxy: ");
     vfprintf(stderr, format, args);
+    va_end(args);
     fprintf(stderr, "\n");
     fflush(stderr);
@@ -261 +269 @@
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';
+    va_end(lst);
+
     if (debug) {
-        DEBUG("%s\n", message);
+        DEBUG("%s", message);
     } else {
         syslog(priority, message, length);
@@ -269 +279 @@
 
 static void
-Record TCL_VARARGS_DEF(const char *, arg1)
-{
-    const char *format;
+Record(const char *format, ...)
+{
     va_list args;
 
-    format = TCL_VARARGS_START(const char *, arg1, args);
+    va_start(args, format);
     vfprintf(frecord, format, args);
+    va_end(args);
     fflush(frecord);
 }
@@ -288 +298 @@
     size_t length;
 
-    if (proxyPtr->error) {
-        return TCL_ERROR;
-    }
-
     va_start(ap, format);
-    result = vsnprintf(buffer, BUFSIZ-1, format, ap);
+    result = vsnprintf(buffer, BUFSIZ, format, ap);
     va_end(ap);
-
-#ifdef EXEC_DEBUG
-    DEBUG("to-pymol>(%s) code=%d", buffer, result);
+    if (result >= BUFSIZ) {
+        ERROR("Buffer too small for command (len=%d)", result);
+        proxyPtr->status = TCL_ERROR;
+        return proxyPtr->status;
+    }
+
+#if EXEC_DEBUG
+    DEBUG("to-pymol>(%s) len=%d", buffer, result);
 #endif
     if (recording) {
@@ -309 +320 @@
         ERROR("short write to pymol (wrote=%d, should have been %d): %s",
               numWritten, length, strerror(errno));
-    }
-    proxyPtr->status = result;
-    return  proxyPtr->status;
-}
-
-
-
-/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright (C) 2011, Purdue Research Foundation
- *
- * Author: George A. Howlett <gah@purdue.edu>
- */
+        proxyPtr->status = TCL_ERROR;
+    }
+    return proxyPtr->status;
+}
 
 static void
@@ -550 +552 @@
 clear_error(PymolProxy *proxyPtr)
 {
-    proxyPtr->error = 0;
     proxyPtr->status = TCL_OK;
 }
-
-#ifndef STATSDIR
-#define STATSDIR "/var/tmp/visservers"
-#endif  /*STATSDIR*/
 
 static int
@@ -733 +730 @@
 }
 
-
 static int
 CartoonCmd(ClientData clientData, Tcl_Interp *interp, int argc,
@@ -842 +838 @@
     return p->status;
 }
-
 
 static int
@@ -1269 +1264 @@
 }
 
-
 static int
 PpmCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])
@@ -1291 +1285 @@
     return p->status;
 }
-
 
 static int
@@ -1798 +1791 @@
 }
 
-
 /*
  * ZoomCmd --
@@ -1848 +1840 @@
 }
 
-
-
 static int
 ExecuteCommand(Tcl_Interp *interp, Tcl_DString *dsPtr)
@@ -1866 +1856 @@
     if (result != TCL_OK) {
 #if EXEC_DEBUG
-        DEBUG("result was %s\n", Tcl_GetString(Tcl_GetObjResult(interp)));
+        DEBUG("result was %s", Tcl_GetString(Tcl_GetObjResult(interp)));
 #endif
     }
@@ -1998 +1988 @@
 }
 
-
 static void
 WriteImages(ImageList *listPtr, int fd)
@@ -2064 +2053 @@
 #endif
 }
-
 
 static void
@@ -2116 +2104 @@
 
 #if DEBUG
-    DEBUG("Entering InitProxy\n");
+    DEBUG("Entering InitProxy");
 #endif
     /* Create two pipes for communication with the external application. One
@@ -2133 +2121 @@
     child = fork();
     if (child < 0) {
-        ERROR("can't fork process: %s\n", strerror(errno));
+        ERROR("can't fork process: %s", strerror(errno));
         return -3;
     }
@@ -2167 +2155 @@
             close(f);
         }
-        INFO("attempting to start \"%s\"", argv[0]);
+        INFO("Executing \"%s\"", argv[0]);
         execvp(argv[0], argv);
         ERROR("can't exec `%s': %s", argv[0], strerror(errno));
@@ -2178 +2166 @@
 
 #if DEBUG
-    DEBUG("Started %s DISPLAY=%s\n", argv[0], getenv("DISPLAY"));
+    DEBUG("Started %s DISPLAY=%s", argv[0], getenv("DISPLAY"));
 #endif
     /* close opposite end of pipe, these now belong to the child process  */
@@ -2205 +2193 @@
         for (cp = cmdProcs; cp->name != NULL; cp++) {
 #if DEBUG
-            DEBUG("Adding command %s\n", cp->name);
+            DEBUG("Adding command %s", cp->name);
 #endif
             Tcl_CreateCommand(interp, cp->name, cp->proc, p, NULL);
@@ -2274 +2262 @@
     return result;
 }
-
 
 static void *
@@ -2299 +2286 @@
             status = GetLine(&p->client, &numBytes, &line);
             if (status != BUFFER_OK) {
-                ERROR("can't read client stdout (numBytes=%d): %s\n", numBytes,
+                ERROR("can't read client stdout (numBytes=%d): %s", numBytes,
                       strerror(errno));
                 goto done;
@@ -2383 +2370 @@
             }
 #if WRITE_DEBUG
-            DEBUG("Writer: line found is %s\n", line);
+            DEBUG("Writer: line found is \"%.*s\"", (int)len, line);
 #endif
             if (strncmp(line, "image follows: ", 15) != 0) {
@@ -2390 +2377 @@
             if (sscanf(line, "image follows: %d %s %d %d\n", &numBytes, cacheId,
                        &frameNum, &rockOffset) != 4) {
-                ERROR("can't get # bytes from \"%s\"", line);
+                ERROR("can't get # bytes from \"%.*s\"", (int)len, line);
                 DEBUG("Leaving Writer thread");
                 return NULL;
             }
 #if WRITE_DEBUG
-            DEBUG("found image line \"%.*s\"", numBytes, line);
+            DEBUG("found image line (%d bytes)", numBytes);
 #endif
             sprintf(header, "nv>image %d %s %d %d\n", numBytes, cacheId,
@@ -2401 +2388 @@
             hdrLength = strlen(header);
 #if WRITE_DEBUG
-            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d\n", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
+            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
 #endif
             imgPtr = NewImage(&list, numBytes + hdrLength);
@@ -2457 +2444 @@
         ERROR("Short write on version string", strerror(errno));
     }
-    INFO("Starting pymolproxy (threaded version)");
+    DEBUG("Starting pymolproxy");
 
     InitProxy(&proxy, argv + 1);