Changeset 4874 for nanovis/branches/1.1

Timestamp:

Dec 18, 2014, 5:45:38 PM (10 years ago)

Author:

ldelgass

Message:

Add command line options to set I/O file descriptors, merge some refactoring to
prep for merging threading support.

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (17 diffs)
• Command.h (modified) (3 diffs)
• Flow.cpp (modified) (1 diff)
• FlowCmd.cpp (modified) (8 diffs)
• FlowCmd.h (modified) (1 diff)
• Grid.cpp (modified) (1 diff)
• HeightMap.cpp (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• ReadBuffer.cpp (added)
• ReadBuffer.h (added)
• Trace.cpp (modified) (3 diffs)
• Trace.h (modified) (2 diffs)
• Unirect.cpp (modified) (1 diff)
• VolumeInterpolator.cpp (modified) (1 diff)
• config.h (modified) (1 diff)
• nanovis.cpp (modified) (32 diffs)
• nanovis.h (modified) (11 diffs)
• nanovisServer.cpp (added)
• nanovisServer.h (added)

nanovis/branches/1.1/Command.cpp

@@ -33 +33 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>                     /* Needed for getpid, gethostname,
@@ -44 +45 @@
 #include <vrmath/Vector3f.h>
 
+#include "nanovisServer.h"
 #include "nanovis.h"
+#include "ReadBuffer.h"
+#include "Command.h"
 #include "CmdProc.h"
 #include "FlowCmd.h"
@@ -58 +62 @@
 #include "Trace.h"
 
+using namespace nv;
 using namespace nv::graphics;
 using namespace vrmath;
@@ -100 +105 @@
 static int lastCmdStatus;
 
+ssize_t
+nv::SocketWrite(const void *bytes, size_t len)
+{
+    size_t ofs = 0;
+    ssize_t bytesWritten;
+    while ((bytesWritten = write(g_fdOut, (const char *)bytes + ofs, len - ofs)) > 0) {
+        ofs += bytesWritten;
+        if (ofs == len)
+            break;
+    }
+    if (bytesWritten < 0) {
+        ERROR("write: %s", strerror(errno));
+    }
+    return bytesWritten;
+}
+
 bool
-GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
+nv::SocketRead(char *bytes, size_t len)
+{
+    ReadBuffer::BufferStatus status;
+    status = g_inBufPtr->followingData((unsigned char *)bytes, len);
+    TRACE("followingData status: %d", status);
+    return (status == ReadBuffer::OK);
+}
+
+static int
+ExecuteCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
+{
+    int result;
+#ifdef WANT_TRACE
+    char *str = Tcl_DStringValue(dsPtr);
+    std::string cmd(str);
+    cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
+    TRACE("command %lu: '%s'", g_stats.nCommands+1, cmd.c_str());
+#endif
+
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr),
+                        Tcl_DStringLength(dsPtr),
+                        TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
+    Tcl_DStringSetLength(dsPtr, 0);
+
+    if (result != TCL_OK) {
+        TRACE("Error: %d", result);
+    }
+    return result;
+}
+
+int
+nv::GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
 {
     int value;
@@ -113 +165 @@
 
 int
-GetFloatFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, float *valuePtr)
+nv::GetFloatFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, float *valuePtr)
 {
     double value;
@@ -392 +444 @@
  */
 int
-GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr)
+nv::GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr)
 {
     return GetAxis(interp, Tcl_GetString(objPtr), indexPtr);
@@ -449 +501 @@
  */
 int
-GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes)
-{
+nv::GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes)
+{
+#ifdef USE_NEW_EVENT_LOOP
+    if (!SocketRead((char *)buf.bytes(), nBytes)) {
+        return TCL_ERROR;
+    }
+    buf.count(nBytes);
+#else
     char buffer[8096];
 
-    clearerr(NanoVis::stdin);
+    clearerr(g_fIn);
     while (nBytes > 0) {
         unsigned int chunk;
@@ -460 +518 @@
         chunk = (sizeof(buffer) < (unsigned int) nBytes) ?
             sizeof(buffer) : nBytes;
-        nRead = fread(buffer, sizeof(char), chunk, NanoVis::stdin);
-        if (ferror(NanoVis::stdin)) {
+        nRead = fread(buffer, sizeof(char), chunk, g_fIn);
+        if (ferror(g_fIn)) {
             Tcl_AppendResult(interp, "while reading data stream: ",
                              Tcl_PosixError(interp), (char*)NULL);
             return TCL_ERROR;
         }
-        if (feof(NanoVis::stdin)) {
+        if (feof(g_fIn)) {
             Tcl_AppendResult(interp, "premature EOF while reading data stream",
                              (char*)NULL);
@@ -474 +532 @@
         nBytes -= nRead;
     }
-    if (NanoVis::recfile != NULL) {
-        ssize_t nWritten;
-
-        nWritten = fwrite(buf.bytes(), sizeof(char), buf.size(), 
-                          NanoVis::recfile);
-        assert(nWritten == (ssize_t)buf.size());
-        fflush(NanoVis::recfile);
-    }
+#endif
     Rappture::Outcome err;
     TRACE("Checking header[%.13s]", buf.bytes());
@@ -785 +836 @@
     /* Use the initial client key value pairs as the parts for a generating
      * a unique file name. */
-    int f = NanoVis::getStatsFile(objv[1]);
+    int f = getStatsFile(objv[1]);
     if (f < 0) {
         Tcl_AppendResult(interp, "can't open stats file: ", 
@@ -806 +857 @@
         objPtr = Tcl_NewStringObj("pid", 3);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewLongObj((long)NanoVis::stats.pid));
+        Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewLongObj((long)g_stats.pid));
         /* host */
         objPtr = Tcl_NewStringObj("host", 4);
@@ -821 +872 @@
     /* date */
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
-    strcpy(buf, ctime(&NanoVis::stats.start.tv_sec));
+    strcpy(buf, ctime(&g_stats.start.tv_sec));
     buf[strlen(buf) - 1] = '\0';
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
@@ -828 +879 @@
                              Tcl_NewStringObj("date_secs", 9));
     Tcl_ListObjAppendElement(interp, listObjPtr, 
-                             Tcl_NewLongObj(NanoVis::stats.start.tv_sec));
+                             Tcl_NewLongObj(g_stats.start.tv_sec));
     /* Client arguments. */
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
@@ -841 +892 @@
     Tcl_DStringAppend(&ds, "\n", 1);
 #ifdef KEEPSTATS
-    result = NanoVis::writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                                       Tcl_DStringLength(&ds));
+    result = writeToStatsFile(f, Tcl_DStringValue(&ds), 
+                              Tcl_DStringLength(&ds));
 #else
     TRACE("clientinfo: %s", Tcl_DStringValue(&ds));
@@ -1299 +1350 @@
                     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");
+        if (SocketWrite(info, (size_t)cmdLength) != (ssize_t)cmdLength) {
             return TCL_ERROR;
         }
@@ -2135 +2184 @@
 }
 
