Changeset 3600

Timestamp:

Mar 30, 2013 1:06:17 AM (11 years ago)

Author:

ldelgass

Message:

Don't use a separate reader thread in vtkvis, the main thread can function as
the reader. This way we have 2 threads instead of 3 and the main loop is in
main() and can be shared with the non-threaded code path.

File:

• trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp (modified) (6 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -405 +405 @@
 initService()
 {
+    TRACE("Enter");
+
     const char *user = getenv("USER");
     char *logName = NULL;
@@ -433 +435 @@
         free(logName);
     }
+
+    TRACE("Leave");
 }
 
@@ -438 +442 @@
 exitService()
 {
+    TRACE("Enter");
+
     serverStats(0);
 
@@ -448 +454 @@
 
 #ifdef USE_THREADS
-static void *
-readerThread(void *clientData)
-{
-    ResponseQueue *queue = (ResponseQueue *)clientData;
-    Tcl_Interp *interp;
-
-    TRACE("Starting reader thread");
-    interp = (Tcl_Interp *)queue->clientData();
-    vtkSmartPointer<vtkUnsignedCharArray> imgData = 
-        vtkSmartPointer<vtkUnsignedCharArray>::New();
-    for (;;) {
-        if (processCommands(interp, (ClientData)clientData, g_inBufPtr, g_fdOut) < 0)
-            break;
-
-        if (g_renderer->render()) {
-            TRACE("Rendering new frame");
-            g_renderer->getRenderedFrame(imgData);
-            queueFrame(queue, imgData);
-            g_stats.nFrames++;
-            g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
-        } else {
-            TRACE("No render required");
-            sendAck((ClientData)clientData, g_fdOut);
-        }
-
-        if (g_inBufPtr->status() == ReadBuffer::ENDFILE)
-            break;
-    }    
-    return NULL;
-}
 
 static void *
@@ -530 +506 @@
     Tcl_Interp *interp = Tcl_CreateInterp();
 
+    ClientData clientData = NULL;
 #ifdef USE_THREADS
     ResponseQueue *queue = new ResponseQueue((void *)interp);
-    initTcl(interp, (ClientData)queue);
-
-    pthread_t readerThreadId, writerThreadId;
-    if (pthread_create(&readerThreadId, NULL, &readerThread, queue) < 0) {
-        ERROR("Can't create reader thread: %s", strerror(errno));
-    }
+    clientData = (ClientData)queue;
+    initTcl(interp, clientData);
+
+    pthread_t writerThreadId;
     if (pthread_create(&writerThreadId, NULL, &writerThread, queue) < 0) {
         ERROR("Can't create writer thread: %s", strerror(errno));
     }
-    if (pthread_join(readerThreadId, NULL) < 0) {
-        ERROR("Can't join reader thread: %s", strerror(errno));
-    } else {
-        TRACE("Reader thread exited");
-    }
+#else 
+    initTcl(interp, clientData);
+#endif
+
+    vtkSmartPointer<vtkUnsignedCharArray> imgData = 
+        vtkSmartPointer<vtkUnsignedCharArray>::New();
+
+    // Start main server loop
+    for (;;) {
+        if (processCommands(interp, clientData, g_inBufPtr, g_fdOut) < 0)
+            break;
+
+        if (g_renderer->render()) {
+            TRACE("Rendering new frame");
+            g_renderer->getRenderedFrame(imgData);
+#ifdef USE_THREADS
+            queueFrame(queue, imgData);
+#else
+            writeFrame(g_fdOut, imgData);
+#endif
+            g_stats.nFrames++;
+            g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
+        } else {
+            TRACE("No render required");
+            sendAck(clientData, g_fdOut);
+        }
+
+        if (g_inBufPtr->status() == ReadBuffer::ENDFILE)
+            break;
+    }
+#ifdef USE_THREADS
     // Writer thread is probably blocked on sem_wait, so cancel instead
     // of joining
@@ -557 +558 @@
     delete queue;
     queue = NULL;
-#else 
-    initTcl(interp, (ClientData)NULL);
-
-    vtkSmartPointer<vtkUnsignedCharArray> imgData = 
-        vtkSmartPointer<vtkUnsignedCharArray>::New();
-    for (;;) {
-        if (processCommands(interp, (ClientData)NULL, g_inBufPtr, g_fdOut) < 0)
-            break;
-
-        if (g_renderer->render()) {
-            TRACE("Rendering new frame");
-            g_renderer->getRenderedFrame(imgData);
-            writeFrame(g_fdOut, imgData);
-            g_stats.nFrames++;
-            g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
-        } else {
-            TRACE("No render required");
-        }
-
-        if (g_inBufPtr->status() == ReadBuffer::ENDFILE)
-            break;
-    }
 #endif