Changeset 2578 for trunk/packages

Timestamp:

Sep 26, 2011, 12:49:33 PM (13 years ago)

Author:

ldelgass

Message:

In vtkvis writer thread: if sem_wait fails (interrupted), check for empty queue
and re-enter loop.

Location:

trunk/packages/vizservers/vtkvis

Files:

• ResponseQueue.cpp (modified) (2 diffs)
• RpVtkRenderServer.cpp (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/ResponseQueue.cpp

@@ -70 +70 @@
 ResponseQueue::dequeue()
 {
-    Response *response;
+    Response *response = NULL;
 
     if (sem_wait(&_ready) < 0) {
@@ -77 +77 @@
     if (pthread_mutex_lock(&_idle) != 0) {
         ERROR("can't lock mutex: %s", strerror(errno));
-    }   
-    response = _list.front();
-    _list.pop_front();
+    }
+    if (_list.empty()) {
+        ERROR("Empty queue");
+    } else {
+        response = _list.front();
+        _list.pop_front();
+    }
     if (pthread_mutex_unlock(&_idle) != 0) {
         ERROR("can't unlock mutex: %s", strerror(errno));

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -274 +274 @@
         Response *response;
 
-        response = queue->dequeue(); 
+        response = queue->dequeue();
+        if (response == NULL)
+            continue;
         if (fwrite(response->message(), sizeof(char), response->length(),
                    g_fOut) != response->length()) {

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -13 +13 @@
 #include <sstream>
 #include <unistd.h>
+#include <sys/select.h>
 #include <sys/uio.h>
-#include <fcntl.h>
 #include <tcl.h>