-Tcl_Interp *
-initTcl()
-{
-    Tcl_Interp *interp = Tcl_CreateInterp();
+/**
+ * \brief Execute commands from client in Tcl interpreter
+ * 
+ * In this threaded model, the select call is for event compression.  We
+ * want to execute render server commands as long as they keep coming.  
+ * This lets us execute a stream of many commands but render once.  This 
+ * benefits camera movements, screen resizing, and opacity changes 
+ * (using a slider on the client).  The down side is you don't render
+ * until there's a lull in the command stream.  If the client needs an
+ * image, it can issue an "imgflush" command.  That breaks us out of the
+ * read loop.
+ */
+int
+nv::processCommands(Tcl_Interp *interp,
+                    ReadBuffer *inBufPtr, int fdOut)
+{
+    int ret = 1;
+    int status = TCL_OK;
+
+    Tcl_DString command;
+    Tcl_DStringInit(&command);
+    fd_set readFds;
+    struct timeval tv, *tvPtr;
+
+    FD_ZERO(&readFds);
+    FD_SET(inBufPtr->file(), &readFds);
+    tvPtr = NULL;                       /* Wait for the first read. This is so
+                                         * that we don't spin when no data is
+                                         * available. */
+    while (inBufPtr->isLineAvailable() || 
+           (select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr) > 0)) {
+        size_t numBytes;
+        unsigned char *buffer;
+
+        /* A short read is treated as an error here because we assume that we
+         * will always get commands line by line. */
+        if (inBufPtr->getLine(&numBytes, &buffer) != ReadBuffer::OK) {
+            /* Terminate the server if we can't communicate with the client
+             * anymore. */
+            if (inBufPtr->status() == ReadBuffer::ENDFILE) {
+                TRACE("Exiting server on EOF from client");
+                return -1;
+            } else {
+                ERROR("Exiting server, failed to read from client: %s",
+                      strerror(errno));
+                return -1;
+            }
+        }
+        Tcl_DStringAppend(&command, (char *)buffer, numBytes);
+        if (Tcl_CommandComplete(Tcl_DStringValue(&command))) {
+            struct timeval start, finish;
+            gettimeofday(&start, NULL);
+            status = ExecuteCommand(interp, &command);
+            gettimeofday(&finish, NULL);
+            g_stats.cmdTime += (MSECS_ELAPSED(start, finish) / 1.0e+3);
+            g_stats.nCommands++;
+            if (status == TCL_BREAK) {
+                return 1;               /* This was caused by a "imgflush"
+                                         * command. Break out of the read loop
+                                         * and allow a new image to be
+                                         * rendered. */
+            } else { //if (status != TCL_OK) {
+                ret = 0;
+                if (handleError(interp, status, fdOut) < 0) {
+                    return -1;
+                }
+            }
+        }
+
+        tv.tv_sec = tv.tv_usec = 0L;    /* On successive reads, we break out
+                                         * if no data is available. */
+        FD_SET(inBufPtr->file(), &readFds);
+        tvPtr = &tv;
+    }
+
+    return ret;
+}
+
+/**
+ * \brief Send error message to client socket
+ */
+int
+nv::handleError(Tcl_Interp *interp, int status, int fdOut)
+{
+    const char *string;
+    int nBytes;
+
+    if (status != TCL_OK) {
+        string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+        nBytes = strlen(string);
+        if (nBytes > 0) {
+            TRACE("status=%d errorInfo=(%s)", status, string);
+
+            std::ostringstream oss;
+            oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+            std::string ostr = oss.str();
+            nBytes = ostr.length();
+
+            if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+                ERROR("write failed: %s", strerror(errno));
+                return -1;
+            }
+        }
+    }
+
+    std::string msg = getUserMessages();
+    nBytes = msg.length();
+    if (nBytes > 0) {
+        string = msg.c_str();
+        TRACE("userError=(%s)", string);
+
+        std::ostringstream oss;
+        oss << "nv>viserror -type error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+        std::string ostr = oss.str();
+        nBytes = ostr.length();
+
+        if (write(fdOut, ostr.c_str(), nBytes) < 0) {
+            ERROR("write failed: %s", strerror(errno));
+            return -1;
+        }
+        clearUserMessages();
+    }
+
+    return 0;
+}
+
+void
+nv::initTcl(Tcl_Interp *interp, ClientData clientData)
+{
     Tcl_MakeSafe(interp);
 
-    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        NULL, NULL);
-    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  NULL, NULL);
-    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    NULL, NULL);
-    if (FlowCmdInitProc(interp) != TCL_OK) {
-        return NULL;
-    }
-    Tcl_CreateObjCommand(interp, "grid",        GridCmd,        NULL, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  NULL, NULL);
-    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "up",          UpCmd,          NULL, NULL);
-    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      NULL, NULL);
+    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    clientData, NULL);
+    FlowCmdInitProc(interp, clientData);
+    Tcl_CreateObjCommand(interp, "grid",        GridCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "up",          UpCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
 
     // create a default transfer function
@@ -2163 +2335 @@
              Tcl_GetStringResult(interp));
     }
-    return interp;
-}
+}

nanovis/branches/1.1/Command.h

@@ -12 +12 @@
 #define COMMAND_H
 
+#include <unistd.h>
+
 #include <tcl.h>
 
@@ -18 +20 @@
 }
 class Volume;
+
+namespace nv {
+
+class ReadBuffer;
+
+extern ssize_t SocketWrite(const void *bytes, size_t len);
+
+extern bool SocketRead(char *bytes, size_t len);
+
+extern int processCommands(Tcl_Interp *interp,
+                           ReadBuffer *inBufPtr,
+                           int fdOut);
+
+extern int handleError(Tcl_Interp *interp,
+                       int status,
+                       int fdOut);
+
+extern void initTcl(Tcl_Interp *interp, ClientData clientData);
 
 extern int GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -30 +50 @@
                            float *floatVal);
 
-extern int GetVolumeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                            Volume **volume);
-
-extern Tcl_Interp *initTcl();
+}
 
 #endif

nanovis/branches/1.1/Flow.cpp

@@ -29 +29 @@
 #include "TransferFunction.h"
 
+using namespace nv;
 using namespace vrmath;
 

nanovis/branches/1.1/FlowCmd.cpp

