Changeset 6622

Timestamp:

Nov 14, 2016 12:25:18 PM (8 years ago)

Author:

ldelgass

Message:

Merge fixes from nanoscale trunk (minus the config parser changes)

Location:

nanoscale/branches/1.0

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (1 diff)
• renderservers.tcl.in (modified) (8 diffs)
• server.c (modified) (2 diffs)

nanoscale/branches/1.0/Makefile.in

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

nanoscale/branches/1.0/renderservers.tcl.in

@@ -18 +18 @@
 #       } {
 #           variables...
-#       } 
+#       }
 #
 # Registers a server by <name> at port <port>.
 # When a connection is made to <port>, <command> is run.
-# Environment variables will be set before executing command.  
+# Environment variables will be set before executing command.
 #
 # Note: Don't set DISPLAY here. nanoscale itself sets the DISPLAY
@@ -28 +28 @@
 #
 # Defaults:
-#   o Server reads from file descriptor 0.
-#   o Server writes to descriptor 1.
-#   o Server stdout and stderr are redirected to a log file.  
+#   - Server reads from file descriptor 0.
+#   - Server writes to descriptor 1.
+#   - Server stdout and stderr are redirected to a log file.
 #
 
@@ -37 +37 @@
 set libdir "@libdir@"
 
-# GeoVis server (port 2015) --
-#     Map renderer
+# GeoVis --
+#       Server Type     Map and globe renderer
+#       Port            2015
+#       Threaded        yes
+# Notes:
 #
-register_server geovis 2015 \
-    -output 3 -logstdout no -logstderr no \
-{
-    ${bindir}/geovis -o 3 -p ${libdir}/resources
+register_server geovis 2015 -output 3 -logstdout 0 -logstderr 0 {
+    ${bindir}/geovis -o 3 -t 43260 -p ${libdir}/resources
 } {
     LD_LIBRARY_PATH ${libdir}
@@ -54 +55 @@
 #       Port            2000
 #       Threaded        yes
-# Notes: 
-#       o Continue to use default options until we offically upgrade 
-#         nanovis to the latest release.  We are currently using a 1.2
-#         version of nanovis.
-#       o Requires change to 1.2 nanovis.  Can't redirect stderr to log 
-#         or X will complain about performing socket operation on non-socket
-#         descriptor.
+# Notes:
 #
-register_server nanovis 2000 \
-    -output 3 -logstdout no -logstderr no \
-{
-    ${bindir}/nanovis -o 3 -p ${libdir}/shaders:${libdir}/resources
+register_server nanovis 2000 -output 3 -logstdout 0 -logstderr 0 {
+    ${bindir}/nanovis -o 3 -t 43260 -p ${libdir}/shaders:${libdir}/resources
 } {
     LD_LIBRARY_PATH ${libdir}
@@ -72 +65 @@
 
 # VtkVis --
-#       Server type     3D drawings (scene graphs). Contour and surface graphs.
+#       Server Type     VTK based 3D renderer
 #       Port            2010
 #       Threaded        yes
 # Notes:
-#       o Removed ${vtkdir} from LD_LIRBRARY_PATH. Not needed with VTK 6.
-#       o Using new features in nanoscale/vtkvis to use file descriptor 3
-#         for server output.  No automatic logging of stdout and stderr.
 #
-register_server vtkvis 2010 \
-    -output 3 -logstdout no -logstderr no \
-{
-    ${bindir}/vtkvis -o 3
+register_server vtkvis 2010 -output 3 -logstdout 0 -logstderr 0 {
+    ${bindir}/vtkvis -o 3 -t 43260
 } {
     LD_LIBRARY_PATH ${libdir}
@@ -89 +77 @@
 }
 
-# PymolProxy -- 
-#       Server type     Molecular layouts using Pymol viewer.
+# PymolProxy --
+#       Server Type     Molecular layouts using Pymol viewer
 #       Port            2020
 #       Threaded        yes
 # Notes:
-#       o Need PYMOL_SITE_PATH for parallelpiped box.py location.
-#       o Makes no sense to log stdout and stderr of the proxy.
-#       o Renamed to just pymolproxy and removed non-threaded entry. 
+#       - Need PYMOL_SITE_PATH for parallelpiped box.py location.
+#       - For debug tracing, redirect stderr of the proxy to a log file.
 #
-register_server pymolproxy 2020 \
-    -logstdout no -logstderr no \
-{
+register_server pymolproxy 2020 -logstdout 0 -logstderr 0 -combinelogs 0 {
     ${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0
 } {
@@ -108 +93 @@
 }
 
-# VmdShow -- 
-#       Server type     Molecular layouts using VMD viewer (for mdshowcase).
+# VmdShow --
+#       Server Type     Molecular layouts using VMD viewer (for mdshowcase)
 #       Port            2018
 #       Threaded        no
 # Notes:
-#       o Commands are sent directly to the VMD process that uses custom
+#       - Commands are sent directly to the VMD process that uses custom
 #         TCL code to process.
-#       o Redirect input to descriptor 3: Otherwise VMD will get select hit.
-#       o Redirect output to descriptor 4: Lots of information written to
+#       - Redirect input to descriptor 3: Otherwise VMD will get select hit.
+#       - Redirect output to descriptor 4: Lots of information written to
 #         stdout and stderr of VMD.  Captured in log file.
-#       o Executing binary without wrapper shell script. Requires VMDDIR set.
-#       o Meshing programs surf and msms require explicit environment variables.
-#       o __GL_SYNC_TO_VBLANK probably doesn't matter.
-#       o Client doesn't send data files to VMD, but file paths.  Unlikely
-#         client will block on a large write.  
-#       
-register_server vmdshow 2018 \
-    -input 3 -output 4 -combinelogs yes \
-{
+#       - Executing binary without wrapper shell script. Requires VMDDIR set.
+#       - Meshing programs surf and msms require explicit environment variables.
+#       - Client doesn't send data files to VMD, but file paths.  Unlikely
+#         client will block on a large write.
+#
+register_server vmdshow 2018 -input 3 -output 4 -combinelogs 1 {
     ${libdir}/vmd/vmd_LINUXAMD64 -startup ${libdir}/vmd/vmdserver.tcl \
         -args -stdio
@@ -134 +116 @@
     MSMSSERVER ${libdir}/vmd/msms
     STRIDE_BIN ${libdir}/vmd/stride
-    LD_LIBRARY_PATH ""
     __GL_SYNC_TO_VBLANK 0
 }

nanoscale/branches/1.0/server.c

@@ -548 +548 @@
                         serverPtr->name, getpid());
                     if (serverPtr->logStdout) {
-                        newFd = open(path, O_WRONLY | O_CREAT| O_TRUNC, 0600);
+                        newFd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
                     } else {
                         newFd = open("/dev/null", O_WRONLY, 0600);
@@ -639 +639 @@
                 display[3] = screenNum + '0';
                 setenv("DISPLAY", display, 1);
-                /* Set the enviroment, if necessary. */
+                /* Don't pollute child's environment with our library path.
+                 * Library path should be explicitly set in config if needed.
+                 */ 
+                unsetenv("LD_LIBRARY_PATH");
+                /* Set the configured environment */
                 for (i = 0; i < serverPtr->numEnvArgs; i += 2) {
                     setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 1);