Changeset 4063

Timestamp:

Nov 15, 2013 3:32:03 PM (10 years ago)

Author:

ldelgass

Message:

Remove some more Rappture deps from nanovis

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (9 diffs)
• Command.h (modified) (1 diff)
• FlowCmd.cpp (modified) (14 diffs)
• Makefile.in (modified) (4 diffs)
• ReadBuffer.cpp (modified) (1 diff)
• ReadBuffer.h (modified) (1 diff)
• Unirect.cpp (modified) (8 diffs)
• Unirect.h (modified) (3 diffs)
• VtkDataSetReader.cpp (modified) (2 diffs)
• VtkDataSetReader.h (modified) (2 diffs)
• VtkReader.cpp (modified) (14 diffs)
• VtkReader.h (modified) (2 diffs)
• ZincBlendeReconstructor.cpp (modified) (11 diffs)
• ZincBlendeReconstructor.h (modified) (2 diffs)
• dxReader.cpp (modified) (12 diffs)
• dxReader.h (modified) (2 diffs)
• nanovisServer.cpp (modified) (3 diffs)
• nanovisServer.h (modified) (1 diff)
• protocol-nanovis.txt (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -33 +33 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>                     /* Needed for getpid, gethostname,
@@ -40 +41 @@
 #include <RpField1D.h>
 #include <RpEncode.h>
-#include <RpOutcome.h>
 #include <RpBuffer.h>
 
@@ -57 +57 @@
 #ifdef USE_VTK
 #include "VtkDataSetReader.h"
+#else
+#include "VtkReader.h"
 #endif
-#include "VtkReader.h"
 #include "BMPWriter.h"
 #include "PPMWriter.h"
@@ -153 +154 @@
 }
 
-bool
-nv::SocketRead(Rappture::Buffer &buf, size_t len)
-{
-    ReadBuffer::BufferStatus status;
-    status = g_inBufPtr->followingData(buf, len);
-    TRACE("followingData status: %d", status);
-    return (status == ReadBuffer::OK);
-}
-
 static int
 ExecuteCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
@@ -534 +526 @@
 /**
  * Read the requested number of bytes from standard input into the given
- * buffer.  The buffer is then decompressed and decoded.
+ * buffer.  The buffer must have already been allocated for nBytes.  The 
+ * buffer is then decompressed and decoded.
  */
 int
 nv::GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes)
 {
-    if (!SocketRead(buf, nBytes)) {
-        return TCL_ERROR;
-    }
+    if (!SocketRead((char *)buf.bytes(), nBytes)) {
+        return TCL_ERROR;
+    }
+    buf.count(nBytes);
     Rappture::Outcome err;
     TRACE("Checking header[%.13s]", buf.bytes());
@@ -1280 +1274 @@
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
         TRACE("ZincBlende Stream loading...");
-        volume = (Volume *)ZincBlendeReconstructor::getInstance()->loadFromMemory(const_cast<char *>(bytes));
+        volume = (Volume *)ZincBlendeReconstructor::getInstance()->loadFromMemory(bytes);
         if (volume == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
@@ -1301 +1295 @@
             abort();
         }
-        Rappture::Outcome context;
 #ifdef USE_VTK
-        volume = load_vtk_volume_stream(context, tag, bytes, nBytes);
+        volume = load_vtk_volume_stream(tag, bytes, nBytes);
 #else
         std::stringstream fdata;
         fdata.write(bytes, nBytes);
-        volume = load_vtk_volume_stream(context, tag, fdata);
+        volume = load_vtk_volume_stream(tag, fdata);
 #endif
         if (volume == NULL) {
-            Tcl_AppendResult(interp, context.remark(), (char*)NULL);
+            Tcl_AppendResult(interp, "Failed to load VTK file", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1326 +1319 @@
         std::stringstream fdata;
         fdata.write(bytes, nBytes);
-        Rappture::Outcome context;
-        volume = load_dx_volume_stream(context, tag, fdata);
+        volume = load_dx_volume_stream(tag, fdata);
         if (volume == NULL) {
-            Tcl_AppendResult(interp, context.remark(), (char*)NULL);
+            Tcl_AppendResult(interp, "Failed to load DX file", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1765 +1757 @@
     }
     Unirect2d data(1);
-    if (data.parseBuffer(interp, buf) != TCL_OK) {
+    if (data.parseBuffer(interp, buf.bytes(), buf.size()) != TCL_OK) {
         return TCL_ERROR;
     }

trunk/packages/vizservers/nanovis/Command.h

@@ -37 +37 @@
 extern bool SocketRead(char *bytes, size_t len);
 
-extern bool SocketRead(Rappture::Buffer &buf, size_t len);
-
 extern int processCommands(Tcl_Interp *interp,
                            ReadBuffer *inBufPtr,

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -17 +17 @@
 #include <poll.h>
 
+#include <sstream>
+
 #include <tcl.h>
 
-#include <RpOutcome.h>
+#include <RpBuffer.h>
 
 #include <vrmath/Vector3f.h>
@@ -32 +34 @@
 #ifdef USE_VTK
 #include "VtkDataSetReader.h"
+#else
+#include "VtkReader.h"
 #endif
-#include "VtkReader.h"
 #include "FlowCmd.h"
 #include "FlowTypes.h"
@@ -135 +138 @@
 };
 
-static int
-FlowDataFileOp(ClientData clientData, Tcl_Interp *interp, int objc,
-               Tcl_Obj *const *objv)
-{
-    Rappture::Outcome result;
-
-    const char *fileName;
-    fileName = Tcl_GetString(objv[3]);
-    TRACE("File: %s", fileName);
-
-    int nComponents;
-    if (Tcl_GetIntFromObj(interp, objv[4], &nComponents) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if ((nComponents < 1) || (nComponents > 4)) {
-        Tcl_AppendResult(interp, "bad # of components \"", 
-                         Tcl_GetString(objv[4]), "\"", (char *)NULL);
-        return TCL_ERROR;
-    }
-    Rappture::Buffer buf;
-    if (!buf.load(result, fileName)) {
-        Tcl_AppendResult(interp, "can't load data from \"", fileName, "\": ",
-                         result.remark(), (char *)NULL);
-        return TCL_ERROR;
-    }
-
-    Unirect3d *dataPtr;
-    dataPtr = new 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)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-    } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->parseBuffer(interp, buf) != TCL_OK) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-    } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Unirect2d *u2dPtr;
-        u2dPtr = new Unirect2d(nComponents);
-        if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
-            delete u2dPtr;
-            return TCL_ERROR;
-        }
-        dataPtr->convert(u2dPtr);
-        delete u2dPtr;
-    } else {
-        TRACE("header is %.14s", buf.bytes());
-        if (!dataPtr->importDx(result, nComponents, length, bytes)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-    }
-    if (dataPtr->nValues() == 0) {
-        delete dataPtr;
-        Tcl_AppendResult(interp, "no data found in \"", fileName, "\"",
-                         (char *)NULL);
-        return TCL_ERROR;
-    }
-    flow->data(dataPtr);
-    Flow::updatePending = true;
-    NanoVis::eventuallyRedraw();
-    return TCL_OK;
-}
-
 /**
  * $flow data follows nbytes nComponents
@@ -213 +145 @@
                   Tcl_Obj *const *objv)
 {
-    Rappture::Outcome result;
-
     TRACE("Enter");
 
@@ -253 +183 @@
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
         unirect = new Unirect3d(nComponents);
-        if (!unirect->importDx(result, nComponents, length - 4, bytes + 4)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+        if (!unirect->importDx(nComponents, length - 4, bytes + 4)) {
+            Tcl_AppendResult(interp, "Failed to load DX file", (char *)NULL);
             delete unirect;
             return TCL_ERROR;
@@ -260 +190 @@
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
         unirect = new Unirect3d(nComponents);
-        if (unirect->parseBuffer(interp, buf) != TCL_OK) {
+        if (unirect->parseBuffer(interp, bytes, length) != TCL_OK) {
             delete unirect;
             return TCL_ERROR;
@@ -268 +198 @@
         Unirect2d *u2dPtr;
         u2dPtr = new Unirect2d(nComponents);
-        if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
+        if (u2dPtr->parseBuffer(interp, bytes, length) != TCL_OK) {
             delete unirect;
             delete u2dPtr;
@@ -277 +207 @@
     } else if ((length > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, length);
         if (length <= 0) {
             ERROR("data buffer is empty");
             abort();
         }
-        Rappture::Outcome context;
 #ifdef USE_VTK
-        volume = load_vtk_volume_stream(context, flow->name(), bytes, length);
+        volume = load_vtk_volume_stream(flow->name(), bytes, length);
 #else
         std::stringstream fdata;
-        fdata.write(bytes, nBytes);
-        volume = load_vtk_volume_stream(context, flow->name(), fdata);
+        fdata.write(bytes, length);
+        volume = load_vtk_volume_stream(flow->name(), fdata);
 #endif
         if (volume == NULL) {
-            Tcl_AppendResult(interp, context.remark(), (char*)NULL);
+            Tcl_AppendResult(interp, "Failed to load VTK file", (char*)NULL);
             return TCL_ERROR;
         }
@@ -298 +225 @@
         TRACE("header is %.14s", buf.bytes());
         unirect = new Unirect3d(nComponents);
-        if (!unirect->importDx(result, nComponents, length, bytes)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+        if (!unirect->importDx(nComponents, length, bytes)) {
+            Tcl_AppendResult(interp, "Failed to load DX file", (char *)NULL);
             delete unirect;
             return TCL_ERROR;
@@ -350 +277 @@
 
 static CmdSpec flowDataOps[] = {
-    {"file",    2, FlowDataFileOp,    5, 5, "fileName nComponents",},
     {"follows", 2, FlowDataFollowsOp, 5, 5, "size nComponents",},
 };
@@ -1196 +1122 @@
         return TCL_ERROR;
     }
-    Rappture::Buffer data;
+    char *data = NULL;
     size_t total = 0;
     for (;;) {
@@ -1202 +1128 @@
         char buffer[BUFSIZ]; 
         
-        numRead = fread(buffer, sizeof(unsigned char), BUFSIZ, f);
+        numRead = fread(buffer, sizeof(char), BUFSIZ, f);
         total += numRead;
         if (numRead == 0) {             // EOF
@@ -1214 +1140 @@
             return TCL_ERROR;
         }
-        if (!data.append(buffer, numRead)) {
+        data = (char *)realloc(data, total);
+        if (data == NULL) {
             ERROR("Can't append movie data to buffer %d bytes",
                   numRead);
@@ -1221 +1148 @@
             return TCL_ERROR;
         }
-    }
-    if (data.size() == 0) {
+        memcpy(data + (total - numRead), buffer, numRead);
+    }
+    if (total == 0) {
         ERROR("ffmpeg returned 0 bytes");
     }
     // Send zero length to client so it can deal with error
     sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
-            token, (unsigned long)data.size());
-    nv::sendDataToClient(cmd, data.bytes(), data.size());
+            token, total);
+    // Memory is freed by this call
+    nv::sendDataToClient(cmd, data, total);
     return TCL_OK;
 }

trunk/packages/vizservers/nanovis/Makefile.in

@@ -57 +57 @@
 VTK_LIB_DIR     = @VTK_LIB_DIR@
 VTK_INC_DIR     = @VTK_INC_DIR@
+ifdef USE_VTK
 VTK_INC_SPEC    = -I$(VTK_INC_DIR)/vtk-$(VTK_VERSION)
 VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
@@ -71 +72 @@
                 -lvtkCommonTransforms-$(VTK_VERSION) \
                 -lvtkCommonMath-$(VTK_VERSION)
+else
+VTK_INC_SPEC    =
+VTK_LIB_SPEC    =
+endif
 
 EXTRA_LIBS      = -lm -lpthread
@@ -174 +179 @@
                 VolumeRenderer.o \
                 VolumeShader.o \
-                VtkReader.o \
                 ZincBlendeReconstructor.o \
                 ZincBlendeVolume.o \
@@ -231 +235 @@
 OBJS +=         DataSetResample.o \
                 VtkDataSetReader.o
+else
+OBJS +=         VtkReader.o
 endif
 

trunk/packages/vizservers/nanovis/ReadBuffer.cpp

@@ -143 +143 @@
 }
 
-ReadBuffer::BufferStatus
-ReadBuffer::followingData(Rappture::Buffer& out, size_t numBytes)
-{
-    TRACE("Enter");
-    while (numBytes > 0) {
-        size_t bytesLeft;
-
-        bytesLeft = _fill - _mark;
-        if (bytesLeft > 0) {
-            int size;
-
-            /* Pull bytes out of the buffer, updating the mark. */
-            size = (bytesLeft >  numBytes) ? numBytes : bytesLeft;
-            out.append((const char *)_bytes + _mark, size);
-            _mark += size;
-            numBytes -= size;
-        }
-        if (numBytes == 0) {
-            /* Received requested # bytes. */
-            return ReadBuffer::OK;
-        }
-        /* Didn't get enough bytes, need to read some more. */
-        _lastStatus = doFill();
-        if (_lastStatus == ReadBuffer::ERROR ||
-            _lastStatus == ReadBuffer::ENDFILE) {
-            return _lastStatus;
-        }
-    }
-    return ReadBuffer::OK;
-}
-
 /** 
  * \brief Returns the next available line (terminated by a newline)

trunk/packages/vizservers/nanovis/ReadBuffer.h

@@ -35 +35 @@
 
     BufferStatus followingData(unsigned char *out, size_t numBytes);
-
-    BufferStatus followingData(Rappture::Buffer& out, size_t numBytes);
 
     /**

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -42 +42 @@
 
 int
-nv::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
-{
-    Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
+nv::Unirect2d::parseBuffer(Tcl_Interp *interp, const char *bytes, size_t len)
+{
+    Tcl_Obj *objPtr = Tcl_NewStringObj(bytes, len);
     Tcl_Obj **objv;
     int objc;
@@ -59 +59 @@
 
 int
-nv::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+nv::Unirect3d::parseBuffer(Tcl_Interp *interp, const char *bytes, size_t len)
 {
     Tcl_Obj *objPtr;
-    objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
+    objPtr = Tcl_NewStringObj(bytes, len);
     Tcl_Obj **objv;
     int objc;
@@ -487 +487 @@
 
 bool
-nv::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents,
+nv::Unirect3d::importDx(size_t nComponents,
                         size_t length, char *string) 
 {
@@ -510 +510 @@
                    &nx, &ny, &nz) == 3) {
             if ((nx < 0) || (ny < 0) || (nz < 0)) {
-                result.addError("invalid grid size: x=%d, y=%d, z=%d", 
-                        nx, ny, nz);
+                ERROR("invalid grid size: x=%d, y=%d, z=%d", 
+                      nx, ny, nz);
                 return false;
             }
@@ -528 +528 @@
                 " rank 1 items %d data follows", &npts) == 1) {
             if (npts < 0) {
-                result.addError("bad # points %d", npts);
+                ERROR("bad # points %d", npts);
                 return false;
             }
             TRACE("#points=%d", npts);
             if (npts != nx*ny*nz) {
-                result.addError("inconsistent data: expected %d points"
-                                " but found %d points", nx*ny*nz, npts);
+                ERROR("inconsistent data: expected %d points"
+                      " but found %d points", nx*ny*nz, npts);
                 return false;
             }
@@ -541 +541 @@
                 " times %d data follows", &npts) == 1) {
             if (npts != nx*ny*nz) {
-                result.addError("inconsistent data: expected %d points"
-                                " but found %d points", nx*ny*nz, npts);
+                ERROR("inconsistent data: expected %d points"
+                      " but found %d points", nx*ny*nz, npts);
                 return false;
             }
@@ -549 +549 @@
     }
     if (npts != nx*ny*nz) {
-        result.addError("inconsistent data: expected %d points"
-                        " but found %d points", nx*ny*nz, npts);
+        ERROR("inconsistent data: expected %d points"
+              " but found %d points", nx*ny*nz, npts);
         return false;
     }
@@ -605 +605 @@
     /* Make sure that we read all of the expected points. */
     if (_nValues != (size_t)npts) {
-        result.addError("inconsistent data: expected %d points"
-                        " but found %d points", npts, _nValues);
+        ERROR("inconsistent data: expected %d points"
+              " but found %d points", npts, _nValues);
         free(_values);
         _values = NULL;

trunk/packages/vizservers/nanovis/Unirect.h

@@ -12 +12 @@
 #include <tcl.h>
 
-#include <rappture.h>
+#include <RpBuffer.h>
 
 #include <vrmath/Vector3f.h>
@@ -222 +222 @@
     int loadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
 
-    int parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
-
-    bool importDx(Rappture::Outcome &result, size_t nComponents, 
-                  size_t length, char *string);
+    int parseBuffer(Tcl_Interp *interp, const char *bytes, size_t len);
+
+    bool importDx(size_t nComponents, size_t length, char *string);
 
     bool convert(Unirect2d *dataPtr);
@@ -382 +381 @@
     int loadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
 
-    int parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
+    int parseBuffer(Tcl_Interp *interp, const char *bytes, size_t len);
 
     bool isInitialized()

trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp

@@ -16 +16 @@
 #include <vtkCharArray.h>
 
-#include <RpOutcome.h>
-
 #include <vrmath/Vector3f.h>
 
@@ -32 +30 @@
 
 Volume *
-nv::load_vtk_volume_stream(Rappture::Outcome& result, const char *tag, const char *bytes, int nBytes)
+nv::load_vtk_volume_stream(const char *tag, const char *bytes, int nBytes)
 {
     TRACE("Enter tag:%s", tag);

trunk/packages/vizservers/nanovis/VtkDataSetReader.h

@@ -9 +9 @@
 #include <iostream>
 
-namespace Rappture {
-class Outcome;
-}
-
 namespace nv {
 
@@ -18 +14 @@
 
 extern Volume *
-load_vtk_volume_stream(Rappture::Outcome& status, const char *tag, const char *bytes, int nBytes);
+load_vtk_volume_stream(const char *tag, const char *bytes, int nBytes);
 
 }

trunk/packages/vizservers/nanovis/VtkReader.cpp

@@ -8 +8 @@
 #include <float.h>
 
-#include <RpOutcome.h>
 #include <RpField1D.h>
 #include <RpFieldRect3D.h>
@@ -184 +183 @@
 
 Volume *
-nv::load_vtk_volume_stream(Rappture::Outcome& result, const char *tag, std::iostream& fin)
+nv::load_vtk_volume_stream(const char *tag, std::iostream& fin)
 {
     TRACE("Enter tag:%s", tag);
@@ -208 +207 @@
         fin.getline(line, sizeof(line) - 1);
         if (fin.fail()) {
-            result.error("Error in data stream");
+            ERROR("Error in data stream");
             return NULL;
         }
@@ -223 +222 @@
                     isRect = 1;
                 } else {
-                    result.addError("Unsupported DataSet type '%s'", str);
+                    ERROR("Unsupported DataSet type '%s'", str);
                     return NULL;
                 }
             } else if (sscanf(start, "DIMENSIONS %d %d %d", &nx, &ny, &nz) == 3) {
                 if (nx <= 0 || ny <= 0 || nz <= 0) {
-                    result.error("Found non-positive dimensions");
+                    ERROR("Found non-positive dimensions");
                     return NULL;
                 }
@@ -236 +235 @@
             } else if (sscanf(start, "SPACING %lg %lg %lg", &dx, &dy, &dz) == 3) {
                 if ((nx > 1 && dx == 0.0) || (ny > 1 && dy == 0.0) || (nz > 1 && dz == 0.0)) {
-                    result.error("Found zero spacing for dimension");
+                    ERROR("Found zero spacing for dimension");
                     return NULL;
                 }
@@ -242 +241 @@
             } else if (sscanf(start, "POINT_DATA %d", &npts) == 1) {
                 if (npts < 1 || npts != nx * ny * nz) {
-                    result.addError("Error in data stream: unexpected number of point data: %d", npts);
+                    ERROR("Error in data stream: unexpected number of point data: %d", npts);
                     return NULL;
                 }
                 if (isBinary < 0 || fin.eof()) {
                     // Should know if ASCII or BINARY by now
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
                 fin.getline(line, sizeof(line) - 1);
                 if (fin.fail()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -258 +257 @@
                     ;  // skip leading blanks
                 if (sscanf(start, "SCALARS %s %s", str, type) != 2) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -268 +267 @@
                     ftype = UCHAR;
                     if (!isBinary) {
-                        result.addError("unsigned char only supported in binary VTK files");
+                        ERROR("unsigned char only supported in binary VTK files");
                         return NULL;
                     }
@@ -280 +279 @@
                     ftype = UINT;
                 } else {
-                    result.addError("Unsupported scalar type: '%s'", type);
+                    ERROR("Unsupported scalar type: '%s'", type);
                     return NULL;
                 }
                 if (fin.eof()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
                 fin.getline(line, sizeof(line) - 1);
                 if (fin.fail()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -297 +296 @@
                     // skip lookup table, but don't read ahead
                     if (fin.eof()) {
-                        result.error("Error in data stream");
+                        ERROR("Error in data stream");
                         return NULL;
                     }
                 } else {
                     // Lookup table line is required
-                    result.error("Missing LOOKUP_TABLE");
+                    ERROR("Missing LOOKUP_TABLE");
                     return NULL;
                 }
@@ -311 +310 @@
                     if (fin.fail()) {
                         deleteFieldData(fieldData, ftype);
-                        result.error("Error in data stream");
+                        ERROR("Error in data stream");
                         return NULL;
                     }
@@ -321 +320 @@
                         if (fin.fail()) {
                             deleteFieldData(fieldData, ftype);
-                            result.error("Error in data stream");
+                            ERROR("Error in data stream");
                             return NULL;
                         }
@@ -334 +333 @@
     if (isRect < 0 || numRead != npts || npts < 1) {
         deleteFieldData(fieldData, ftype);
-        result.error("Error in data stream");
+        ERROR("Error in data stream");
         return NULL;
     }
@@ -469 +468 @@
     } else {
         deleteFieldData(fieldData, ftype);
-        result.error("Unsupported DataSet");
+        ERROR("Unsupported DataSet");
         return NULL;
     }

trunk/packages/vizservers/nanovis/VtkReader.h

@@ -9 +9 @@
 #include <iostream>
 
-namespace Rappture {
-class Outcome;
-}
-
 namespace nv {
 
@@ -18 +14 @@
 
 extern Volume *
-load_vtk_volume_stream(Rappture::Outcome& status, const char *tag, std::iostream& fin);
+load_vtk_volume_stream(const char *tag, std::iostream& fin);
 
 }

trunk/packages/vizservers/nanovis/ZincBlendeReconstructor.cpp

@@ -61 +61 @@
     do {
         getLine(stream);
-        if (buff[0] == '#') {
+        if (_buff[0] == '#') {
             continue;
-        } else if (strstr((const char*) buff, "object") != 0) {
+        } else if (strstr((const char*) _buff, "object") != 0) {
             TRACE("VERSION 1");
             version = 1;
             break;
-        } else if (strstr(buff, "record format") != 0) {
+        } else if (strstr(_buff, "record format") != 0) {
             TRACE("VERSION 2");
             version = 2;
@@ -77 +77 @@
         float dummy;
 
-        sscanf(buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4], &width, &height, &depth);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
+        sscanf(_buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4], &width, &height, &depth);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
         do {
             getLine(stream);
-        } while (strcmp(buff, "<\\HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0);
 
         width = width / 4;
@@ -111 +111 @@
         do {
             getLine(stream);
-            if ((pt = strstr(buff, "delta")) != 0) {
+            if ((pt = strstr(_buff, "delta")) != 0) {
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
                 TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
-            } else if ((pt = strstr(buff, "datacount")) != 0) {
+            } else if ((pt = strstr(_buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
 #ifdef _LOADER_DEBUG_
                 TRACE("datacount = %d", datacount);
 #endif
-            } else if ((pt = strstr(buff, "datatype")) != 0) {
+            } else if ((pt = strstr(_buff, "datatype")) != 0) {
                 sscanf(pt, "%s%s", str[0], str[1]);
                 if (strcmp(str[1], "double64")) {
                 }
-            } else if ((pt = strstr(buff, "count")) != 0) {
+            } else if ((pt = strstr(_buff, "count")) != 0) {
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
                 TRACE("width height depth %d %d %d", width, height, depth);
 #endif
-            } else if ((pt = strstr(buff, "emptymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
                 TRACE("emptyvalue %lf", emptyvalue);
 #endif
-            } else if ((pt = strstr(buff, "emprymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
@@ -141 +141 @@
 #endif
             }
-        } while (strcmp(buff, "<\\HDR>") != 0 && strcmp(buff, "</HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0 && strcmp(_buff, "</HDR>") != 0);
 
         data = malloc(width * height * depth * 8 * 4 * sizeof(double)); 
@@ -363 +363 @@
         sin.get(ch);
         if (ch == '\n') break;
-        buff[index++] = ch;
+        _buff[index++] = ch;
         if (ch == '>') {
-            if (buff[1] == '\\')
+            if (_buff[1] == '\\')
                 break;
         }
     } while (!sin.eof());
 
-    buff[index] = '\0';
-
-#ifdef _LOADER_DEBUG_
-    TRACE("%s", buff);
+    _buff[index] = '\0';
+
+#ifdef _LOADER_DEBUG_
+    TRACE("%s", _buff);
 #endif
 }
 
 ZincBlendeVolume *
-ZincBlendeReconstructor::loadFromMemory(void *dataBlock)
+ZincBlendeReconstructor::loadFromMemory(const void *dataBlock)
 {
     ZincBlendeVolume *volume = NULL;
@@ -386 +386 @@
     int version = 1;
 
-    unsigned char *stream = (unsigned char *)dataBlock;
+    const unsigned char *stream = (const unsigned char *)dataBlock;
     char str[5][20];
     do {
         getLine(stream);
-        if (buff[0] == '#') {
+        if (_buff[0] == '#') {
             continue;
-        } else if (strstr((const char *)buff, "object") != 0) {
+        } else if (strstr((const char *)_buff, "object") != 0) {
             TRACE("VERSION 1");
             version = 1; 
             break;
-        } else if (strstr(buff, "record format") != 0) {
+        } else if (strstr(_buff, "record format") != 0) {
             TRACE("VERSION 2");
             version = 2; 
@@ -406 +406 @@
         float dummy;
 
-        sscanf(buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4],&width, &height, &depth);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
+        sscanf(_buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4],&width, &height, &depth);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
         do {
             getLine(stream);
-        } while (strcmp(buff, "<\\HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0);
 
         width = width / 4;
@@ -435 +435 @@
         do {
             getLine(stream);
-            if ((pt = strstr(buff, "delta")) != 0) {   
+            if ((pt = strstr(_buff, "delta")) != 0) {   
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
                 TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
-            } else if ((pt = strstr(buff, "datacount")) != 0) {
+            } else if ((pt = strstr(_buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
                 TRACE("datacount = %d", datacount);
-            } else if ((pt = strstr(buff, "datatype")) != 0) {
+            } else if ((pt = strstr(_buff, "datatype")) != 0) {
                 sscanf(pt, "%s%s", str[0], str[1]);
                 if (strcmp(str[1], "double64")) {
                 }
-            } else if ((pt = strstr(buff, "count")) != 0) {
+            } else if ((pt = strstr(_buff, "count")) != 0) {
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
                 TRACE("width height depth %d %d %d", width, height, depth);
 #endif
-            } else if ((pt = strstr(buff, "emptymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
                 TRACE("emptyvalue %lf", emptyvalue);
 #endif
-            } else if ((pt = strstr(buff, "emprymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
@@ -463 +463 @@
 #endif
             }
-        } while (strcmp(buff, "<\\HDR>") != 0 && strcmp(buff, "</HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0 && strcmp(_buff, "</HDR>") != 0);
 
         if (datacount == -1) datacount = width * height * depth;
@@ -478 +478 @@
 }
 
-void ZincBlendeReconstructor::getLine(unsigned char*& stream)
+void ZincBlendeReconstructor::getLine(const unsigned char*& stream)
 {
     char ch;
@@ -486 +486 @@
         ++stream;
         if (ch == '\n') break;
-        buff[index++] = ch;
+        _buff[index++] = ch;
         if (ch == '>') {
-            if (buff[1] == '\\')
+            if (_buff[1] == '\\')
                 break;
         }
     } while (1);
 
-    buff[index] = '\0';
-
-#ifdef _LOADER_DEBUG_
-    TRACE("%s", buff);
-#endif
-}
+    _buff[index] = '\0';
+
+#ifdef _LOADER_DEBUG_
+    TRACE("%s", _buff);
+#endif
+}

trunk/packages/vizservers/nanovis/ZincBlendeReconstructor.h

@@ -35 +35 @@
     ZincBlendeVolume *loadFromStream(std::istream& stream);
 
-    ZincBlendeVolume *loadFromMemory(void *dataBlock);
+    ZincBlendeVolume *loadFromMemory(const void *dataBlock);
 
     /**
@@ -67 +67 @@
      */
     void getLine(std::istream& stream);
-    void getLine(unsigned char*& stream);
+    void getLine(const unsigned char*& stream);
 
-    char buff[255];
+    char _buff[255];
 
     /// A ZincBlendeReconstructor Singleton instance

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -29 +29 @@
 #include <string>
 
-#include <RpOutcome.h>
 #include <RpField1D.h>
 #include <RpFieldRect3D.h>
@@ -58 +57 @@
  */
 Volume *
-nv::load_dx_volume_stream(Rappture::Outcome& result, const char *tag,
-                          std::iostream& fin)
+nv::load_dx_volume_stream(const char *tag, std::iostream& fin)
 {
     TRACE("Enter tag:%s", tag);
@@ -83 +81 @@
         fin.getline(line, sizeof(line) - 1);
         if (fin.fail()) {
-            result.error("error in data stream");
+            ERROR("error in data stream");
             return NULL;
         }
@@ -158 +156 @@
                     ftri.close();
                 } else {
-                    result.error("triangularization failed");
+                    ERROR("triangularization failed");
                     return NULL;
                 }
@@ -183 +181 @@
                 }
                 if (count > 1) {
-                    result.addError("don't know how to handle multiple non-zero"
-                                    " delta values");
+                    ERROR("don't know how to handle multiple non-zero"
+                          " delta values");
                     return NULL;
                 }
@@ -190 +188 @@
                               &dummy, type, &npts) == 3) {
                 if (isrect && (npts != nx*ny*nz)) {
-                    result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nx*ny*nz, npts);
+                    ERROR("inconsistent data: expected %d points"
+                          " but found %d points", nx*ny*nz, npts);
                     return NULL;
                 } else if (!isrect && (npts != nxy*nz)) {
-                    result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nxy*nz, npts);
+                    ERROR("inconsistent data: expected %d points"
+                          " but found %d points", nxy*nz, npts);
                     return NULL;
                 }
@@ -202 +200 @@
                               &dummy, type, &npts) == 3) {
                 if (npts != nx*ny*nz) {
-                    result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nx*ny*nz, npts);
+                    ERROR("inconsistent data: expected %d points"
+                          " but found %d points", nx*ny*nz, npts);
                     return NULL;
                 }
@@ -220 +218 @@
     // read data points
     if (fin.eof()) {
-        result.error("data not found in stream");
+        ERROR("data not found in stream");
         return NULL;
     }
@@ -247 +245 @@
             fin.getline(line,sizeof(line)-1);
             if (fin.fail()) {
-                result.addError("error reading data points");
+                ERROR("error reading data points");
                 return NULL;
             }
@@ -287 +285 @@
         // make sure that we read all of the expected points
         if (nread != npts) {
-            result.addError("inconsistent data: expected %d points"
-                            " but found %d points", npts, nread);
+            ERROR("inconsistent data: expected %d points"
+                  " but found %d points", npts, nread);
             return NULL;
         }
@@ -390 +388 @@
             fin >> dval;
             if (fin.fail()) {
-                result.addError("after %d of %d points: can't read number", 
-                                nread, npts);
+                ERROR("after %d of %d points: can't read number", 
+                      nread, npts);
                 return NULL;
             } else {
@@ -407 +405 @@
         // make sure that we read all of the expected points
         if (nread != npts) {
-            result.addError("inconsistent data: expected %d points"
-                            " but found %d points", npts, nread);
+            ERROR("inconsistent data: expected %d points"
+                  " but found %d points", npts, nread);
             return NULL;
         }

trunk/packages/vizservers/nanovis/dxReader.h

@@ -9 +9 @@
 #include <iostream>
 
-namespace Rappture {
-class Outcome;
-}
-
 namespace nv {
 
@@ -18 +14 @@
 
 extern Volume *
-load_dx_volume_stream(Rappture::Outcome& status, const char *tag, 
-                      std::iostream& fin);
+load_dx_volume_stream(const char *tag, std::iostream& fin);
 
 }

trunk/packages/vizservers/nanovis/nanovisServer.cpp

@@ -284 +284 @@
 #endif
 
+/**
+ * \brief Send a command with data payload
+ *
+ * data pointer is freed on completion of the response
+ */
 void
-nv::sendDataToClient(const char *command, const char *data, size_t dlen)
+nv::sendDataToClient(const char *command, char *data, size_t dlen)
 {
 #ifdef USE_THREADS
@@ -301 +306 @@
     iov[0].iov_len = strlen(command);
     // Data
-    iov[1].iov_base = const_cast<char *>(data);
+    iov[1].iov_base = data;
     iov[1].iov_len = dlen;
     if (writev(nv::g_fdOut, iov, numRecords) < 0) {
@@ -307 +312 @@
     }
     delete [] iov;
+    free(data);
 #endif
 }

trunk/packages/vizservers/nanovis/nanovisServer.h

@@ -55 +55 @@
     extern int writeToStatsFile(int f, const char *s, size_t length);
 #endif
-    extern void sendDataToClient(const char *command, const char *data,
+    extern void sendDataToClient(const char *command, char *data,
                                  size_t dlen);
 }

trunk/packages/vizservers/nanovis/protocol-nanovis.txt

@@ -110 +110 @@
           -transferfunction <name>
           -volume <bool>
-<flowObj> data file <fileName> <numComponents>
-          Load a data file.  fileName is path to file on server
 <flowObj> data follows <nbytes> <numComponents>
           Send flow data.  Data bytes follow the newline after the command