@@ -25 +25 @@
 #include "nvconf.h"
 
+#include "nanovisServer.h"
 #include "nanovis.h"
 #include "CmdProc.h"
@@ -41 +42 @@
 #include "Trace.h"
 
+using namespace nv;
 using namespace vrmath;
 
@@ -296 +298 @@
             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");
+        if (SocketWrite(info, (size_t)length) < 0) {
             return TCL_ERROR;
         }
@@ -835 +835 @@
  */
 int
-FlowInstObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
+nv::FlowInstObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -858 +858 @@
  */
 void
-FlowInstDeleteProc(ClientData clientData)
+nv::FlowInstDeleteProc(ClientData clientData)
 {
     Flow *flow = (Flow *)clientData;
@@ -1122 +1122 @@
 {
     struct pollfd pollResults;
-    pollResults.fd = fileno(NanoVis::stdin);
+    pollResults.fd = g_fdIn;
     pollResults.events = POLLIN;
 #define PENDING_TIMEOUT          10  /* milliseconds. */
@@ -1232 +1232 @@
     sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
             token, (unsigned long)data.size());
-    NanoVis::sendDataToClient(cmd, data.bytes(), data.size());
+    nv::sendDataToClient(cmd, data.bytes(), data.size());
     return TCL_OK;
 }
@@ -1345 +1345 @@
  *    associative array.
  */
-int
-FlowCmdInitProc(Tcl_Interp *interp)
-{
-    Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, NULL, NULL);
-    return TCL_OK;
-}
+void
+nv::FlowCmdInitProc(Tcl_Interp *interp, ClientData clientData)
+{
+    Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, clientData, NULL);
+}

nanovis/branches/1.1/FlowCmd.h

@@ -27 +27 @@
 #include <tcl.h>
 
-extern Tcl_AppInitProc FlowCmdInitProc;
+namespace nv {
+
+extern void FlowCmdInitProc(Tcl_Interp *interp, ClientData clientData);
+
 extern Tcl_ObjCmdProc FlowInstObjCmd;
 extern Tcl_CmdDeleteProc FlowInstDeleteProc;
 
+}
+
 #endif

nanovis/branches/1.1/Grid.cpp

@@ -36 +36 @@
 void Grid::render()
 {
+    if (!isVisible())
+        return;
+
     glPushAttrib(GL_ENABLE_BIT);
 

nanovis/branches/1.1/HeightMap.cpp

@@ -57 +57 @@
 HeightMap::render(RenderContext *renderContext)
 {
+    if (!isVisible())
+        return;
+
     glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT | GL_LIGHTING_BIT);
 

nanovis/branches/1.1/Makefile.in

@@ -130 +130 @@
                 Plane.o \
                 PlaneRenderer.o \
+                ReadBuffer.o \
                 ReaderCommon.o \
                 RenderVertexArray.o \
@@ -147 +148 @@
                 dxReader.o \
                 md5.o \
-                nanovis.o
+                nanovis.o \
+                nanovisServer.o
 
 resources       = \
@@ -271 +273 @@
 Chain.o: Chain.cpp Chain.h
 CmdProc.o: CmdProc.cpp CmdProc.h
-Command.o: Command.cpp nanovis.h config.h FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h PointSet.h dxReader.h Grid.h HeightMap.h NvCamera.h NvZincBlendeReconstructor.h Unirect.h Volume.h VolumeRenderer.h
+Command.o: Command.cpp nanovis.h nanovisServer.h ReadBuffer.h config.h define.h FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h dxReader.h Grid.h HeightMap.h NvCamera.h NvZincBlendeReconstructor.h Unirect.h Volume.h VolumeRenderer.h
 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
-Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h
+Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h NvLIC.h VelocityArrowsSlice.h Switch.h Unirect.h Volume.h TransferFunction.h Trace.h
 FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
-FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
+FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h Switch.h Trace.h TransferFunction.h nanovis.h nanovisServer.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 FlowParticles.o: FlowParticles.cpp FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
 GradientFilter.o: GradientFilter.cpp GradientFilter.h
@@ -302 +304 @@
 PointSetRenderer.o: PointSetRenderer.cpp PointSetRenderer.h
 PointShader.o: PointShader.cpp PointShader.h
+ReadBuffer.o: ReadBuffer.cpp ReadBuffer.h Trace.h
 ReaderCommon.o: ReaderCommon.cpp ReaderCommon.h GradientFilter.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
@@ -318 +321 @@
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h
 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
-nanovis.o: nanovis.cpp nanovis.h config.h define.h Command.h Flow.h Grid.h HeightMap.h NvCamera.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
 md5.o: md5.h
+nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h NvCamera.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
+nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h NvShader.h Trace.h

nanovis/branches/1.1/Trace.cpp

@@ -10 +10 @@
 #include <string.h>
 
+#include <string>
+#include <sstream>
+
 #include <GL/glew.h>
 
@@ -15 +18 @@
 #include "Trace.h"
 
+using namespace nv;
+
+static std::ostringstream g_UserErrorString;
+
 #define MSG_LEN 2047
 
+/**
+ * \brief Open syslog for writing
+ */
+void
+nv::initLog()
+{
+    openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER);
+}
+
+/**
+ * \brief Close syslog
+ */
+void
+nv::closeLog()
+{
+    closelog();
+}
+
+/**
+ * \brief Write a message to syslog
+ */
 void 
-LogMessage(int priority, const char *funcname,
-           const char *path, int lineNum, const char* fmt, ...)
+nv::LogMessage(int priority, const char *funcname,
+               const char *path, int lineNum, const char* fmt, ...)
 {
     char message[MSG_LEN+1];
@@ -42 +70 @@
 
     syslog(priority, "%s", message);
+}
+
+/**
+ * \brief Write a user message to buffer
+ */
+void 
+nv::logUserMessage(const char* fmt, ...)
+{
+    char message[MSG_LEN + 1];
+    int length = 0;
+    va_list lst;
+
+    va_start(lst, fmt);
+
+    length += vsnprintf(message, MSG_LEN, fmt, lst);
+    message[MSG_LEN] = '\0';
+
+    g_UserErrorString << message << "\n";
+}
+
+std::string
+nv::getUserMessages()
+{
+    return g_UserErrorString.str();
+}
+
+void 
+nv::clearUserMessages()
+{
+    g_UserErrorString.str(std::string());
 }
 

nanovis/branches/1.1/Trace.h

@@ -9 +9 @@
 #define __TRACE_H__
 
+#include <string>
+
 #include <GL/glew.h>
 #include <syslog.h>
@@ -18 +20 @@
 #define AT __FILE__ ":" NEWSTRING(__LINE__)
 
