Changeset 4830 for nanovis/branches/1.1

Timestamp:

Dec 9, 2014 10:32:28 PM (9 years ago)

Author:

ldelgass

Message:

Preallocate full size Rappture buffer for data payloads

Location:

nanovis/branches/1.1

Files:

• Command.cpp (modified) (5 diffs)
• FlowCmd.cpp (modified) (2 diffs)
• NvZincBlendeReconstructor.cpp (modified) (3 diffs)
• NvZincBlendeReconstructor.h (modified) (2 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;

nanovis/branches/1.1/FlowCmd.cpp

@@ -231 +231 @@
         return TCL_ERROR;
     }
-    Rappture::Buffer buf;
+    Rappture::Buffer buf(nBytes);
     TRACE("Flow data loading bytes: %d components: %d", nBytes, nComponents);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
     }
+    char *bytes = (char *)buf.bytes();
+    size_t length = buf.size();
+
     Rappture::Unirect3d *dataPtr;
     dataPtr = new Rappture::Unirect3d(nComponents);
 
     Flow *flow = (Flow *)clientData;
-    size_t length = buf.size();
-    char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
         if (!dataPtr->importDx(result, nComponents, length - 4, bytes + 4)) {
@@ -292 +293 @@
     {
         char info[1024];
-        ssize_t nWritten;
-        size_t length;
-
-        length = sprintf(info, "nv>data tag %s min %g max %g\n",
-                         flow->name(), dataPtr->magMin(), dataPtr->magMax());
-        nWritten  = write(1, info, length);
-        assert(nWritten == (ssize_t)strlen(info));
+        int length =
+            sprintf(info, "nv>data tag %s min %g max %g\n",
+                    flow->name(), dataPtr->magMin(), dataPtr->magMax());
+        ssize_t nWritten = write(1, info, (size_t)length);
+        if (nWritten != (ssize_t)length) {
+            ERROR("Short write");
+            return TCL_ERROR;
+        }
     }
     NanoVis::eventuallyRedraw(NanoVis::MAP_FLOWS);

nanovis/branches/1.1/NvZincBlendeReconstructor.cpp

@@ -369 +369 @@
 
 ZincBlendeVolume *
-NvZincBlendeReconstructor::loadFromMemory(void *dataBlock)
+NvZincBlendeReconstructor::loadFromMemory(const void *dataBlock)
 {
     ZincBlendeVolume *volume = NULL;
@@ -377 +377 @@
     int version = 1;
 
-    unsigned char *stream = (unsigned char *)dataBlock;
+    const unsigned char *stream = (const unsigned char *)dataBlock;
     char str[5][20];
     do {
@@ -469 +469 @@
 }
 
-void NvZincBlendeReconstructor::getLine(unsigned char*& stream)
+void NvZincBlendeReconstructor::getLine(const unsigned char*& stream)
 {
     char ch;

nanovis/branches/1.1/NvZincBlendeReconstructor.h

@@ -41 +41 @@
     ZincBlendeVolume *loadFromStream(std::istream& stream);
 
-    ZincBlendeVolume *loadFromMemory(void *dataBlock);
+    ZincBlendeVolume *loadFromMemory(const void *dataBlock);
 
     /**
@@ -73 +73 @@
      */
     void getLine(std::istream& stream);
-    void getLine(unsigned char*& stream);
+    void getLine(const unsigned char*& stream);
 
     char buff[255];