Changeset 4830 for nanovis/branches/1.1/Command.cpp

Timestamp:

Dec 10, 2014, 1:32:28 AM (5 years ago)

Author:

ldelgass

Message:

Preallocate full size Rappture buffer for data payloads

File:

• nanovis/branches/1.1/Command.cpp (modified) (5 diffs)

nanovis/branches/1.1/Command.cpp

@@ -1211 +1211 @@
     }
     const char *tag = Tcl_GetString(objv[4]);
-    Rappture::Buffer buf;
+
+    Rappture::Buffer buf(nbytes);
     if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
         return TCL_ERROR;
     }
-    const char *bytes;
-    size_t nBytes;
-
-    bytes = buf.bytes();
-    nBytes = buf.size();
+    const char *bytes = buf.bytes();
+    size_t nBytes = buf.size();
 
     TRACE("Checking header[%.20s]", bytes);
@@ -1227 +1225 @@
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
         TRACE("ZincBlende Stream loading...");
-         //std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary);
-        //fdata.write(buf.bytes(),buf.size());
-        //vol = NvZincBlendeReconstructor::getInstance()->loadFromStream(fdata);
-
-        volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory((void*) buf.bytes());
+        volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory(buf.bytes());
         if (volume == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
@@ -1275 +1269 @@
         }
         TRACE("DX loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
             ERROR("data buffer is empty");
             abort();
         }
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
         Rappture::Outcome context;
         volume = load_dx_volume_stream(context, tag, fdata);
@@ -1296 +1290 @@
         volume->visible(true);
 
-        char info[1024];
-        ssize_t nWritten;
-
         if (Volume::updatePending) {
             NanoVis::setVolumeRanges();
         }
 
-        // FIXME: strlen(info) is the return value of sprintf
-        sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
-                volume->wAxis.min(), volume->wAxis.max(),
-                Volume::valueMin, Volume::valueMax);
-        nWritten  = write(1, info, strlen(info));
-        assert(nWritten == (ssize_t)strlen(info));
+        char info[1024];
+        int cmdLength =
+            sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag,
+                    volume->wAxis.min(), volume->wAxis.max(),
+                    Volume::valueMin, Volume::valueMax);
+        ssize_t nWritten = write(1, info, (size_t)cmdLength);
+        if (nWritten != (ssize_t)cmdLength) {
+            ERROR("Short write");
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -1709 +1704 @@
     const char *tag = Tcl_GetString(objv[4]);
 
-    Rappture::Buffer buf;
+    Rappture::Buffer buf(nBytes);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;