+namespace nv {
+
+extern void logUserMessage(const char* format, ...);
+
+extern std::string getUserMessages();
+
+extern void clearUserMessages();
+
+extern void initLog();
+
+extern void closeLog();
+
 extern void LogMessage(int priority, const char *funcname, const char *fileName,
                        int lineNum, const char* format, ...);
 
-#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      nv::LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      nv::LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
 #endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define WARN(...)       nv::LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       nv::LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+
+#define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__);
+
+}
 
 extern bool CheckFBO(GLenum *status);
 extern void PrintFBOStatus(GLenum status, const char *prefix);
 extern bool CheckGL(const char *prefix);
+
 #endif

nanovis/branches/1.1/Unirect.cpp

@@ -15 +15 @@
 #include "Unirect.h"
 #include "Trace.h"
+
+using namespace nv;
 
 static inline char *

nanovis/branches/1.1/VolumeInterpolator.cpp

@@ -6 +6 @@
 #include <string.h>
 #include <memory.h>
-#include <time.h>
 #include <sys/time.h>
 #include <math.h>

nanovis/branches/1.1/config.h

@@ -42 +42 @@
 #define KEEPSTATS
 
+//#define USE_NEW_EVENT_LOOP
+
 /*
  * Controls whether DX data is downsampled.

nanovis/branches/1.1/nanovis.cpp

@@ -16 +16 @@
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <memory.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/times.h>
 #include <sys/types.h>
-#include <sys/uio.h> // for readv/writev
-#include <time.h>
+#include <sys/uio.h> // for writev in ppmWrite
 #include <unistd.h>
 
+#include <cassert>
 #include <cstdlib>
 #include <cstdio>
@@ -36 +27 @@
 #include <cmath>
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
 #include <string>
 
@@ -44 +32 @@
 #include <GL/glut.h>
 
-#include <RpEncode.h>
-
 #include <graphics/RenderContext.h>
 #include <vrmath/Vector3f.h>
@@ -57 +43 @@
 #include "config.h"
 #include "nanovis.h"
+#include "nanovisServer.h"
 #include "define.h"
 
@@ -66 +53 @@
 #include "NvShader.h"
 #include "NvLIC.h"
-#include "NvZincBlendeReconstructor.h"
 #include "PlaneRenderer.h"
 #include "Switch.h"
 #include "Trace.h"
+#include "TransferFunction.h"
 #include "Unirect.h"
 #include "VelocityArrowsSlice.h"
 #include "VolumeInterpolator.h"
 #include "VolumeRenderer.h"
-#include "ZincBlendeVolume.h"
-
+
+using namespace nv;
 using namespace nv::graphics;
 using namespace nv::util;
@@ -89 +76 @@
 // STATIC MEMBER DATA
 
-FILE *NanoVis::stdin = NULL;
-FILE *NanoVis::logfile = NULL;
-FILE *NanoVis::recfile = NULL;
-
-NanoVis::Stats NanoVis::stats;
-int NanoVis::statsFile = -1;
+Tcl_Interp *NanoVis::interp = NULL;
 
 unsigned int NanoVis::flags = 0;
@@ -105 +87 @@
 unsigned char *NanoVis::screenBuffer = NULL;
 Texture2D *NanoVis::legendTexture = NULL;
-Grid *NanoVis::grid = NULL;
 Fonts *NanoVis::fonts;
 int NanoVis::updir = Y_POS;
@@ -132 +113 @@
 NvLIC *NanoVis::licRenderer = NULL;
 PlaneRenderer *NanoVis::planeRenderer = NULL;
-
-Tcl_Interp *NanoVis::interp;
+Grid *NanoVis::grid = NULL;
 
 // Image based flow visualization slice location
@@ -210 +190 @@
         flags |= REDRAW_PENDING;
     }
-}
-
-#ifdef KEEPSTATS
-
-#ifndef STATSDIR
-#define STATSDIR        "/var/tmp/visservers"
-#endif  /*STATSDIR*/
-
-int
-NanoVis::getStatsFile(Tcl_Obj *objPtr)
-{
-    Tcl_DString ds;
-    char fileName[33];
-    char pidstr[200];
-    const char *path;
-    md5_state_t state;
-    md5_byte_t digest[16];
-    char *string;
-    int length;
-
-    if ((objPtr == NULL) || (statsFile >= 0)) {
-        return statsFile;
-    }
-    /* By itself the client's key/value pairs aren't unique.  Add in the
-     * process id of this render server. */
-    sprintf(pidstr, "%ld", (long)stats.pid);
-
-    /* Create an md5 hash of the key/value pairs and use it as the file name. */
-    string = Tcl_GetStringFromObj(objPtr, &length);
-    md5_init(&state);
-    md5_append(&state, (const md5_byte_t *)string, strlen(string));
-    md5_append(&state, (const md5_byte_t *)pidstr, strlen(pidstr));
-    md5_finish(&state, digest);
-    for (int i = 0; i < 16; i++) {
-        sprintf(fileName + i * 2, "%02x", digest[i]);
-    }
-    Tcl_DStringInit(&ds);
-    Tcl_DStringAppend(&ds, STATSDIR, -1);
-    Tcl_DStringAppend(&ds, "/", 1);
-    Tcl_DStringAppend(&ds, fileName, 32);
-    path = Tcl_DStringValue(&ds);
-
-    statsFile = open(path, O_EXCL | O_CREAT | O_WRONLY, 0600);
-    Tcl_DStringFree(&ds);
-    if (statsFile < 0) {
-        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
-        return -1;
-    }
-    return statsFile;
-}
-
-int
-NanoVis::writeToStatsFile(int f, const char *s, size_t length)
-{
-    if (f >= 0) {
-        ssize_t numWritten;
-
-        numWritten = write(f, s, length);
-        if (numWritten == (ssize_t)length) {
-            close(dup(f));
-        }
-    }
-    return 0;
-}
-
-static int
-serverStats(int code) 
-{
-    double start, finish;
-    char buf[BUFSIZ];
-    Tcl_DString ds;
-    int result;
-
-    {
-        struct timeval tv;
-
-        /* Get ending time.  */
-        gettimeofday(&tv, NULL);
-        finish = CVT2SECS(tv);
-        tv = NanoVis::stats.start;
-        start = CVT2SECS(tv);
-    }
-    /* 
-     * Session information:
-     *   - Name of render server
-     *   - Process ID
-     *   - Hostname where server is running
-     *   - Start date of session
-     *   - Start date of session in seconds
-     *   - Number of frames returned
-     *   - Number of bytes total returned (in frames)
-     *   - Number of commands received
-     *   - Total elapsed time of all commands
-     *   - Total elapsed time of session
-     *   - Exit code of vizserver
-     *   - User time 
-     *   - System time
-     *   - User time of children 
-     *   - System time of children
-     */ 
-
-    Tcl_DStringInit(&ds);
-    
-    Tcl_DStringAppendElement(&ds, "render_stop");
-    /* renderer */
-    Tcl_DStringAppendElement(&ds, "renderer");
-    Tcl_DStringAppendElement(&ds, "nanovis");
-    /* pid */
-    Tcl_DStringAppendElement(&ds, "pid");
-    sprintf(buf, "%d", NanoVis::stats.pid);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* host */
-    Tcl_DStringAppendElement(&ds, "host");
-    gethostname(buf, BUFSIZ-1);
-    buf[BUFSIZ-1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date */
-    Tcl_DStringAppendElement(&ds, "date");
-    strcpy(buf, ctime(&NanoVis::stats.start.tv_sec));
-    buf[strlen(buf) - 1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date_secs */
-    Tcl_DStringAppendElement(&ds, "date_secs");
-    sprintf(buf, "%ld", NanoVis::stats.start.tv_sec);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_frames */
-    Tcl_DStringAppendElement(&ds, "num_frames");
-    sprintf(buf, "%lu", (unsigned long)NanoVis::stats.nFrames);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* frame_bytes */
-    Tcl_DStringAppendElement(&ds, "frame_bytes");
-    sprintf(buf, "%lu", (unsigned long)NanoVis::stats.nBytes);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_commands */
-    Tcl_DStringAppendElement(&ds, "num_commands");
-    sprintf(buf, "%lu", (unsigned long)NanoVis::stats.nCommands);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* cmd_time */
-    Tcl_DStringAppendElement(&ds, "cmd_time");
-    sprintf(buf, "%g", NanoVis::stats.cmdTime);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* session_time */
-    Tcl_DStringAppendElement(&ds, "session_time");
-    sprintf(buf, "%g", finish - start);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* status */
-    Tcl_DStringAppendElement(&ds, "status");
-    sprintf(buf, "%d", code);
-    Tcl_DStringAppendElement(&ds, buf);
-    {
-        long clocksPerSec = sysconf(_SC_CLK_TCK);
-        double clockRes = 1.0 / clocksPerSec;
-        struct tms tms;
-
-        memset(&tms, 0, sizeof(tms));
-        times(&tms);
-        /* utime */
-        Tcl_DStringAppendElement(&ds, "utime");
-        sprintf(buf, "%g", tms.tms_utime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* stime */
-        Tcl_DStringAppendElement(&ds, "stime");
-        sprintf(buf, "%g", tms.tms_stime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cutime */
-        Tcl_DStringAppendElement(&ds, "cutime");
-        sprintf(buf, "%g", tms.tms_cutime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cstime */
-        Tcl_DStringAppendElement(&ds, "cstime");
-        sprintf(buf, "%g", tms.tms_cstime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-    }
-    Tcl_DStringAppend(&ds, "\n", -1);
-    int f = NanoVis::getStatsFile(NULL);
-    result = NanoVis::writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                                       Tcl_DStringLength(&ds));
-    close(f);
-    Tcl_DStringFree(&ds);
-    return result;
-}
-
-#endif
-
-static void
-initService()
-{
-    TRACE("Enter");
-
-    const char* user = getenv("USER");
-    char* logName = NULL;
-    int logNameLen = 0;
-
-    if (user == NULL) {
-        logNameLen = 20+1;
-        logName = (char *)calloc(logNameLen, sizeof(char));
-        strncpy(logName, "/tmp/nanovis_log.txt", logNameLen);
-    } else {
-        logNameLen = 17+1+strlen(user);
-        logName = (char *)calloc(logNameLen, sizeof(char));
-        strncpy(logName, "/tmp/nanovis_log_", logNameLen);
-        strncat(logName, user, strlen(user));
-    }
-
-    //open log and map stderr to log file
-    NanoVis::logfile = fopen(logName, "w");
-    dup2(fileno(NanoVis::logfile), 2);
-    /* dup2(2,1); */
-
-    // clean up malloc'd memory
-    if (logName != NULL) {
-        free(logName);
-    }
-
-    TRACE("Leave");
-}
-
-static void
-exitService(int code)
-{
-    TRACE("Enter: %d", code);
-
-    NanoVis::removeAllData();
-
-    NvShader::exitCg();
-
-    //close log file
-    if (NanoVis::logfile != NULL) {
-        fclose(NanoVis::logfile);
-        NanoVis::logfile = NULL;
-    }
-
-#ifdef KEEPSTATS
-    serverStats(code);
-#endif
-    closelog();
-
-    exit(code);
-}
-
-static int
-executeCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
-{
-    struct timeval tv;
-    double start, finish;
-    int result;
-
-#ifdef WANT_TRACE
-    char *str = Tcl_DStringValue(dsPtr);
-    std::string cmd(str);
-    cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
-    TRACE("command %lu: '%s'", NanoVis::stats.nCommands+1, cmd.c_str());
-#endif
-
-    gettimeofday(&tv, NULL);
-    start = CVT2SECS(tv);
-
-    if (NanoVis::recfile != NULL) {
-        fprintf(NanoVis::recfile, "%s", Tcl_DStringValue(dsPtr));
-        fflush(NanoVis::recfile);
-    }
-    result = Tcl_Eval(interp, Tcl_DStringValue(dsPtr));
-    Tcl_DStringSetLength(dsPtr, 0);
-
-    gettimeofday(&tv, NULL);
-    finish = CVT2SECS(tv);
-
-    NanoVis::stats.cmdTime += finish - start;
-    NanoVis::stats.nCommands++;
-    TRACE("Leave status=%d", result);
-    return result;
 }
 
@@ -615 +324 @@
     planeRenderer->render();
 
-    // INSOO
+    //glPixelStorei(GL_PACK_ALIGNMENT, 1);
     glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, screenBuffer);
-    //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screenBuffer); // INSOO's
-
     {
         char prefix[200];
-        ssize_t nWritten;
 
         TRACE("Sending ppm legend image %s min:%g max:%g", volArg, min, max);
         sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
         ppmWrite(prefix);
-        nWritten = write(1, "\n", 1);
-        assert(nWritten == 1);
     }
     planeRenderer->removePlane(index);
@@ -639 +343 @@
 
 //initialize frame buffer objects for offscreen rendering
-void
+bool
 NanoVis::initOffscreenBuffer()
 {
@@ -678 +382 @@
     if (!CheckFBO(&status)) {
         PrintFBOStatus(status, "finalFbo");
-        exitService(3);
+        return false;
     }
 
     TRACE("Leave");
+    return true;
 }
 
 //resize the offscreen buffer 
-void 
+bool
 NanoVis::resizeOffscreenBuffer(int w, int h)
 {
     TRACE("Enter (%d, %d)", w, h);
     if ((w == winWidth) && (h == winHeight)) {
-        return;
+        return true;
     }
     winWidth = w;
@@ -751 +456 @@
     if (!CheckFBO(&status)) {
         PrintFBOStatus(status, "finalFbo");
-        exitService(3);
+        return false;
     }
 
@@ -760 +465 @@
 
     TRACE("Leave (%d, %d)", w, h);
+    return true;
 }
 
@@ -767 +473 @@
     if (!NvShader::printErrorInfo()) {
         TRACE("Cg error, exiting...");
-        exitService(-1);
-    }
-}
-
-void NanoVis::init(const char* path)
+        exit(1);
+    }
+}
+
+bool NanoVis::init(const char* path)
 {
     // print OpenGL driver information
@@ -782 +488 @@
     if (path == NULL) {
         ERROR("No path defined for shaders or resources");
-        exitService(1);
+        return false;
     }
     GLenum err = glewInit();
     if (GLEW_OK != err) {
         ERROR("Can't init GLEW: %s", glewGetErrorString(err));
-        exitService(1);
+        return false;
     }
     TRACE("Using GLEW %s", glewGetString(GLEW_VERSION));
@@ -795 +501 @@
     if (!GLEW_VERSION_2_1) {
         ERROR("OpenGL version 2.1 or greater is required");
-        exitService(1);
+        return false;
     }
 
@@ -802 +508 @@
     if (!GLEW_ARB_pixel_buffer_object) {
         ERROR("Pixel buffer objects are not supported by driver, please check that the user running nanovis has permissions to create a direct rendering context (e.g. user has read/write access to /dev/nvidia* device nodes in Linux).");
-        exitService(1);
+        return false;
     }
 
@@ -810 +516 @@
     if (!GLEW_EXT_framebuffer_object) {
         ERROR("EXT_framebuffer_oject extension is required");
-        exitService(1);
+        return false;
     }
     // Rectangle textures were promoted in 3.1
@@ -816 +522 @@
     if (!GLEW_ARB_texture_rectangle) {
         ERROR("ARB_texture_rectangle extension is required");
-        exitService(1);
+        return false;
     }
 #ifdef HAVE_FLOAT_TEXTURES
@@ -823 +529 @@
         !GLEW_ARB_color_buffer_float) {
         ERROR("ARB_texture_float and ARB_color_buffer_float extensions are required");
-        exitService(1);
+        return false;
     }
 #endif
@@ -830 +536 @@
         !GLEW_NV_fragment_program2) {
         ERROR("NV_vertex_program3 and NV_fragment_program2 extensions are required");
-        exitService(1);
+        return false;
     }
 
     if (!FilePath::getInstance()->setPath(path)) {
         ERROR("can't set file path to %s", path);
-        exitService(1);
+        return false;
     }
 
