Changeset 1195 for trunk/packages/vizservers/nanovis/nanovis.cpp

Timestamp:

Oct 28, 2008 2:18:37 PM (16 years ago)

Author:

gah

Message:

 

File:

• trunk/packages/vizservers/nanovis/nanovis.cpp (modified) (9 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -356 +356 @@
 DoExit(int code)
 {
+    if (NanoVis::debug_flag) {
+        fprintf(stderr, "in DoExit\n");
+    }
     removeAllData();
     NvExit();
@@ -409 +412 @@
     start = CVT2SECS(tv);
 
+#ifdef notdef
     if (NanoVis::debug_flag) {
-        fprintf(NanoVis::logfile, "(%s)\n", Tcl_DStringValue(dsPtr));
-    }
+        fprintf(NanoVis::logfile, "%s\n", Tcl_DStringValue(dsPtr));
+        fflush(NanoVis::logfile);
+    }
+#endif
     if (NanoVis::recfile != NULL) {
         fprintf(NanoVis::recfile, "%s", Tcl_DStringValue(dsPtr));
@@ -568 +574 @@
     //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's
 
-    char prefix[200];
-    sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
-    ppm_write(prefix);
-    write(0, "\n", 1);
-
+    if (!debug_flag) {
+        char prefix[200];
+        sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
+        ppm_write(prefix);
+        write(0, "\n", 1);
+    }
     plane_render->remove_plane(index);
     resize_offscreen_buffer(old_width, old_height);
@@ -2101 +2108 @@
 NanoVis::xinetd_listen(void)
 {
+    if (debug_flag) {
+        fprintf(stderr, "in xinetd_listen\n");
+    }
     int flags = fcntl(0, F_GETFL, 0);
     fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
@@ -2120 +2130 @@
         //  here.
         //
-        while (1) {
+        if (debug_flag) {
+            fprintf(stderr, "in xinetd_listen: check eof %d\n", feof(NanoVis::stdin));
+        }
+        while (!feof(NanoVis::stdin)) {
+            if (debug_flag) {
+                fprintf(stderr, "in xinetd_listen: reading 1 char\n");
+                fflush(stderr);
+            }
             int c = fgetc(NanoVis::stdin);
+            if (debug_flag) {
+                fprintf(stderr, "in xinetd_listen: read %c,%x\n", c, c);
+                fflush(stderr);
+            }
             char ch;
             if (c <= 0) {
@@ -2132 +2153 @@
             ch = (char)c;
             Tcl_DStringAppend(&cmdbuffer, &ch, 1);
-
+            if (debug_flag) {
+                fprintf(stderr, "in xinetd_listen: appending 1 char\n");
+            }
             if (ch=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
                 break;
@@ -2148 +2171 @@
         fcntl(0, F_SETFL, flags | O_NONBLOCK);
         npass++;
-        if (NanoVis::debug_flag) {
-           break;
-        }
     }
     fcntl(0, F_SETFL, flags);
@@ -2167 +2187 @@
         iov[2].iov_len = 1;
         writev(0, iov, 3);
+        if (debug_flag) {
+            fprintf(stderr, "leaving xinetd_listen\n");
+        }
         return;
     }
@@ -2210 +2233 @@
     write(0, rle, rle_size);    //unsigned byte
 #else
-    NanoVis::ppm_write("nv>image -bytes");
-#endif
+    if (!debug_flag) {
+        NanoVis::ppm_write("nv>image -bytes");
+    }
+#endif
+    if (feof(NanoVis::stdin)) {
+        exit(2);
+    }
+    if (debug_flag) {
+        fprintf(stderr, "leaving xinetd_listen\n");
+    }
 }