Changeset 2487 for branches

Timestamp:

Sep 8, 2011, 8:44:50 AM (13 years ago)

Author:

gah

Message:

 

Location:

branches/vtkvis_threaded

Files:

• PPMWriter.cpp (modified) (1 diff)
• ResponseQueue.h (modified) (2 diffs)
• RpVtkRendererCmd.cpp (modified) (10 diffs)

branches/vtkvis_threaded/PPMWriter.cpp

@@ -86 +86 @@
     Response *responsePtr;
     responsePtr = new Response(MESG_IMAGE);
-    responsePtr->SetMessage(mesg, length);
+    responsePtr->SetMessage(mesg, length, Response::DYNAMIC);
     queuePtr->Enqueue(responsePtr);
     TRACE("Leaving (%dx%d)\n", width, height);

branches/vtkvis_threaded/ResponseQueue.h

@@ -16 +16 @@
 
 class Response {
-    unsigned char *_mesg;               /* (Malloc-ed by caller, freed by
-                                         * destructor) Contains the
-                                         * message/bytes to be sent to the
-                                         * client. */
-    size_t _length;                     /* # of bytes in the above message. */
-    ResponseType _type;
-
 public:
+    typedef enum AllocTypes {
+        STATIC, DYNAMIC, VOLATILE
+    } AllocationType;
     Response(ResponseType type) {
         _length = 0;
@@ -40 +36 @@
     ~Response(void) {
         if (_length > 0) {
-            free(_mesg);
+            if (_allocType == DYNAMIC) {
+                free(_mesg);
+            }
         }
     }
-    void SetMessage(unsigned char *mesg, size_t length) {
-        _length = length;
-        _mesg = mesg;
+    void SetMessage(unsigned char *mesg, size_t length, AllocationType type) {
+        if (type == VOLATILE) {
+            _length = length;
+            _mesg = (unsigned char *)malloc(length);
+            memcpy(_mesg, mesg, length);
+            _allocType = DYNAMIC;
+        } else {
+            _length = length;
+            _mesg = mesg;
+            _allocType = type;
+        }
     }
+private:
+    unsigned char *_mesg;               /* (Malloc-ed by caller, freed by
+                                         * destructor) Contains the
+                                         * message/bytes to be sent to the
+                                         * client. */
+    size_t _length;                     /* # of bytes in the above message. */
+    ResponseType _type;
+    AllocationType _allocType;
 };
 

branches/vtkvis_threaded/RpVtkRendererCmd.cpp

@@ -30 +30 @@
 
 static void
-SendResponse(ClientData clientData, const void *bytes, size_t len)
+QueueResponse(ClientData clientData, const void *bytes, size_t len, 
+             Response::AllocationType allocType)
 {
     ResponseQueue *queuePtr = (ResponseQueue *)clientData;
@@ -37 +38 @@
     
     responsePtr = new Response(MESG_DATA);
-    responsePtr->SetMessage((unsigned char *)bytes, len);
+    responsePtr->SetMessage((unsigned char *)bytes, len, allocType);
     queuePtr->Enqueue(responsePtr);
 }
@@ -367 +368 @@
              pos[0], pos[1], pos[2], focalPt[0], focalPt[1], focalPt[2], viewUp[0], viewUp[1], viewUp[2]);
 
-    SendResponse(clientData, buf, strlen(buf));
+    QueueResponse(clientData, buf, strlen(buf), Response::VOLATILE);
     return TCL_OK;
 }
@@ -1320 +1321 @@
     }
     char *data = (char *)malloc(nbytes);
-#ifdef notdef
-    size_t ofs = 0;
-    ssize_t bytesRead = 0;
-    while ((bytesRead = read(g_fdIn, data + ofs, nbytes - ofs)) > 0) {
-        ofs += bytesRead;
-        if (ofs == nbytes)
-            break;
-    }
-    TRACE("bytesRead: %d", ofs);
-    if (bytesRead < 0) {
-        free(data);
-        return TCL_ERROR;
-    }
-#else
     size_t bytesRead = fread(data, 1, nbytes, g_fIn);
     TRACE("bytesRead: %d", bytesRead);
@@ -1340 +1327 @@
         return TCL_ERROR;
     }
-#endif
     g_renderer->addDataSet(name);
     g_renderer->setData(name, data, nbytes);
@@ -1378 +1364 @@
 
     char buf[256];
-    snprintf(buf, sizeof(buf), "nv>dataset scalar pixel %d %d %g %s\n", x, y, value, name);
-
-    SendResponse(clientData, buf, strlen(buf));
+    int length;
+
+    length = snprintf(buf, sizeof(buf), "nv>dataset scalar pixel %d %d %g %s\n",
+        x, y, value, name);
+
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
     return TCL_OK;
 }
@@ -1402 +1391 @@
 
     char buf[256];
-    snprintf(buf, sizeof(buf), "nv>dataset scalar world %g %g %g %g %s\n", x, y, z, value, name);
-
-    SendResponse(clientData, buf, strlen(buf));
+    int length;
+
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset scalar world %g %g %g %g %s\n", x, y, z, value, name);
+
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
     return TCL_OK;
 }
@@ -1445 +1437 @@
 
     char buf[256];
-    snprintf(buf, sizeof(buf), "nv>dataset vector pixel %d %d %g %g %g %s\n", x, y,
-             value[0], value[1], value[2], name);
-
-    SendResponse(clientData, buf, strlen(buf));
+    int length; 
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset vector pixel %d %d %g %g %g %s\n", x, y, value[0], 
+        value[1], value[2], name);
+
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
     return TCL_OK;
 }
@@ -1470 +1464 @@
 
     char buf[256];
-    snprintf(buf, sizeof(buf), "nv>dataset vector world %g %g %g %g %g %g %s\n", x, y, z,
-             value[0], value[1], value[2], name);
-
-    SendResponse(clientData, buf, strlen(buf));
+    int length;
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset vector world %g %g %g %g %g %g %s\n", x, y, z,
+        value[0], value[1], value[2], name);
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
     return TCL_OK;
 }
@@ -1536 +1531 @@
     oss << "}\n";
     len += 2;
-
-    SendResponse(clientData, oss.str().c_str(), len);
+    QueueResponse(clientData, oss.str().c_str(), len, Response::VOLATILE);
     return TCL_OK;
 }