@@ -852 +558 @@
     grid = new Grid();
     grid->setFont(fonts);
-}
-
-void
+
+    return true;
+}
+
+bool
 NanoVis::initGL()
 {
@@ -889 +597 @@
     glLightfv(GL_LIGHT1, GL_SPECULAR, white_light);
 
-    initOffscreenBuffer();    //frame buffer object for offscreen rendering
-
-    //create volume renderer
+    //frame buffer object for offscreen rendering
+    if (!initOffscreenBuffer()) {
+        return false;
+    }
+
     volRenderer = new VolumeRenderer();
 
-    // create
     renderContext = new RenderContext();
 
-    //create a 2D plane renderer
     planeRenderer = new PlaneRenderer(winWidth, winHeight);
 
@@ -903 +611 @@
 
     TRACE("leaving initGL");
+
+    return true;
 }
 
@@ -1035 +745 @@
     char string[200];
     sprintf(string, "%s %d\n", prefix, fsize);
-    nWritten = write(1, string, strlen(string));
+    nWritten = write(g_fdOut, string, strlen(string));
     assert(nWritten == (ssize_t)strlen(string));
     header[pos++] = 'B';
@@ -1088 +798 @@
     }
 
-    nWritten = write(1, header, SIZEOF_BMP_HEADER);
+    nWritten = write(g_fdOut, header, SIZEOF_BMP_HEADER);
     assert(nWritten == SIZEOF_BMP_HEADER);
