Changeset 3451 for trunk/packages

Timestamp:

Mar 4, 2013, 8:10:40 PM (12 years ago)

Author:

ldelgass

Message:

Add ok (acknowlege commands with no render required) response.

Location:

trunk/packages/vizservers/vtkvis

Files:

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

trunk/packages/vizservers/vtkvis/ResponseQueue.h

@@ -32 +32 @@
         LEGEND,         /**< Legend to be displayed. */
         DATA,           /**< Any other type of non-error message. */
-        ERROR           /**< Error message. */
+        ERROR,          /**< Error message. */
+        OK              /**< Ack for client when no render required */
     };
 

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -196 +196 @@
 #endif /*USE_THREADS*/
 
-#ifndef STATSDIR
-#define STATSDIR        "/var/tmp/visservers"
-#endif  /*STATSDIR*/
+static int sendAck(ClientData clientData, int fdOut)
+{
+    std::ostringstream oss;
+    oss << "nv>ok -token " << g_stats.nCommands <<  "\n";
+    int nBytes = oss.str().length();
+
+    TRACE("Sending OK for commands through %lu", g_stats.nCommands);
+#ifdef USE_THREADS
+    queueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::OK);
+#else
+    if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+        ERROR("write failed: %s", strerror(errno));
+        return -1;
+    }
+#endif
+    return 0;
+}
 
 int
@@ -455 +469 @@
         } else {
             TRACE("No render required");
+            sendAck((ClientData)clientData, g_fdOut);
         }
 

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.h

@@ -25 +25 @@
 #ifndef STATSDIR
 #define STATSDIR        "/var/tmp/visservers"
-#endif  
+#endif
 
 typedef struct {

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -4336 +4336 @@
  * \brief Get nearest data value given display coordinates x,y
  *
+ * FIXME: This doesn't work when actors are scaled
+ *
  * Note: no interpolation is performed on data
  */

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -37 +37 @@
 
 #ifdef USE_THREADS
-static void
-QueueResponse(ClientData clientData, const void *bytes, size_t len, 
-              Response::AllocationType allocType,
-              Response::ResponseType type = Response::DATA)
+void
+Rappture::VtkVis::queueResponse(ClientData clientData,
+                                const void *bytes, size_t len, 
+                                Response::AllocationType allocType,
+                                Response::ResponseType type)
 {
     ResponseQueue *queue = (ResponseQueue *)clientData;
@@ -1935 +1936 @@
 
 #ifdef USE_THREADS
-    QueueResponse(clientData, buf, strlen(buf), Response::VOLATILE);
+    queueResponse(clientData, buf, strlen(buf), Response::VOLATILE);
 #else 
     ssize_t bytesWritten = SocketWrite(buf, strlen(buf));
@@ -4162 +4163 @@
 
 #ifdef USE_THREADS
-    QueueResponse(clientData, buf, length, Response::VOLATILE);
+    queueResponse(clientData, buf, length, Response::VOLATILE);
 #else
     ssize_t bytesWritten = SocketWrite(buf, length);
@@ -4198 +4199 @@
 
 #ifdef USE_THREADS
-    QueueResponse(clientData, buf, length, Response::VOLATILE);
+    queueResponse(clientData, buf, length, Response::VOLATILE);
 #else 
     ssize_t bytesWritten = SocketWrite(buf, length);
@@ -4252 +4253 @@
 
 #ifdef USE_THREADS
-    QueueResponse(clientData, buf, length, Response::VOLATILE);
+    queueResponse(clientData, buf, length, Response::VOLATILE);
 #else 
     ssize_t bytesWritten = SocketWrite(buf, length);
@@ -4287 +4288 @@
                       value[0], value[1], value[2], name);
 #ifdef USE_THREADS
-    QueueResponse(clientData, buf, length, Response::VOLATILE);
+    queueResponse(clientData, buf, length, Response::VOLATILE);
 #else 
     ssize_t bytesWritten = SocketWrite(buf, length);
@@ -4398 +4399 @@
     len += 2;
 #ifdef USE_THREADS
-    QueueResponse(clientData, oss.str().c_str(), len, Response::VOLATILE);
+    queueResponse(clientData, oss.str().c_str(), len, Response::VOLATILE);
 #else 
     ssize_t bytesWritten = SocketWrite(oss.str().c_str(), len);
@@ -9789 +9790 @@
 
 #ifdef USE_THREADS
-            QueueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+            queueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
             if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
@@ -9814 +9815 @@
 
 #ifdef USE_THREADS
-        QueueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+        queueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
         if (write(fdOut, oss.str().c_str(), nBytes) < 0) {

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.h

@@ -13 +13 @@
 
 #include "ReadBuffer.h"
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
 
 namespace Rappture {
 namespace VtkVis {
+
+#ifdef USE_THREADS
+extern void queueResponse(ClientData clientData, const void *bytes, size_t len, 
+                          Response::AllocationType allocType,
+                          Response::ResponseType type = Response::DATA);
+#endif
 
 extern int processCommands(Tcl_Interp *interp,