Changeset 5603 for nanovis/branches/1.2/Command.cpp

Timestamp:

May 22, 2015 2:47:15 PM (9 years ago)

Author:

ldelgass

Message:

move old processCommands to Command.cpp

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (2 diffs)

nanovis/branches/1.2/Command.cpp

@@ -37 +37 @@
 #include <unistd.h>                     /* Needed for getpid, gethostname,
                                          * write, etc. */
-
+#if !defined(USE_NEW_EVENT_LOOP) && !defined(USE_THREADS)
+#include <fcntl.h>
+#endif
 #include <sstream>
 
@@ -2236 +2238 @@
 }
 
+#if !defined(USE_NEW_EVENT_LOOP) && !defined(USE_THREADS)
+int
+nv::processCommands(Tcl_Interp *interp, FILE *inFile, int fdOut)
+{
+    int ret = 0;
+    int status = TCL_OK;
+
+    Tcl_DString cmdbuffer;
+    Tcl_DStringInit(&cmdbuffer);
+
+    int flags = fcntl(0, F_GETFL, 0);
+    fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
+
+    //  Read and execute as many commands as we can from stdin...
+    bool isComplete = false;
+    while ((!feof(inFile)) && (status == TCL_OK)) {
+        //
+        //  Read the next command from the buffer.  First time through we
+        //  block here and wait if necessary until a command comes in.
+        //
+        //  BE CAREFUL: Read only one command, up to a newline.  The "volume
+        //  data follows" command needs to be able to read the data
+        //  immediately following the command, and we shouldn't consume it
+        //  here.
+        //
+        while (!feof(inFile)) {
+            int c = fgetc(inFile);
+            char ch;
+            if (c <= 0) {
+                if (errno == EWOULDBLOCK) {
+                    break;
+                }
+                return -1;
+            }
+            ch = (char)c;
+            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
+            if (ch == '\n') {
+                isComplete = Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer));
+                if (isComplete) {
+                    break;
+                }
+            }
+        }
+        // no command? then we're done for now
+        if (Tcl_DStringLength(&cmdbuffer) == 0) {
+            break;
+        }
+        if (isComplete) {
+            // back to original flags during command evaluation...
+            fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
+            struct timeval start, finish;
+            gettimeofday(&start, NULL);
+            status = ExecuteCommand(interp, &cmdbuffer);
+            gettimeofday(&finish, NULL);
+            // non-blocking for next read -- we might not get anything
+            fcntl(0, F_SETFL, flags | O_NONBLOCK);
+            isComplete = false;
+            g_stats.cmdTime += (MSECS_ELAPSED(start, finish) / 1.0e+3);
+            g_stats.nCommands++;
+        }
+    }
+    fcntl(0, F_SETFL, flags);
+
+    if (status != TCL_OK) {
+        if (handleError(interp, status, fdOut) < 0) {
+            return -1;
+        }
+        TRACE("Leaving on ERROR");
+    }
+
+    return ret;
+}
+
+#endif
+
 /**
  * \brief Execute commands from client in Tcl interpreter