Changeset 4097

Timestamp:

Dec 27, 2013, 1:34:49 PM (11 years ago)

Author:

gah

Message:

added vmd render server. fixed visviewer.tcl to look for something that looks like the servername and version. vmd polutes stdout with lots of text. I think the ultimate solution is to dup file descriptors 3 and 4 (instead of 0, 1, and 2) to the opened socket.

Location:

trunk

Files:

• gui/scripts/visviewer.tcl (modified) (9 diffs)
• packages/vizservers/nanoscale/renderservers.tcl.in (modified) (1 diff)
• packages/vizservers/vmd (added)
• packages/vizservers/vmd/INSTALL.txt (added)
• packages/vizservers/vmd/vmd-1.9.1.src.tar.gz (added)
• packages/vizservers/vmd/vmd-hubzero.patch (added)
• packages/vizservers/vmd/vmdserver.tcl (added)

trunk/gui/scripts/visviewer.tcl

@@ -36 +36 @@
     private variable _afterId -1
     private variable _icon 0
-    # Number of milliseconds to wait before idle timeout.  If greater than 0,
-    # automatically disconnect from the visualization server when idle timeout
-    # is reached.
+
+    # Number of milliseconds to wait before idle timeout.  If greater than
+    # 0, automatically disconnect from the visualization server when idle
+    # timeout is reached.
     private variable _idleTimeout 43200000; # 12 hours
     #private variable _idleTimeout 5000;    # 5 seconds
     #private variable _idleTimeout 0;       # No timeout
+
     protected variable _maxConnects 100
     protected variable _outbuf       ;    # buffer for outgoing commands
@@ -285 +287 @@
             continue
         }
-        puts stderr "render server is $data"
+        # The response should be in the form "serverName major.minor ...".
+        set pattern {^[A-Za-z]+ [0-9].[0-9].*}
+
+        while { ![regexp $pattern $data match] } {
+            puts stderr "$data"
+            if { [gets $_sid data] <= 0 } {
+                exit -1
+            }
+        }
+        puts stderr "Render server is $data"
         # We're connected. Cancel any pending serverDown events and
         # release the busy window over the hull.
@@ -388 +399 @@
 #
 #   Helper routine called from a file event to send data when the
-#   connection is writable (i.e. not blocked).  Sets a magic
-#   variable _done($this) when we're done.
+#   connection is writable (i.e. not blocked).  Sets a magic variable
+#   _done($this) when we're done.
 #
 itcl::body Rappture::VisViewer::SendHelper {} {
@@ -404 +415 @@
 #
 #   Helper routine called from a file event to send data when the
-#   connection is writable (i.e. not blocked).  Sends data in chunks 
-#   of 8k (or less).  Sets magic variable _done($this) to indicate
-#   that we're either finished (success) or could not send bytes to
-#   the server (failure).
+#   connection is writable (i.e. not blocked).  Sends data in chunks of 8k
+#   (or less).  Sets magic variable _done($this) to indicate that we're
+#   either finished (success) or could not send bytes to the server
+#   (failure).
 #
 itcl::body Rappture::VisViewer::SendHelper.old {} {
@@ -455 +466 @@
     set _buffer(out) ""
     if { [IsConnected] } {
-        # The connection may have closed while we were writing to the server.
-        # This can happen if what we sent the server caused it to barf.
+        # The connection may have closed while we were writing to the
+        # server.  This can happen if what we sent the server caused it to
+        # barf.
         fileevent $_sid writable ""
         flush $_sid
@@ -504 +516 @@
 # ReceiveHelper --
 #
-#   Helper routine called from a file event when the connection is 
-#   readable (i.e. a command response has been sent by the rendering 
-#   server.  Reads the incoming command and executes it in a safe 
-#   interpreter to handle the action.
+#   Helper routine called from a file event when the connection is readable
+#   (i.e. a command response has been sent by the rendering server.  Reads
+#   the incoming command and executes it in a safe interpreter to handle
+#   the action.
 #
 #       Note: This routine currently only handles command responses from
@@ -561 +573 @@
 # Color2RGB --
 #
-#   Converts a color name to a list of r,g,b values needed for the
-#   engine.  Each r/g/b component is scaled in the # range 0-1.
+#   Converts a color name to a list of r,g,b values needed for the engine.
+#   Each r/g/b component is scaled in the # range 0-1.
 #
 itcl::body Rappture::VisViewer::Color2RGB {color} {
@@ -589 +601 @@
 # SendEcho --
 #
-#     Used internally to echo sent data to clients interested in this widget.
-#     If the -sendcommand option is set, then it is invoked in the global scope
-#     with the <channel> and <data> values as arguments.  Otherwise, this does
-#     nothing.
+#     Used internally to echo sent data to clients interested in this
+#     widget.  If the -sendcommand opti on is set, then it is invoked in
+#     the global scope with the <channel> and <data> values as arguments.
+#     Otherwise, this does nothing.
 #
 itcl::body Rappture::VisViewer::SendEcho {channel {data ""}} {
@@ -610 +622 @@
 #
 #     Echoes received data to clients interested in this widget.  If the
-#     -receivecommand option is set, then it is invoked in the global
-#     scope with the <channel> and <data> values as arguments.  Otherwise,
-#     this does nothing.
+#     -receivecommand option is set, then it is invoked in the global scope
+#     with the <channel> and <data> values as arguments.  Otherwise, this
+#     does nothing.
 #
 itcl::body Rappture::VisViewer::ReceiveEcho {channel {data ""}} {

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

@@ -81 +81 @@
 #
 register_server vmdshow 2018 {
-    /usr/bin/vmd -startup ${libdir}/vmd/vmdserver.tcl -args -stdio
+    ${libdir}/vmd/vmd_LINUXAMD64 -startup ${libdir}/vmd/vmdserver.tcl -args -stdio
 } {
+    VMDDIR ${libdir}/vmd
+    SURF_BIN ${libdir}/vmd/surf
     LD_LIBRARY_PATH ${libdir}
 }
+