Changeset 2372 for trunk/packages

Timestamp:

Aug 15, 2011 3:03:02 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanovis/Command.cpp (modified) (1 diff)
• nanovis/FlowCmd.cpp (modified) (1 diff)
• nanovis/NvEventLog.cpp (modified) (1 diff)
• nanovis/nanovis.cpp (modified) (10 diffs)
• pymolproxy/pymolproxy.c (modified) (1 diff)
• vtkvis/RpVtkRenderServer.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1272 +1272 @@
                 volPtr->wAxis.min(), volPtr->wAxis.max(),
                 Volume::valueMin, Volume::valueMax);
-        nWritten  = write(0, info, strlen(info));
+        nWritten  = write(1, info, strlen(info));
         assert(nWritten == (ssize_t)strlen(info));
     }

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -849 +849 @@
         length = sprintf(info, "nv>data tag %s min %g max %g\n",
                 flowPtr->name(), dataPtr->magMin(), dataPtr->magMax());
-        nWritten  = write(0, info, length);
+        nWritten  = write(1, info, length);
         assert(nWritten == (ssize_t)strlen(info));
     }

trunk/packages/vizservers/nanovis/NvEventLog.cpp

@@ -38 +38 @@
     close(2);
     dup2(fileno(NanoVis::logfile), 2);
-    dup2(2,1);
+    /* dup2(2,1); */
     //flush junk
     fflush(stdout);

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -241 +241 @@
     ssize_t nWritten;
 
-    nWritten = write(0, str, strlen(str));
+    nWritten = write(2, str, strlen(str));
 }
 
@@ -591 +591 @@
         sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
         ppm_write(prefix);
-        nWritten = write(0, "\n", 1);
+        nWritten = write(1, "\n", 1);
         assert(nWritten == 1);
     }
@@ -1061 +1061 @@
     char string[200];
     sprintf(string, "%s %d\n", prefix, fsize);
-    nWritten = write(0, string, strlen(string));
+    nWritten = write(1, string, strlen(string));
     assert(nWritten == (ssize_t)strlen(string));
     header[pos++] = 'B';
@@ -1114 +1114 @@
     }
 
-    nWritten = write(0, header, SIZEOF_BMP_HEADER);
+    nWritten = write(1, header, SIZEOF_BMP_HEADER);
     assert(nWritten == SIZEOF_BMP_HEADER);
-    nWritten = write(0, screen_buffer, (3*win_width+pad)*win_height);
+    nWritten = write(1, screen_buffer, (3*win_width+pad)*win_height);
     assert(nWritten == (3*win_width+pad)*win_height);
     stats.nFrames++;
@@ -1180 +1180 @@
         srcRowPtr += bytesPerRow;
     }
-    if (writev(0, iov, nRecs) < 0) {
+    if (writev(1, iov, nRecs) < 0) {
         ERROR("write failed: %s\n", strerror(errno));
     }
@@ -1222 +1222 @@
     iov[1].iov_base = (char *)data;
     iov[1].iov_len = dlen;
-    if (writev(0, iov, nRecs) < 0) {
+    if (writev(1, iov, nRecs) < 0) {
         ERROR("write failed: %s\n", strerror(errno));
     }
@@ -2198 +2198 @@
         iov[2].iov_len = 1;
         iov[2].iov_base = (char *)'\n';
-        if (writev(0, iov, 3) < 0) {
+        if (writev(1, iov, 3) < 0) {
             ERROR("write failed: %s\n", strerror(errno));
         }
@@ -2225 +2225 @@
     int sizes[2] = {  offsets_size*sizeof(offsets[0]), rle_size };
     TRACE("Writing %d,%d\n", sizes[0], sizes[1]); 
-    write(0, &sizes, sizeof(sizes));
-    write(0, offsets, offsets_size*sizeof(offsets[0]));
-    write(0, rle, rle_size);    //unsigned byte
+    write(1, &sizes, sizeof(sizes));
+    write(1, offsets, offsets_size*sizeof(offsets[0]));
+    write(1, rle, rle_size);    //unsigned byte
 #else
     NanoVis::ppm_write("\nnv>image -type image -bytes");
@@ -2270 +2270 @@
     glutDisplayFunc(NanoVis::render);
 #else
+    write(1, "nanovis ", 8);
     glutDisplayFunc(NanoVis::display);
     glutReshapeFunc(NanoVis::resize_offscreen_buffer);
@@ -2433 +2434 @@
     //sprintf(prefix, "nv>height_top_view %s %g %g", volArg, min, max);
     //ppm_write(prefix);
-    //write(0, "\n", 1);
+    //write(1, "\n", 1);
     //plane_render->remove_plane(index);
 

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -2013 +2013 @@
     stats.start = end;
 
+    write(cout, "pymol   ", 8);
+    
     // Main Proxy Loop
     //  accept tcl commands from socket

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -168 +168 @@
     g_fdOut = fileno(stdout);
 
+    /* This synchronizes the client with the server, so that the client 
+     * doesn't start writing commands before the server is ready. It could
+     * also be used to supply information about the server (version, memory
+     * size, etc). */
+    write(g_fdOut, "vtkvis  ", 8);
+
     g_renderer = new Renderer();
     vtkSmartPointer<vtkUnsignedCharArray> imgData =