Changeset 4152

Timestamp:

Jan 28, 2014 7:38:43 AM (10 years ago)

Author:

gah

Message:

fixes to vmdserver script and renderservers entry for vmdshow

Location:

trunk/packages/vizservers

Files:

• nanoscale/renderservers.tcl.in (modified) (2 diffs)
• vmd/INSTALL.txt (modified) (1 diff)
• vmd/vmdserver.tcl (modified) (4 diffs)

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

@@ -95 +95 @@
 #
 register_server vmdshow 2018 \
-    -input 3 -output 4 -combinelogs no \
+    -input 3 -output 4 -combinelogs yes \
 {
     ${libdir}/vmd/vmd_LINUXAMD64 -startup ${libdir}/vmd/vmdserver.tcl \
@@ -102 +102 @@
     VMDDIR ${libdir}/vmd
     SURF_BIN ${libdir}/vmd/surf
-    MSMSSERVER ${libdir}/msms
+    MSMSSERVER ${libdir}/vmd/msms
     LD_LIBRARY_PATH ${libdir}
+    __GL_SYNC_TO_VBLANK 0
 }

trunk/packages/vizservers/vmd/INSTALL.txt

@@ -1 @@
-Checkout vmdbuild directory from rappture-bat respository
-Follow instructions in INSTALL.txt there
+Checkout vmdbuild directory from rappture-bat repository
+
+  svn co https://nanohub.org/infrastructure/rappture-bat/svn/trunk/vmdbuild vmdbuild
+
+Follow instructions in INSTALL.txt there.  You'll need the vmdserver.tcl
+script from here.
+
+
+
+

trunk/packages/vizservers/vmd/vmdserver.tcl

@@ -607 +607 @@
     fileevent $cid readable [list server_handle $cid $cid]
     fconfigure $cid -buffering none -blocking 0
-
-    # identify server type to this client
-    # The server identifier must be in the form <name> <version>.  The
-    # base connect method will ignore characters until it finds this line.
-    puts $cid "vmd 0.1"
 }
 
@@ -624 +619 @@
         append buffer($cin) $line "\n"
         if {[info complete $buffer($cin)]} {
-            #puts stdout "command is ($buffer($cin))"
             set request $buffer($cin)
             set buffer($cin) ""
@@ -631 +625 @@
                 server_send_image -eventually
             } else {
-                puts stdout "last gets is ($line) cmd=($request) result=($result)"
                 server_oops $cout $result
                 if { [string match "invalid command*" $result] } {
-                    bgerror $result
+                    bgerror "I got a invalid command: $result"
                     exit 1
                 }
@@ -770 +763 @@
     socket -server server_accept 2018
 } else {
-    fileevent stdin readable [list server_handle stdin stdout]
-
-    # identify server type to this client
-    puts stdout "vmd 0.1"
-    flush stdout
-    fconfigure stdout -buffering none -blocking 0
+    set cin $vmd_client(read)
+    set cout $vmd_client(write)
+
+    fileevent $cin readable [list server_handle $cin $cout]
+    fconfigure $cout -buffering none -blocking 0
 }