Changeset 2500 for branches/vtkvis_threaded

Timestamp:

Sep 8, 2011 10:08:40 PM (13 years ago)

Author:

ldelgass

Message:

Log a more descriptive message when exiting on EOF or failed read of socket.

File:

• branches/vtkvis_threaded/RpVtkRendererCmd.cpp (modified) (6 diffs)

branches/vtkvis_threaded/RpVtkRendererCmd.cpp

@@ -4890 +4890 @@
  * (using a slider on the client).  The down side is you don't render
  * until there's a lull in the command stream.  If the client needs an
- * image, it can issue a "ppmflush" command.  That breaks us out of the
+ * image, it can issue an "imgflush" command.  That breaks us out of the
  * read loop.
  */
@@ -4912 +4912 @@
     while (select(1, &readFds, NULL, NULL, tvPtr) > 0) {
         if (fgets(buffer, BUFFERSIZE, fin) == NULL) {
-            ERROR("Failed to read from client: %s", strerror(errno));
-            exit(1);                    /* Terminate the server if we can't
-                                         * communicate with the client
-                                         * anymore. */
+            /* Terminate the server if we can't
+             * communicate with the client
+             * anymore. */
+            if (feof(fin)) {
+                INFO("Exiting server on EOF from client");
+                exit(0);
+            } else {
+                ERROR("Exiting server, failed to read from client: %s",
+                      strerror(errno));
+                exit(1);
+            }
         }
         buffer[BUFFERSIZE] = '\0';
@@ -4922 +4929 @@
             status = ExecuteCommand(interp, &command);
             if (status == TCL_BREAK) {
-                return 1;               /* This was caused by a "ppmflush"
+                return 1;               /* This was caused by a "imgflush"
                                          * command. Break out of the read loop
                                          * and allow a new image to be
@@ -4976 +4983 @@
     Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      clientData, NULL);
     Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
     Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
     Tcl_CreateObjCommand(interp, "lic",         LICCmd,         clientData, NULL);
     Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    clientData, NULL);
     Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
     Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, clientData, NULL);
     Tcl_CreateObjCommand(interp, "renderer",    RendererCmd,    clientData, NULL);
@@ -4990 +4997 @@
 /**
  * \brief Delete Tcl commands and interpreter
- *
  */
 void Rappture::VtkVis::exitTcl(Tcl_Interp *interp)
@@ -5003 +5009 @@
     Tcl_DeleteCommand(interp, "glyphs");
     Tcl_DeleteCommand(interp, "heightmap");
+    Tcl_DeleteCommand(interp, "imgflush");
     Tcl_DeleteCommand(interp, "legend");
     Tcl_DeleteCommand(interp, "lic");