-    nWritten = write(1, screenBuffer, (3*winWidth+pad)*winHeight);
+    nWritten = write(g_fdOut, screenBuffer, (3*winWidth+pad)*winHeight);
     assert(nWritten == (3*winWidth+pad)*winHeight);
-    stats.nFrames++;
-    stats.nBytes += (3*winWidth+pad)*winHeight;
+    g_stats.nFrames++;
+    g_stats.nFrameBytes += (3*winWidth+pad)*winHeight;
 }
 
@@ -1154 +864 @@
         srcRowPtr += bytesPerRow;
     }
-    if (writev(1, iov, nRecs) < 0) {
+    if (writev(g_fdOut, iov, nRecs) < 0) {
         ERROR("write failed: %s", strerror(errno));
     }
     free(iov);
-    stats.nFrames++;
-    stats.nBytes += (bytesPerRow * winHeight);
+    g_stats.nFrames++;
+    g_stats.nFrameBytes += (bytesPerRow * winHeight);
     TRACE("Leave (%dx%d)", winWidth, winHeight);
-}
-
-void
-NanoVis::sendDataToClient(const char *command, const char *data, size_t dlen)
-{
-    size_t numRecords = 2;
-
-    struct iovec *iov = new iovec[numRecords];
-
-    // Write the nanovisviewer command, then the image header and data.
-    // Command
-    // FIXME: shouldn't have to cast this
-    iov[0].iov_base = (char *)command;
-    iov[0].iov_len = strlen(command);
-    // Data
-    // FIXME: shouldn't have to cast this
-    iov[1].iov_base = (char *)data;
-    iov[1].iov_len = dlen;
-    if (writev(1, iov, numRecords) < 0) {
-        ERROR("write failed: %s", strerror(errno));
-    }
-    delete [] iov;
-}
-
-void
-NanoVis::idle()
-{
-    TRACE("Enter");
-
-    glutSetWindow(renderWindow);
-
-    processCommands();
-
-    TRACE("Leave");
 }
 
@@ -1539 +1215 @@
     TRACE("Setting bgcolor to %g %g %g", color[0], color[1], color[2]);
     glClearColor(color[0], color[1], color[2], 1);
