Changeset 2637 for trunk/packages

Timestamp:

Oct 17, 2011, 8:04:39 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanoscale/renderservers.tcl.in (modified) (1 diff)
• pymolproxy/Makefile.in (modified) (2 diffs)
• pymolproxy/pymolproxy2.c (modified) (3 diffs)

trunk/packages/vizservers/nanoscale/renderservers.tcl.in

@@ -39 +39 @@
     PYMOL_PATH ${libdir}/pymol
 }
+
+#
+# Pymol server (threaded version of proxy) --
+#    Molecular layouts from PDB description.  Must set PYMOL_PATH.
+#    
+register_server pymol-threaded 2019 {
+    ${bindir}/pymolproxy2 ${bindir}/pymol -p -q -i -x -X 0 -Y 0
+} {
+    LD_LIBRARY_PATH ${libdir}
+    PYMOL_PATH ${libdir}/pymol
+}

trunk/packages/vizservers/pymolproxy/Makefile.in

@@ -29 +29 @@
 .PHONY: all install clean distclean
 
+FILES =         pymolproxy pymolproxy2 pymol
 PROXY_OBJS =    pymolproxy.o
 PROXY2_OBJS =   pymolproxy2.o
@@ -51 +52 @@
 install-pymolproxy: pymolproxy pymolproxy2
         $(MKDIR_P) -m 0755 $(bindir)
-        $(INSTALL) -m 0555 pymolproxy pymolproxy2 pymol $(bindir)
+        for i in $(FILES) ; do \
+            $(INSTALL) -m 0555 $$i $(bindir) ; \
+        done
 
 install-scripts:

trunk/packages/vizservers/pymolproxy/pymolproxy2.c

@@ -89 +89 @@
 #define TRUE  1
 
-static int debug = TRUE;
+static int debug = FALSE;
 static char stderrFile[200];
 static FILE *fdebug;
@@ -246 +246 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "pymolproxy (%d) %s: %s:%d ", 
+    length = snprintf(message, MSG_LEN, "pymolproxy2 (%d) %s: %s:%d ", 
         getpid(), syslogLevels[priority],  s, lineNum);
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
@@ -2283 +2283 @@
     fflush(stdout);
 
+    INFO("Starting pymolproxy (threaded version)");
+
     InitProxy(&proxy, stderrFile, argv + 1);
     if (pthread_create(&thread1, NULL, &ClientToServer, &proxy) < 0) {