+}
+
+void 
+NanoVis::removeVolume(Volume *volume)
+{
+    VolumeHashmap::iterator itr = volumeTable.find(volume->name());
+    if (itr != volumeTable.end()) {
+        volumeTable.erase(itr);
+    }
+    delete volume;
 }
 
@@ -1794 +1480 @@
         draw3dAxis();
     }
-    if (grid->isVisible()) {
-        grid->render();
-    }
+    grid->render();
     if ((licRenderer != NULL) && (licRenderer->active())) {
         licRenderer->render();
@@ -1803 +1487 @@
         velocityArrowsSlice->render();
     }
-    if (!flowTable.empty()) {
-        renderFlows();
-    }
+    renderFlows();
 
     volRenderer->renderAll();
 
-    TRACE("Render heightmaps");
     HeightMapHashmap::iterator itr;
     for (itr = heightMapTable.begin();
@@ -1824 +1505 @@
 }
 
-void 
-NanoVis::processCommands()
-{
-    flags &= ~REDRAW_PENDING;
-
-    TRACE("Enter");
-
-    int flags = fcntl(0, F_GETFL, 0);
-    fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-
-    int status = TCL_OK;
-
-    //  Read and execute as many commands as we can from stdin...
-    Tcl_DString cmdbuffer;
-    Tcl_DStringInit(&cmdbuffer);
-    int nCommands = 0;
-    bool isComplete = false;
-    while ((!feof(NanoVis::stdin)) && (status == TCL_OK)) {
-        //
-        //  Read the next command from the buffer.  First time through we
-        //  block here and wait if necessary until a command comes in.
-        //
-        //  BE CAREFUL: Read only one command, up to a newline.  The "volume
-        //  data follows" command needs to be able to read the data
-        //  immediately following the command, and we shouldn't consume it
-        //  here.
-        //
-        while (!feof(NanoVis::stdin)) {
-            int c = fgetc(NanoVis::stdin);
-            char ch;
-            if (c <= 0) {
-                if (errno == EWOULDBLOCK) {
-                    break;
-                }
-                exitService(100);
-            }
-            ch = (char)c;
-            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
-            if (ch == '\n') {
-                isComplete = Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer));
-                if (isComplete) {
-                    break;
-                }
-            }
-        }
-        // no command? then we're done for now
-        if (Tcl_DStringLength(&cmdbuffer) == 0) {
-            break;
-        }
-        if (isComplete) {
-            // back to original flags during command evaluation...
-            fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-            status = executeCommand(interp, &cmdbuffer);
-            // non-blocking for next read -- we might not get anything
-            fcntl(0, F_SETFL, flags | O_NONBLOCK);
-            isComplete = false;
-            nCommands++;
-            CHECK_FRAMEBUFFER_STATUS();
-        }
-    }
-    fcntl(0, F_SETFL, flags);
-
-    if (status != TCL_OK) {
-        char *msg;
-        char hdr[200];
-        int msgSize, hdrSize;
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_GetObjResult(interp);
-        msg = Tcl_GetStringFromObj(objPtr, &msgSize);
-        hdrSize = sprintf(hdr, "nv>viserror -type internal_error -bytes %d\n", msgSize);
-        {
-            struct iovec iov[2];
-
-            iov[0].iov_base = hdr;
-            iov[0].iov_len = hdrSize;
-            iov[1].iov_base = msg;
-            iov[1].iov_len = msgSize;
-            if (writev(1, iov, 2) < 0) {
-                ERROR("write failed: %s", strerror(errno));
-            }
-        }
-        TRACE("Leaving on ERROR");
-        return;
-    }
-    if (feof(NanoVis::stdin)) {
-        TRACE("Exiting server on EOF from client");
-        exitService(90);
-    }
-
-    update();
-
-    bindOffscreenBuffer();  //enable offscreen render
-    render();
-    readScreen();
-
-    if (feof(NanoVis::stdin)) {
-        exitService(90);
-    }
-
-    ppmWrite("nv>image -type image -bytes");
-
-    TRACE("Leave");
-}
-
-int 
-main(int argc, char **argv)
-{
-    const char *path;
-    char *newPath;
-
-    newPath = NULL;
-    path = NULL;
-    NanoVis::stdin = stdin;
-
-    fprintf(stdout, "NanoVis %s (build %s)\n", NANOVIS_VERSION, SVN_VERSION);
-    fflush(stdout);
-
-    openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
-    memset(&NanoVis::stats, 0, sizeof(NanoVis::Stats));
-    NanoVis::stats.pid = getpid(); 
-    gettimeofday(&NanoVis::stats.start, NULL);
-
-    /* Initialize GLUT here so it can parse and remove GLUT-specific 
-     * command-line options before we parse the command-line below. */
-    glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
-    glutInitWindowSize(NanoVis::winWidth, NanoVis::winHeight);
-    glutInitWindowPosition(10, 10);
-    NanoVis::renderWindow = glutCreateWindow("nanovis");
-    glutIdleFunc(NanoVis::idle);
-
-    glutDisplayFunc(NanoVis::render);
-    glutReshapeFunc(NanoVis::resizeOffscreenBuffer);
-
-    while (1) {
-        static struct option long_options[] = {
-            {"infile",  required_argument, NULL, 0},
-            {"path",    required_argument, NULL, 2},
-            {"debug",   no_argument,       NULL, 3},
-            {"record",  required_argument, NULL, 4},
-            {0, 0, 0, 0}
-        };
-        int option_index = 0;
-        int c;
-
-        c = getopt_long(argc, argv, ":dp:i:l:r:", long_options, &option_index);
-        if (c == -1) {
-            break;
-        }
-        switch (c) {
-        case '?':
-            fprintf(stderr, "unknown option -%c\n", optopt);
-            return 1;
-        case ':':
-            if (optopt < 4) {
-                fprintf(stderr, "argument missing for --%s option\n", 
-                        long_options[optopt].name);
-            } else {
-                fprintf(stderr, "argument missing for -%c option\n", optopt);
-            }
-            return 1;
-        case 2:
-        case 'p':
-            path = optarg;
-            break;
-        case 3:
-        case 'd':
-            NanoVis::debugFlag = true;
-            break;
-        case 0:
-        case 'i':
-            NanoVis::stdin = fopen(optarg, "r");
-            if (NanoVis::stdin == NULL) {
-                perror(optarg);
-                return 2;
-            }
-            break;
-        case 4:
-        case 'r':
-            Tcl_DString ds;
-            char buf[200];
-
-            Tcl_DStringInit(&ds);
-            Tcl_DStringAppend(&ds, optarg, -1);
-            sprintf(buf, ".%d", getpid());
-            Tcl_DStringAppend(&ds, buf, -1);
-            NanoVis::recfile = fopen(Tcl_DStringValue(&ds), "w");
-            if (NanoVis::recfile == NULL) {
-                perror(optarg);
-                return 2;
-            }
-            break;
-        default:
-            fprintf(stderr,"unknown option '%c'.\n", c);
-            return 1;
-        }
-    }     
-    if (path == NULL) {
-        char *p;
-
-        // See if we can derive the path from the location of the program.
-        // Assume program is in the form <path>/bin/nanovis.
-        path = argv[0];
-        p = strrchr((char *)path, '/');
-        if (p != NULL) {
-            *p = '\0';
-            p = strrchr((char *)path, '/');
-        }
-        if (p == NULL) {
-            TRACE("path not specified");
-            return 1;
-        }
-        *p = '\0';
-        newPath = new char[(strlen(path) + 15) * 2 + 1];
-        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
-        path = newPath;
-    }
-
-    FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
-
-#ifdef notdef
-    signal(SIGPIPE, SIG_IGN);
-#endif
-    initService();
-
-    NanoVis::init(path);
-    if (newPath != NULL) {
-        delete [] newPath;
-    }
-    NanoVis::initGL();
-
-    NanoVis::interp = initTcl();
-
-    NanoVis::resizeOffscreenBuffer(NanoVis::winWidth, NanoVis::winHeight);
-
-    glutMainLoop();
-
-    exitService(80);
-}
-
-void 
-NanoVis::removeVolume(Volume *volume)
-{
-    VolumeHashmap::iterator itr = volumeTable.find(volume->name());
-    if (itr != volumeTable.end()) {
-        volumeTable.erase(itr);
-    }
-    delete volume;
-}

nanovis/branches/1.1/nanovis.h

@@ -14 +14 @@
  * ======================================================================
  */
-#ifndef NANOVIS_H
-#define NANOVIS_H
-
-#include <tcl.h>
-#include <md5.h>
-#include <GL/glew.h>
-#include <sys/types.h> // For pid_t
-#include <sys/time.h>  // For struct timeval
+#ifndef NV_NANOVIS_H
+#define NV_NANOVIS_H
 
 #include <math.h>
 #include <stddef.h> // For size_t
 #include <stdio.h>
+#include <sys/time.h>  // For struct timeval
+#include <sys/types.h> // For pid_t
+
+#include <tcl.h>
+
+#include <GL/glew.h>
 
 #include <vector>
@@ -34 +34 @@
 
 #include "config.h"
-
-#define NANOVIS_VERSION         "1.1.3"
 
 //defines for the image based flow visualization
@@ -50 +48 @@
 }
 
-class VolumeRenderer;
-class PointSetRenderer;
+class NvCamera;
+class Flow;
+class Grid;
+class HeightMap;
+class NvLIC;
 class NvParticleRenderer;
 class PlaneRenderer;
+class Texture2D;
+class TransferFunction;
 class VelocityArrowsSlice;
-class NvLIC;
-class PointSet;
-class Texture2D;
-class HeightMap;
-class Grid;
-class NvCamera;
-class TransferFunction;
 class Volume;
-class Flow;
+class VolumeRenderer;
 
 class NanoVis
@@ -82 +78 @@
     };
 
-    typedef struct {
-        pid_t pid;
-        size_t nFrames;            /**< # of frames sent to client. */
-        size_t nBytes;             /**< # of bytes for all frames. */
-        size_t nCommands;          /**< # of commands executed */
-        double cmdTime;            /**< Elasped time spend executing
-                                    * commands. */
-        struct timeval start;      /**< Start of elapsed time. */
-    } Stats;
-
     typedef std::string TransferFunctionId;
     typedef std::string VolumeId;
@@ -101 +87 @@
     typedef std::tr1::unordered_map<HeightMapId, HeightMap *> HeightMapHashmap;
 
-    static void processCommands();
-    static void init(const char *path);
-    static void initGL();
-    static void initOffscreenBuffer();
-    static void resizeOffscreenBuffer(int w, int h);
+    static bool init(const char *path);
+    static bool initGL();
+    static bool initOffscreenBuffer();
+    static bool resizeOffscreenBuffer(int w, int h);
     static void setBgColor(float color[3]);
     static void render();
     static void draw3dAxis();
-    static void idle();
     static void update();
     static void removeAllData();
@@ -123 +107 @@
     static void eventuallyRedraw(unsigned int flag = 0);
 
-    static void setVolumeRanges();
-    static void setHeightmapRanges();
-
-#ifdef KEEPSTATS
-    static int getStatsFile(Tcl_Obj *objPtr);
-    static int writeToStatsFile(int f, const char *s, size_t length);
-#endif
     static void ppmWrite(const char *prefix);
-    static void sendDataToClient(const char *command, const char *data,
-                                 size_t dlen);
     static void bmpWrite(const char *prefix);
     static void bmpWriteToFile(int frame_number, const char* directory_name);
@@ -151 +126 @@
     static void readScreen()
     {
+        //glPixelStorei(GL_PACK_ALIGNMENT, 1);
         glReadPixels(0, 0, winWidth, winHeight, GL_RGB, GL_UNSIGNED_BYTE, 
                      screenBuffer);
@@ -159 +135 @@
     }
 
+    static void setVolumeRanges();
+    static void setHeightmapRanges();
+
     static Flow *getFlow(const char *name);
     static Flow *createFlow(Tcl_Interp *interp, const char *name);
+    static void deleteFlows(Tcl_Interp *interp);
     static void deleteFlow(const char *name);
-    static void deleteFlows(Tcl_Interp *interp);
     static bool mapFlows();
     static void getFlowBounds(vrmath::Vector3f& min,
@@ -172 +151 @@
     static void advectFlows();
 
-    static FILE *stdin, *logfile, *recfile;
-    static Stats stats;
-    static int statsFile;
+    static Tcl_Interp *interp;
+
     static unsigned int flags;
     static bool debugFlag;
@@ -181 +159 @@
     static int winWidth;        ///< Width of the render window
     static int winHeight;       ///< Height of the render window
-    static int renderWindow;    //< GLUT handle for the render window
+    static int renderWindow;    ///< GLUT handle for the render window
     static unsigned char *screenBuffer;
     static Texture2D *legendTexture;
-    static Grid *grid;
     static nv::util::Fonts *fonts;
     static int updir;
@@ -203 +180 @@
     static NvLIC *licRenderer;
     static PlaneRenderer *planeRenderer;
-
-    static Tcl_Interp *interp;
+    static Grid *grid;
 
 private: