Changeset 3452

Timestamp:

Mar 4, 2013 8:57:13 PM (11 years ago)

Author:

ldelgass

Message:

Remove XINETD define from nanovis. We only support server mode now, no glut
interaction loop with mouse/keyboard handlers. Fixes for trace logging to make
output closer to vtkvis: inlcude function name for trace messages, remove
newlines from format strings in macros since newlines get added by syslog.

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (15 diffs)
• ConvexPolygon.cpp (modified) (3 diffs)
• FlowCmd.cpp (modified) (20 diffs)
• GradientFilter.cpp (modified) (11 diffs)
• Grid.cpp (modified) (1 diff)
• HeightMap.cpp (modified) (1 diff)
• Mat4x4.cpp (modified) (2 diffs)
• NvCamera.cpp (modified) (4 diffs)
• NvEventLog.cpp (modified) (3 diffs)
• NvLIC.cpp (modified) (5 diffs)
• NvParticleRenderer.cpp (modified) (1 diff)
• NvShader.cpp (modified) (5 diffs)
• NvShader.h (modified) (4 diffs)
• NvVectorField.cpp (modified) (1 diff)
• NvZincBlendeReconstructor.cpp (modified) (9 diffs)
• PCASplit.cpp (modified) (3 diffs)
• ParticleSystem.cpp (modified) (13 diffs)
• ParticleSystemFactory.cpp (modified) (2 diffs)
• PerfQuery.h (modified) (2 diffs)
• PointSetRenderer.cpp (modified) (2 diffs)
• RenderVertexArray.cpp (modified) (2 diffs)
• Texture1D.cpp (modified) (2 diffs)
• Texture2D.cpp (modified) (2 diffs)
• Texture3D.cpp (modified) (2 diffs)
• Trace.cpp (modified) (5 diffs)
• Trace.h (modified) (2 diffs)
• Unirect.cpp (modified) (5 diffs)
• Vector3.h (modified) (1 diff)
• Vector4.h (modified) (2 diffs)
• VelocityArrowsSlice.cpp (modified) (4 diffs)
• Volume.cpp (modified) (3 diffs)
• VolumeInterpolator.cpp (modified) (5 diffs)
• VolumeRenderer.cpp (modified) (4 diffs)
• config.h (modified) (1 diff)
• define.h (modified) (1 diff)
• dxReader.cpp (modified) (5 diffs)
• nanovis.cpp (modified) (50 diffs)
• nanovis.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -508 +508 @@
     }
     Rappture::Outcome err;
-    TRACE("Checking header[%.13s]\n", buf.bytes());
+    TRACE("Checking header[%.13s]", buf.bytes());
     if (strncmp (buf.bytes(), "@@RP-ENC:", 9) == 0) {
         /* There's a header on the buffer, use it to decode the data. */
@@ -1064 +1064 @@
 
             fraction = ((float)frame_num) / (total - 1);
-            TRACE("fraction : %f\n", fraction);
+            TRACE("fraction : %f", fraction);
             //interpolator->update(((float)frame_num) / (total - 1));
             interpolator->update(fraction);
@@ -1116 +1116 @@
         return TCL_ERROR;
     }
-    TRACE("parsing volume data identifier\n");
+    TRACE("parsing volume data identifier");
     Tcl_HashSearch iter;
     Tcl_HashEntry *hPtr;
@@ -1156 +1156 @@
                     Tcl_Obj *const *objv)
 {
-    TRACE("Data Loading\n");
+    TRACE("Data Loading");
 
     int nbytes;
@@ -1174 +1174 @@
     nBytes = buf.size();
 
-    TRACE("Checking header[%.20s]\n", bytes);
+    TRACE("Checking header[%.20s]", bytes);
 
     Volume *volPtr = NULL;
 
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
-        TRACE("ZincBlende stream is in\n");
+        TRACE("ZincBlende stream is in");
          //std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary);
         //fdata.write(buf.bytes(),buf.size());
@@ -1189 +1189 @@
             return TCL_ERROR;
         }
-        TRACE("finish loading\n");
+        TRACE("finish loading");
 
         Vector3 scale = volPtr->getPhysicalScaling();
@@ -1212 +1212 @@
             nBytes -= 5;
         }
-        TRACE("DX loading...\n");
+        TRACE("DX loading...");
         std::stringstream fdata;
         fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
-            ERROR("data buffer is empty\n");
+            ERROR("data buffer is empty");
             abort();
         }
@@ -1502 +1502 @@
         return TCL_ERROR;
     }
-    TRACE("set opacity %f\n", opacity);
+    TRACE("set opacity %f", opacity);
     std::vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
@@ -1576 +1576 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        TRACE("setting %s with transfer function %s\n", (*iter)->name(),
+        TRACE("setting %s with transfer function %s", (*iter)->name(),
                tfPtr->name());
         (*iter)->transferFunction(tfPtr);
@@ -1729 +1729 @@
         hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
     }
-    TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries);
+    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
     // Must set units before the heights.
     hmPtr->xAxis.units(data.xUnits());
@@ -1881 +1881 @@
     Tcl_SetStringObj(Tcl_GetObjResult(interp), tag, -1);;
     NanoVis::eventuallyRedraw();
-    TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries);
+    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
     return TCL_OK;
 }
@@ -2142 +2142 @@
            Tcl_Obj *const *objv)
 {
-    TRACE("load plane for 2D visualization command\n");
+    TRACE("load plane for 2D visualization command");
 
     int index, w, h;
@@ -2187 +2187 @@
             Tcl_Obj *const *objv)
 {
-    TRACE("link the plane to the 2D renderer command\n");
+    TRACE("link the plane to the 2D renderer command");
 
     int plane_index;
@@ -2214 +2214 @@
               Tcl_Obj *const *objv)
 {
-    TRACE("enable a plane so the 2D renderer can render it command\n");
+    TRACE("enable a plane so the 2D renderer can render it command");
 
     if (objc != 3) {
@@ -2340 +2340 @@
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
-        WARN("bad default transfer function\n%s\n", 
+        WARN("bad default transfer function:\n%s", 
              Tcl_GetStringResult(interp));
     }

trunk/packages/vizservers/nanovis/ConvexPolygon.cpp

@@ -57 +57 @@
 {
     if (vertices.size() == 0) {
-        ERROR("polygon has no vertices\n");
+        ERROR("polygon has no vertices");
         return false;
     }
@@ -144 +144 @@
         }
     } else {
-        WARN("No polygons to render\n");
+        WARN("No polygons to render");
     }
 }
@@ -165 +165 @@
         }
     } else {
-        WARN("No polygons to render\n");
+        WARN("No polygons to render");
     }
 }

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -154 +154 @@
 FlowParticles::render() 
 {
-    TRACE("rendering particles %s\n", _name);
-    TRACE("rendering particles %s axis=%d\n", _name, _sv.position.axis);
-    TRACE("rendering particles %s position=%g\n", _name, _sv.position.value);
-    TRACE("rendering particles %s position=%g\n", _name, 
+    TRACE("rendering particles %s", _name);
+    TRACE("rendering particles %s axis=%d", _name, _sv.position.axis);
+    TRACE("rendering particles %s position=%g", _name, _sv.position.value);
+    TRACE("rendering particles %s position=%g", _name, 
           FlowCmd::GetRelativePosition(&_sv.position));
 
@@ -195 +195 @@
 FlowBox::Render(Volume *volPtr)
 {
-    TRACE("Rendering box %s\n", _name);
+    TRACE("Rendering box %s", _name);
 
     glPushAttrib(GL_ENABLE_BIT);
@@ -220 +220 @@
     max.z = volPtr->zAxis.max();
 
-    TRACE("box is %g,%g %g,%g %g,%g\n", 
+    TRACE("box is %g,%g %g,%g %g,%g", 
           _sv.corner1.x, _sv.corner2.x,
           _sv.corner1.y, _sv.corner2.y,
           _sv.corner1.z, _sv.corner2.z);
-    TRACE("world is %g,%g %g,%g %g,%g\n", 
+    TRACE("world is %g,%g %g,%g %g,%g", 
           min.x, max.x, min.y, max.y, min.z, max.z);
 
@@ -242 +242 @@
         z1 = (_sv.corner2.z - min.z) / (max.z - min.z);
     }
-    TRACE("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);
+    TRACE("rendering box %g,%g %g,%g %g,%g", x0, x1, y0, y1, z0, z1);
 
     glColor4d(_sv.color.r, _sv.color.g, _sv.color.b, _sv.color.a);
@@ -381 +381 @@
         }
     }
-    TRACE("in Render before boxes %s\n", _name);
+    TRACE("in Render before boxes %s", _name);
     RenderBoxes();
 }
@@ -531 +531 @@
 {
     if (_volPtr != NULL) {
-        TRACE("from ScaleVectorField volId=%s\n", _volPtr->name());
+        TRACE("from ScaleVectorField volId=%s", _volPtr->name());
         NanoVis::removeVolume(_volPtr);
         _volPtr = NULL;
@@ -613 +613 @@
     FlowBox *boxPtr;
     for (boxPtr = FirstBox(&iter); boxPtr != NULL; boxPtr = NextBox(&iter)) {
-        TRACE("found box %s\n", boxPtr->name());
+        TRACE("found box %s", boxPtr->name());
         if (boxPtr->visible()) {
             boxPtr->Render(_volPtr);
@@ -667 +667 @@
     volPtr->zAxis.setRange(_dataPtr->zMin(), _dataPtr->zMax());
 
-    TRACE("min=%g %g %g max=%g %g %g mag=%g %g\n", 
+    TRACE("min=%g %g %g max=%g %g %g mag=%g %g", 
           NanoVis::xMin, NanoVis::yMin, NanoVis::zMin,
           NanoVis::xMax, NanoVis::yMax, NanoVis::zMax,
@@ -706 +706 @@
     const char *fileName;
     fileName = Tcl_GetString(objv[3]);
-    TRACE("Flow loading data from file %s\n", fileName);
+    TRACE("Flow loading data from file %s", fileName);
 
     int nComponents;
@@ -750 +750 @@
         delete u2dPtr;
     } else {
-        TRACE("header is %.14s\n", buf.bytes());
+        TRACE("header is %.14s", buf.bytes());
         if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -777 +777 @@
     Rappture::Outcome result;
 
-    TRACE("Flow Data Loading\n");
+    TRACE("Flow Data Loading");
 
     int nBytes;
     if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) {
-        ERROR("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));
+        ERROR("Bad nBytes \"%s\"", Tcl_GetString(objv[3]));
         return TCL_ERROR;
     }
@@ -787 +787 @@
         Tcl_AppendResult(interp, "bad # bytes request \"", 
                          Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
-        ERROR("Bad nbytes %d\n", nBytes);
+        ERROR("Bad nbytes %d", nBytes);
         return TCL_ERROR;
     }
     int nComponents;
     if (Tcl_GetIntFromObj(interp, objv[4], &nComponents) != TCL_OK) {
-        ERROR("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));
+        ERROR("Bad # of components \"%s\"", Tcl_GetString(objv[4]));
         return TCL_ERROR;
     }
@@ -798 +798 @@
         Tcl_AppendResult(interp, "bad # of components request \"", 
                          Tcl_GetString(objv[4]), "\" for \"data follows\"", (char *)NULL);
-        ERROR("Bad # of components %d\n", nComponents);
+        ERROR("Bad # of components %d", nComponents);
         return TCL_ERROR;
     }
     Rappture::Buffer buf;
-    TRACE("Flow Data Loading %d %d\n", nBytes, nComponents);
+    TRACE("Flow Data Loading %d %d", nBytes, nComponents);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
@@ -833 +833 @@
         delete u2dPtr;
     } else {
-        TRACE("header is %.14s\n", buf.bytes());
+        TRACE("header is %.14s", buf.bytes());
         if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -845 +845 @@
         return TCL_ERROR;
     }
-    TRACE("nx = %d ny = %d nz = %d\n", dataPtr->xNum(), dataPtr->yNum(), dataPtr->zNum());
-    TRACE("x0 = %lg y0 = %lg z0 = %lg\n", dataPtr->xMin(), dataPtr->yMin(), dataPtr->zMin());
-    TRACE("lx = %lg ly = %lg lz = %lg\n",
+    TRACE("nx = %d ny = %d nz = %d", dataPtr->xNum(), dataPtr->yNum(), dataPtr->zNum());
+    TRACE("x0 = %lg y0 = %lg z0 = %lg", dataPtr->xMin(), dataPtr->yMin(), dataPtr->zMin());
+    TRACE("lx = %lg ly = %lg lz = %lg",
           dataPtr->xMax() - dataPtr->xMin(),
           dataPtr->yMax() - dataPtr->yMin(),
           dataPtr->zMax() - dataPtr->zMin());
-    TRACE("dx = %lg dy = %lg dz = %lg\n",
+    TRACE("dx = %lg dy = %lg dz = %lg",
           dataPtr->xNum() > 1 ? (dataPtr->xMax() - dataPtr->xMin())/(dataPtr->xNum()-1) : 0,
           dataPtr->yNum() > 1 ? (dataPtr->yMax() - dataPtr->yMin())/(dataPtr->yNum()-1) : 0,
           dataPtr->zNum() > 1 ? (dataPtr->zMax() - dataPtr->zMin())/(dataPtr->zNum()-1) : 0);
-    TRACE("magMin = %lg magMax = %lg\n",
+    TRACE("magMin = %lg magMax = %lg",
           dataPtr->magMin(), dataPtr->magMax());
     flowPtr->data(dataPtr);
@@ -863 +863 @@
         size_t length;
 
-        length = sprintf(info, "nv>data tag %s min %g max %g\n",
+        length = sprintf(info, "nv>data tag %s min %g max %g",
                          flowPtr->name(), dataPtr->magMin(), dataPtr->magMax());
         nWritten  = write(1, info, length);
@@ -1013 +1013 @@
 {
     flags &= ~MAP_FLOWS;
-    TRACE("MapFlows\n");
+    TRACE("MapFlows");
 
     /* 
@@ -1057 +1057 @@
         }
     }
-    TRACE("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax);
+    TRACE("MapFlows magMin=%g magMax=%g", NanoVis::magMin, NanoVis::magMax);
 
     /* 
@@ -1919 +1919 @@
     oldHeight = NanoVis::winHeight;
 
-    TRACE("FLOW started\n");
+    TRACE("FLOW started");
 
     Rappture::Outcome context;
@@ -1968 +1968 @@
     }
     movie.done(context);
-    TRACE("FLOW end\n");
+    TRACE("FLOW end");
     if (!canceled) {
         Rappture::Buffer data;

trunk/packages/vizservers/nanovis/GradientFilter.cpp

@@ -36 +36 @@
                                      strlen(floatExt) +
                                      strlen(extension) + 1))) {
-        ERROR("not enough memory for filename\n");
+        ERROR("not enough memory for filename");
         exit(1);
     }
@@ -60 +60 @@
     if (fwrite(gradients, 3 * sizes[0] * sizes[1] * sizes[2] * sizeof(float),
                1, fp) != 1) {
-        ERROR("writing float gradients failed\n");
+        ERROR("writing float gradients failed");
         exit(1);
     }
@@ -83 +83 @@
 
     if (fwrite(gradients, size, 1, fp) != 1) {
-        ERROR("writing gradients failed\n");
+        ERROR("writing gradients failed");
         exit(1);
     }
@@ -138 +138 @@
             break;
         default:
-            ERROR("Unsupported data type\n");
+            ERROR("Unsupported data type");
             exit(1);
             break;
@@ -190 +190 @@
     };
 
-    TRACE("computing gradients ... may take a while\n");
+    TRACE("computing gradients ... may take a while");
 
     di = 0;
@@ -312 +312 @@
     float sum, *filteredGradients, ****filter;
 
-    TRACE("filtering gradients ... may also take a while\n");
+    TRACE("filtering gradients ... may also take a while");
 
     if (! (filteredGradients = (float *)malloc(sizes[0] * sizes[1] * sizes[2]
                                                * 3 * sizeof(float)))) {
-        ERROR("not enough memory for filtered gradients\n");
+        ERROR("not enough memory for filtered gradients");
         exit(1);
     }
@@ -323 +323 @@
     if (! (filter = (float ****)malloc((GRAD_FILTER_SIZE/2 + 1) * 
                                        sizeof(float ***)))) {
-        ERROR("failed to allocate gradient filter\n");
+        ERROR("failed to allocate gradient filter");
         exit(1);
     }
@@ -330 +330 @@
         if (! (filter[i] = (float ***)malloc((GRAD_FILTER_SIZE) * 
                                              sizeof(float **)))) {
-            ERROR("failed to allocate gradient filter\n");
+            ERROR("failed to allocate gradient filter");
             exit(1);
         }
@@ -338 +338 @@
             if (! (filter[i][j] = (float **)malloc((GRAD_FILTER_SIZE) * 
                                                    sizeof(float *)))) {
-                ERROR("failed to allocate gradient filter\n");
+                ERROR("failed to allocate gradient filter");
                 exit(1);
             }
@@ -348 +348 @@
                 if (! (filter[i][j][k] = (float *)malloc((GRAD_FILTER_SIZE) *
                                                          sizeof(float)))) {
-                    ERROR("failed to allocate gradient filter\n");
+                    ERROR("failed to allocate gradient filter");
                     exit(1);
                 }
@@ -525 +525 @@
                     break;
                 default:
-                    ERROR("unsupported data type\n");
+                    ERROR("unsupported data type");
                     break;
                 }

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -58 +58 @@
     double zoffset = (zAxis.min() - zAxis.dataMin()) * zAxis.scale();
 
-    TRACE("Axis ranges: %g %g %g\n", xAxis.range(), yAxis.range(), zAxis.range());
-    TRACE("Axis scales: %g %g %g\n", xAxis.scale(), yAxis.scale(), zAxis.scale());
-    TRACE("Axis min/max: %g,%g %g,%g %g,%g\n",
+    TRACE("Axis ranges: %g %g %g", xAxis.range(), yAxis.range(), zAxis.range());
+    TRACE("Axis scales: %g %g %g", xAxis.scale(), yAxis.scale(), zAxis.scale());
+    TRACE("Axis min/max: %g,%g %g,%g %g,%g",
           xAxis.min(), xAxis.max(), 
           yAxis.min(), yAxis.max(),
           zAxis.min(), zAxis.max());
-    TRACE("Axis vmin/vmax: %g,%g %g,%g %g,%g\n",
+    TRACE("Axis vmin/vmax: %g,%g %g,%g %g,%g",
           xAxis.dataMin(), xAxis.dataMax(), 
           yAxis.dataMin(), yAxis.dataMax(),
           zAxis.dataMin(), zAxis.dataMax());
-    TRACE("paspect: %g %g %g\n", paspectX, paspectY, paspectZ);
-    TRACE("scale: %g %g %g\n", xscale, yscale, zscale);
+    TRACE("paspect: %g %g %g", paspectX, paspectY, paspectZ);
+    TRACE("scale: %g %g %g", xscale, yscale, zscale);
 
     glTranslatef(-0.5f * paspectX, -0.5f * paspectY, -0.5f * paspectZ);

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -296 +296 @@
     //else
     //{
-    //ERROR("HeightMap::setHeight\n");
+    //ERROR("HeightMap::setHeight");
     //}
 }

trunk/packages/vizservers/nanovis/Mat4x4.cpp

@@ -28 +28 @@
 Mat4x4::print() const
 {
-    TRACE("%f %f %f %f\n", m[0], m[1], m[2], m[3]);
-    TRACE("%f %f %f %f\n", m[4], m[5], m[6], m[7]);
-    TRACE("%f %f %f %f\n", m[8], m[9], m[10], m[11]);
-    TRACE("%f %f %f %f\n", m[12], m[13], m[14], m[15]);
+    TRACE("%f %f %f %f", m[0], m[1], m[2], m[3]);
+    TRACE("%f %f %f %f", m[4], m[5], m[6], m[7]);
+    TRACE("%f %f %f %f", m[8], m[9], m[10], m[11]);
+    TRACE("%f %f %f %f", m[12], m[13], m[14], m[15]);
 }
 
@@ -72 +72 @@
 
 #if 0
-    TRACE("Invert:\n");
-    TRACE("   %12.9f %12.9f %12.9f %12.9f\n", m00, m01, m02, m03);
-    TRACE("   %12.9f %12.9f %12.9f %12.9f\n", m10, m11, m12, m13);
-    TRACE("   %12.9f %12.9f %12.9f %12.9f\n", m20, m21, m22, m23);
-    TRACE("   %12.9f %12.9f %12.9f %12.9f\n", m30, m31, m32, m33);
+    TRACE("Invert:");
+    TRACE("   %12.9f %12.9f %12.9f %12.9f", m00, m01, m02, m03);
+    TRACE("   %12.9f %12.9f %12.9f %12.9f", m10, m11, m12, m13);
+    TRACE("   %12.9f %12.9f %12.9f %12.9f", m20, m21, m22, m23);
+    TRACE("   %12.9f %12.9f %12.9f %12.9f", m30, m31, m32, m33);
 #endif
 

trunk/packages/vizservers/nanovis/NvCamera.cpp

@@ -83 +83 @@
     _far = -zMin;
 
-    TRACE("Resetting camera clipping range to: near: %g, far: %g\n", _near, _far);
+    TRACE("Resetting camera clipping range to: near: %g, far: %g", _near, _far);
 
     glMatrixMode(GL_PROJECTION);
@@ -96 +96 @@
 NvCamera::initialize()
 {
-    TRACE("camera: %d, %d\n", _width, _height);
+    TRACE("camera: %d, %d", _width, _height);
     glViewport(_startX, _startY, _width, _height);
     glMatrixMode(GL_PROJECTION);
@@ -118 +118 @@
     _cameraMatrix.makeRotation(rot);
     _cameraMatrix.transpose();
-    TRACE("Set rotation to quat: %g %g %g %g\n",
+    TRACE("Set rotation to quat: %g %g %g %g",
           quat[0], quat[1], quat[2], quat[3]);
 }
@@ -135 +135 @@
     //_cameraMatrix.transpose();
 
-    TRACE("Set rotation to angles: %g %g %g\n",
+    TRACE("Set rotation to angles: %g %g %g",
           angleX, angleY, angleZ);
 }

trunk/packages/vizservers/nanovis/NvEventLog.cpp

@@ -16 +16 @@
 static double cur_time; //in seconds
 
-#ifdef XINETD
 void NvInitService()
 {
@@ -53 +52 @@
     }
 }
-#endif
 
 void NvInitEventLog()
@@ -81 +79 @@
     return interval;
 }
-

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ -138 +138 @@
 NvLIC::makePatterns() 
 { 
-    TRACE("begin makePatterns\n");
+    TRACE("Enter");
+
     if (_disListID > 0) {
         glDeleteLists(_disListID, _Npat);
@@ -144 +145 @@
     _disListID = glGenLists(_Npat);
 
-    TRACE("DisplayList : %d\n", _disListID);
+    TRACE("DisplayList : %d", _disListID);
 
     int lut[256];
@@ -178 +179 @@
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, NPN, NPN, 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, pat);
-    TRACE("finish makePatterns\n");
+
+    TRACE("Leave");
 }
 
@@ -489 +491 @@
                       float scaleX, float scaleY, float scaleZ, float max)
 {
-    TRACE("NvLIC: vector field is assigned [%d]\n", texID);
+    TRACE("NvLIC: vector field is assigned [%d]", texID);
     _vectorFieldId = texID;
     _origin = origin;
@@ -536 +538 @@
    *py = y + vy;
 
-    //TRACE("vel %f %f -> %f %f, (dmax = %f)\n", x, y, *px, *py, dmax);
+    //TRACE("vel %f %f -> %f %f, (dmax = %f)", x, y, *px, *py, dmax);
 }
 

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -220 +220 @@
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
 
-    TRACE("init particles\n");
+    TRACE("Leave");
 }
 

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ -40 +40 @@
 
     if (lastError) {
-        TRACE("Cg Error: %s\n", cgGetErrorString(lastError));
+        TRACE("Cg Error: %s", cgGetErrorString(lastError));
         if (getCgContext())
-            TRACE("%s\n", cgGetLastListing(getCgContext()));
+            TRACE("%s", cgGetLastListing(getCgContext()));
         return false;
     }
@@ -54 +54 @@
     std::string path = R2FilePath::getInstance()->getPath(fileName);
     if (path.empty()) {
-        ERROR("can't find program \"%s\"\n", fileName);
+        ERROR("can't find program \"%s\"", fileName);
     }
-    TRACE("cg program compiling: %s\n", path.c_str());
+    TRACE("cg program compiling: %s", path.c_str());
     CGprogram program;
     program = cgCreateProgramFromFile(context, CG_SOURCE, path.c_str(), profile, 
@@ -63 +63 @@
     CGerror LastError = cgGetError();
     if (LastError) {
-        ERROR("Error message: %s\n", cgGetLastListing(context));
+        ERROR("Error message: %s", cgGetLastListing(context));
     }
-    TRACE("successfully compiled program: %s\n", path.c_str());
+    TRACE("successfully compiled program: %s", path.c_str());
     return program;
 }
@@ -110 +110 @@
 {
     if (_cgVP != NULL) {
-        TRACE("Destroying vertex program: %s\n", _vpFile.c_str());
+        TRACE("Destroying vertex program: %s", _vpFile.c_str());
         cgDestroyProgram(_cgVP);
     }
 
     if (_cgFP != NULL) {
-        TRACE("Destroying fragment program: %s\n", _fpFile.c_str());
+        TRACE("Destroying fragment program: %s", _fpFile.c_str());
         cgDestroyProgram(_cgFP);
     }
@@ -122 +122 @@
 void NvShader::setErrorCallback(NvCgCallbackFunction callback)
 {
-    TRACE("NvShader setting error callback to: %p\n", callback);
+    TRACE("NvShader setting error callback to: %p", callback);
     cgSetErrorCallback(callback);
 }

trunk/packages/vizservers/nanovis/NvShader.h

@@ -50 +50 @@
             return cgGetNamedParameter(_cgFP, paramName);
         }
-        ERROR("Unknown fragment program parameter: %s\n", paramName);
+        ERROR("Unknown fragment program parameter: %s", paramName);
         return 0;
     }
@@ -59 +59 @@
             return cgGetNamedParameter(_cgVP, paramName);
         }
-        ERROR("Unknown vertex program parameter: %s\n", paramName);
+        ERROR("Unknown vertex program parameter: %s", paramName);
         return 0;
     }
@@ -289 +289 @@
                 _vpParams[name] = param;
             else
-                ERROR("Unknown vertex program parameter: %s\n", name);
+                ERROR("Unknown vertex program parameter: %s", name);
         } else {
             param = itr->second;
@@ -305 +305 @@
                 _fpParams[name] = param;
             else
-                ERROR("Unknown fragment program parameter: %s\n", name);
+                ERROR("Unknown fragment program parameter: %s", name);
         } else {
             param = itr->second;

trunk/packages/vizservers/nanovis/NvVectorField.cpp

@@ -225 +225 @@
         }
 
-        TRACE("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);
+        TRACE("rendering box %g,%g %g,%g %g,%g", x0, x1, y0, y1, z0, z1);
 
         glColor4d(shape.color.x, shape.color.y, shape.color.z, shape.color.w);

trunk/packages/vizservers/nanovis/NvZincBlendeReconstructor.cpp

@@ -54 +54 @@
             continue;
         } else if (strstr((const char*) buff, "object") != 0) {
-            TRACE("VERSION 1\n");
+            TRACE("VERSION 1");
             version = 1;
             break;
         } else if (strstr(buff, "record format") != 0) {
-            TRACE("VERSION 2\n");
+            TRACE("VERSION 2");
             version = 2;
             break;
@@ -89 +89 @@
             stream.read((char *)data, width * height * depth * 8 * 4 * sizeof(double));
         } catch (...) {
-            ERROR("Caught exception trying to read stream\n");
+            ERROR("Caught exception trying to read stream");
         }
 
@@ -104 +104 @@
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
-                TRACE("delta : %f %f %f\n", delta.x, delta.y, delta.z);
+                TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
             } else if ((pt = strstr(buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
 #ifdef _LOADER_DEBUG_
-                TRACE("datacount = %d\n", datacount);
+                TRACE("datacount = %d", datacount);
 #endif
             } else if ((pt = strstr(buff, "datatype")) != 0) {
@@ -118 +118 @@
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
-                TRACE("width height depth %d %d %d\n", width, height, depth);
+                TRACE("width height depth %d %d %d", width, height, depth);
 #endif
             } else if ((pt = strstr(buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
-                TRACE("emptyvalue %lf\n", emptyvalue);
+                TRACE("emptyvalue %lf", emptyvalue);
 #endif
             } else if ((pt = strstr(buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
-                TRACE("emptyvalue %lf\n", emptyvalue);
+                TRACE("emptyvalue %lf", emptyvalue);
 #endif
             }
@@ -217 +217 @@
 
 #ifdef _LOADER_DEBUG_
-        TRACE("index %d\n", index);
+        TRACE("index %d", index);
 #endif
 
@@ -287 +287 @@
 
 #ifdef _LOADER_DEBUG_
-        TRACE("[%d] index %d (width:%lf height:%lf depth:%lf)\n", i, index, srcPtr->indexX, srcPtr->indexY, srcPtr->indexZ);
+        TRACE("[%d] index %d (width:%lf height:%lf depth:%lf)", i, index, srcPtr->indexX, srcPtr->indexY, srcPtr->indexZ);
 #endif
 
         if (index < 0) {
 #ifdef _LOADER_DEBUG_
-            TRACE("There is an invalid data\n");
+            TRACE("There is an invalid data");
 #endif
             srcPtr +=8;
@@ -377 +377 @@
             continue;
         } else if (strstr((const char *)buff, "object") != 0) {
-            TRACE("VERSION 1\n");
+            TRACE("VERSION 1");
             version = 1; 
             break;
         } else if (strstr(buff, "record format") != 0) {
-            TRACE("VERSION 2\n");
+            TRACE("VERSION 2");
             version = 2; 
             break;
@@ -422 +422 @@
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
-                TRACE("delta : %f %f %f\n", delta.x, delta.y, delta.z);
+                TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
             } else if ((pt = strstr(buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
-                TRACE("datacount = %d\n", datacount);
+                TRACE("datacount = %d", datacount);
             } else if ((pt = strstr(buff, "datatype")) != 0) {
                 sscanf(pt, "%s%s", str[0], str[1]);
@@ -434 +434 @@
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
-                TRACE("width height depth %d %d %d\n", width, height, depth);
+                TRACE("width height depth %d %d %d", width, height, depth);
 #endif
             } else if ((pt = strstr(buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
-                TRACE("emptyvalue %lf\n", emptyvalue);
+                TRACE("emptyvalue %lf", emptyvalue);
 #endif
             } else if ((pt = strstr(buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
-                TRACE("emptyvalue %lf\n", emptyvalue);
+                TRACE("emptyvalue %lf", emptyvalue);
 #endif
             }

trunk/packages/vizservers/nanovis/PCASplit.cpp

@@ -129 +129 @@
     _clusterHeader->startPointerCluster[level - 1] = clusterBlock;
 
-    TRACE("Cluster created %d [in level %d]:total %d\n", count, level, cc);
+    TRACE("Cluster created %d [in level %d]:total %d", count, level, cc);
 
     int i = 0;
@@ -142 +142 @@
     }
     if (count != i) {
-        ERROR("Problem walking clusterList: count: %d, i: %d\n", count, i);
+        ERROR("Problem walking clusterList: count: %d, i: %d", count, i);
     }
     return clusterBlock;
@@ -270 +270 @@
 
     if (left == 0 || right == count - 1) {
-        TRACE("error\n");
+        TRACE("error");
         exit(1);
     } else {

trunk/packages/vizservers/nanovis/ParticleSystem.cpp

@@ -91 +91 @@
 #ifdef WANT_TRACE
                 float ti = clock() / (float) CLOCKS_PER_SEC;
-                TRACE("LoadProcessedFlowRaw time: %f\n", ti - t);
+                TRACE("LoadProcessedFlowRaw time: %f", ti - t);
 #endif
                 queue.push();
-                TRACE("%d loaded\n", curIndex);
+                TRACE("%d loaded", curIndex);
                 ++curIndex;
             }
@@ -311 +311 @@
                 delete image;
             } else {
-                ERROR("Failed to load image: arrows.bmp\n");
+                ERROR("Failed to load image: arrows.bmp");
             }
             delete loader;
         } else {
-            ERROR("Couldn't find loader for arrows.bmp\n");
+            ERROR("Couldn't find loader for arrows.bmp");
         }
     } else {
-        ERROR("Couldn't find path to arrows.bmp\n");
+        ERROR("Couldn't find path to arrows.bmp");
     }
 
@@ -1008 +1008 @@
 #ifdef WANT_TRACE
                     float ti = clock() / (float) CLOCKS_PER_SEC;
-                    TRACE("updatePixels time: %f\n", ti - t);
+                    TRACE("updatePixels time: %f", ti - t);
 #endif
                     _queue.pop();
@@ -1014 +1014 @@
 
                     firstLoad = false;
-                    TRACE("%d bound\n", index++);
+                    TRACE("%d bound", index++);
                 }
             }           
@@ -1192 +1192 @@
     glBegin(GL_POINTS);
     for (iter = _newParticles.begin(); iter != _newParticles.end(); iter++) {
-        //TRACE("[%d] %f %f %f\n", iter->index, iter->position.x,iter->position.y,iter->position.z);
+        //TRACE("[%d] %f %f %f", iter->index, iter->position.x,iter->position.y,iter->position.z);
         glMultiTexCoord3f(GL_TEXTURE0, iter->position.x,iter->position.y,iter->position.z);
 
@@ -1201 +1201 @@
         glVertex2f((float)(iter->index % _width),
                    (float)(iter->index / _height) + 1/* + offsetY*/ /* + offsetY shouldn't be */);
-        //TRACE("%f %f\n", (float) (iter->index % _width), (float)(iter->index / _width));
+        //TRACE("%f %f", (float) (iter->index % _width), (float)(iter->index / _width));
     }
     glEnd();
@@ -1246 +1246 @@
     glBegin(GL_POINTS);
     for (iter = _newParticles.begin(); iter != _newParticles.end(); iter++) {
-        //TRACE("[%d] %f %f %f\n", iter->index, iter->position.x,iter->position.y,iter->position.z);
+        //TRACE("[%d] %f %f %f", iter->index, iter->position.x,iter->position.y,iter->position.z);
         glMultiTexCoord3f(GL_TEXTURE0, iter->position.x,iter->position.y,iter->position.z);
 
@@ -1255 +1255 @@
         glVertex2f((float)(iter->index % _width),
                    (float)(iter->index / _height) + 1/* + offsetY*/ /* + offsetY shouldn't be */);
-        //TRACE("%f %f\n", (float) (iter->index % _width), (float)(iter->index / _width));
+        //TRACE("%f %f", (float) (iter->index % _width), (float)(iter->index / _width));
     }
     glEnd();
@@ -1350 +1350 @@
         TRACE("[%d]", _currentSortIndex);
         for (int i = 0; i < _width * _height * 3; i += 3)
-            TRACE("%.2f, %.2f, %.2f\n", debug[i], debug[i+1], debug[i+2]);
-        TRACE("\n");
+            TRACE("%.2f, %.2f, %.2f", debug[i], debug[i+1], debug[i+2]);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
@@ -1362 +1361 @@
         static float debug[256];
         glReadPixels(0, 0, _width, _height, GL_RGB, GL_FLOAT, (float*)debug);
-        TRACE("\n");
         TRACE("currentPos[%d]", _currentPosIndex);
         for (int i = 0; i < _width * _height * 3; i += 3)
-            TRACE("%.2f, %.2f, %.2f\n", debug[i], debug[i+1], debug[i+2]);
-        TRACE("\n");
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+            TRACE("%.2f, %.2f, %.2f", debug[i], debug[i+1], debug[i+2]);
+         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
     */
@@ -1398 +1395 @@
         static float debug[256];
         glReadPixels(0, 0, _width, _height, GL_RGB, GL_FLOAT, (float*)debug);
-        TRACE("\n");
         TRACE("[%d]", _currentSortIndex);
         for (int i = 0; i < _width * _height * 3; i += 3)
-            TRACE("%.2f, %.2f, %.2f\n", debug[i], debug[i+1], debug[i+2]);
-        TRACE("\n");
+            TRACE("%.2f, %.2f, %.2f", debug[i], debug[i+1], debug[i+2]);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
@@ -1457 +1452 @@
         static float debug[256];
         glReadPixels(0, 0, _width, _height, GL_RGB, GL_FLOAT, (float*)debug);
-        TRACE("\n");
         TRACE("[%d]", _currentSortIndex);
         for (int i = 0; i < _width * _height * 3; i += 3)
-            TRACE("%.2f, %.2f, %.2f\n", debug[i], debug[i+1], debug[i+2]);
-        TRACE("\n");
+            TRACE("%.2f, %.2f, %.2f", debug[i], debug[i+1], debug[i+2]);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
@@ -1636 +1629 @@
 
             cgSetParameter1f(_mvCurrentTimeParam, _currentTime);
-            //TRACE("%f %f, %f %d\n", _fov, tan(_fov), tan(_fov / 2.0), _screenHeight);
+            //TRACE("%f %f, %f %d", _fov, tan(_fov), tan(_fov / 2.0), _screenHeight);
             //cgSetParameter1f(_mvTanHalfFOVParam, -tan(_fov * M_PI / 180 * 0.5) * _screenHeight * 0.5);
             //float v = tan(_fov * M_PI / 180 * 0.5) * _screenHeight * 0.5;

trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

@@ -64 +64 @@
         stat = XML_ParseBuffer(parser, (int) cnt, 0);
         if (!stat) {
-            //TRACE("Parse error at line %d\n", XML_GetCurrentLineNumber(parser));
+            //TRACE("Parse error at line %d", XML_GetCurrentLineNumber(parser));
             break;
         }
@@ -151 +151 @@
                 index = path.rfind('\\');
                 if (index == -1) {
-                    TRACE("file not found\n");
+                    TRACE("file not found");
                 }
             }

trunk/packages/vizservers/nanovis/PerfQuery.h

@@ -54 +54 @@
 {
     if (!GLEW_ARB_occlusion_query) {
-        TRACE("ARB_occlusion_query extension not supported\n");
+        TRACE("ARB_occlusion_query extension not supported");
         return false;
     }
@@ -61 +61 @@
                     &bitsSupported);
     if (bitsSupported == 0) {
-        TRACE("occlusion query not supported!\n");
+        TRACE("occlusion query not supported!");
         return false;
     } else {
-        TRACE("Occlusion query with %d bits supported\n", bitsSupported);
+        TRACE("Occlusion query with %d bits supported", bitsSupported);
         return true;
     }

trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

@@ -19 +19 @@
     std::string path = R2FilePath::getInstance()->getPath("particle2.bmp");
     if (path.empty()) {
-        ERROR("Particle image not found\n");
+        ERROR("Particle image not found");
         return;
     }
@@ -39 +39 @@
                                       4, image->getImageBuffer());
     } else {
-        ERROR("Failed to load particle image\n");
+        ERROR("Failed to load particle image");
     }
 

trunk/packages/vizservers/nanovis/RenderVertexArray.cpp

@@ -57 +57 @@
         break;
     default:
-        ERROR("unsupported RenderVertexArray type\n");
+        ERROR("unsupported RenderVertexArray type");
         return;
     }
@@ -81 +81 @@
         break;
     default:
-        ERROR("unsupported RenderVertexArray size\n");
+        ERROR("unsupported RenderVertexArray size");
         return;
     }

trunk/packages/vizservers/nanovis/Texture1D.cpp

@@ -105 +105 @@
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max);
 
-    TRACE("max texture size: %d\n", max);
+    TRACE("max texture size: %d", max);
 }
 
@@ -113 +113 @@
     glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max);
 
-    TRACE("max texture units: %d.\n", max);
+    TRACE("max texture units: %d", max);
 }

trunk/packages/vizservers/nanovis/Texture2D.cpp

@@ -135 +135 @@
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max);
         
-    TRACE("max texture size: %d\n", max);
+    TRACE("max texture size: %d", max);
 }
 
@@ -143 +143 @@
     glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max);
 
-    TRACE("max texture units: %d.\n", max);
+    TRACE("max texture units: %d", max);
 }

trunk/packages/vizservers/nanovis/Texture3D.cpp

@@ -145 +145 @@
     glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &max);
 
-    TRACE("max 3d texture size: %d\n", max);
+    TRACE("max 3d texture size: %d", max);
 }
 
@@ -153 +153 @@
     glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max);
 
-    TRACE("max texture units: %d.\n", max);
+    TRACE("max texture units: %d", max);
 }

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (C) 2004-2013  HUBzero Foundation, LLC
+ *
+ * Author: George A. Howlett <gah@purdue.edu>
+ */
 #include <stdio.h>
 #include <stdarg.h>
@@ -9 +14 @@
 #include "Trace.h"
 
-static const char *syslogLevels[] = {
-    "emergency",                        /* System is unusable */
-    "alert",                            /* Action must be taken immediately */
-    "critical",                         /* Critical conditions */
-    "error",                            /* Error conditions */
-    "warning",                          /* Warning conditions */
-    "notice",                           /* Normal but significant condition */
-    "info",                             /* Informational */
-    "debug",                            /* Debug-level messages */
-};
+#define MSG_LEN 2047
 
 void 
-LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
+LogMessage(int priority, const char *funcname,
+           const char *path, int lineNum, const char* fmt, ...)
 {
-#define MSG_LEN (2047)
     char message[MSG_LEN+1];
     const char *s;
@@ -36 +32 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "%s: %s:%d ", 
-                      syslogLevels[priority], s, lineNum);
+    if (priority & LOG_DEBUG) {
+        length = snprintf(message, MSG_LEN, "%s:%d(%s): ", s, lineNum, funcname);
+    } else {
+        length = snprintf(message, MSG_LEN, "%s:%d: ", s, lineNum);
+    }
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';
-    syslog(priority, message, length);
+
+    syslog(priority, "%s", message);
 }
 
@@ -72 +72 @@
         mesg = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT";             break;
     default:
-        TRACE("FB Status: %s: UNKNOWN framebuffer status %u\n", 
+        TRACE("FB Status: %s: UNKNOWN framebuffer status %u", 
                prefix, (unsigned int)status);
         return;
     }
-    TRACE("FB Status: %s: %s\n", prefix, mesg);
+    TRACE("FB Status: %s: %s", prefix, mesg);
 }
 
@@ -102 +102 @@
         mesg = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT";  break;
     default:
-        TRACE("GL Status: %s: Unknown status %d\n", prefix, status);
+        TRACE("GL Status: %s: Unknown status %d", prefix, status);
         return false;
     } 
-    TRACE("GL Status: %s: %s\n", prefix, mesg);
+    TRACE("GL Status: %s: %s", prefix, mesg);
     return false;
 }

trunk/packages/vizservers/nanovis/Trace.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (C) 2004-2013  HUBzero Foundation, LLC
+ *
+ * Author: George A. Howlett <gah@purdue.edu>
+ */
+
 #ifndef __TRACE_H__
 #define __TRACE_H__
@@ -12 +18 @@
 #define AT __FILE__ ":" NEWSTRING(__LINE__)
 
-extern void LogMessage(int priority, const char *fileName, int lineNum,
-                         const char* format, ...);
+extern void LogMessage(int priority, const char *funcname, const char *fileName,
+                       int lineNum, const char* format, ...);
 
-#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
 #endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
-
+#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 extern bool CheckFBO(GLenum *statusPtr);

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -225 +225 @@
     }
     if ((size_t)nValues != (num[0] * num[1] * num[2] * _nComponents)) {
-        TRACE("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d\n",
+        TRACE("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d",
                num[0], num[1], num[2], _nComponents, nValues);
         Tcl_AppendResult(interp, 
@@ -465 +465 @@
     
     if ((axis[0] != 1) || (axis[1] != 0)) {
-        TRACE("reordering data\n");
+        TRACE("reordering data");
         /* Reorder the data into x, y where x varies fastest and so on. */
         size_t y;
@@ -535 +535 @@
                 return false;
             }
-            TRACE("#points=%d\n", npts);
+            TRACE("#points=%d", npts);
             if (npts != nx*ny*nz) {
                 result.addError("inconsistent data: expected %d points"
@@ -683 +683 @@
     dz = lz/(double)(_zNum-1);
 
-    TRACE("lx:%lf ly:%lf lz:%lf dmin:%lf dx:%lf dy:%lf dz:%lf\n", lx, ly, lz, dmin, dx, dy, dz);
+    TRACE("lx:%lf ly:%lf lz:%lf dmin:%lf dx:%lf dy:%lf dz:%lf", lx, ly, lz, dmin, dx, dy, dz);
 
     size_t n = _nComponents * _xNum * _yNum * _zNum;
@@ -734 +734 @@
         }
     }
-    TRACE("getVectorRange: %g %g\n", _magMin, _magMax);
+    TRACE("getVectorRange: %g %g", _magMin, _magMax);
 }
 

trunk/packages/vizservers/nanovis/Vector3.h

@@ -41 +41 @@
     void print() const
     {
-        TRACE("(x:%f, y:%f, z:%f)\n", x, y, z);
+        TRACE("(x:%f, y:%f, z:%f)", x, y, z);
     }
 

trunk/packages/vizservers/nanovis/Vector4.h

@@ -45 +45 @@
     void print() const
     {
-        TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);
+        TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)", x, y, z, w);
     }
 
@@ -140 +140 @@
         }
         // No solution
-        TRACE("No intersection between line and plane\n");
+        TRACE("No intersection between line and plane");
         return false;
     }

trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

@@ -79 +79 @@
                 delete image;
             } else {
-                ERROR("Failed to load arrows image\n");
+                ERROR("Failed to load arrows image");
             }
             delete loader;
         } else {
-            ERROR("Couldn't find loader for arrows image\n");
+            ERROR("Couldn't find loader for arrows image");
         }
     } else {
-        ERROR("Couldn't find arrows image\n");
+        ERROR("Couldn't find arrows image");
     }
 
     GLfloat minMax[2];
     glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, minMax);
-    TRACE("Aliased point size range: %g %g\n", minMax[0], minMax[1]);
+    TRACE("Aliased point size range: %g %g", minMax[0], minMax[1]);
     _maxPointSize = minMax[1];
     glGetFloatv(GL_SMOOTH_POINT_SIZE_RANGE, minMax);
-    TRACE("Smooth point size range: %g %g\n", minMax[0], minMax[1]);
+    TRACE("Smooth point size range: %g %g", minMax[0], minMax[1]);
     _maxPointSize = minMax[1] > _maxPointSize ? minMax[1] : _maxPointSize;
-    TRACE("Max point size: %g\n", _maxPointSize);
-
-    TRACE("Leaving VelocityArrowsSlice constructor\n");
+    TRACE("Max point size: %g", _maxPointSize);
+
+    TRACE("Leaving VelocityArrowsSlice constructor");
 }
 
@@ -301 +301 @@
     }
 
-    TRACE("_vf: %g %g %g\n", _vfXscale,_vfYscale, _vfZscale);
-    TRACE("_maxVelocityScale: %g %g %g\n",
+    TRACE("_vf: %g %g %g", _vfXscale,_vfYscale, _vfZscale);
+    TRACE("_maxVelocityScale: %g %g %g",
           _maxVelocityScale.x, _maxVelocityScale.y, _maxVelocityScale.z);
 
@@ -354 +354 @@
                 double length = vel.length();
                 if (length < 0.0 || length > 1.0) {
-                    TRACE("***vec: (%g, %g, %g) length: %g***\n", vel.x, vel.y, vel.z, length);
+                    TRACE("***vec: (%g, %g, %g) length: %g***", vel.x, vel.y, vel.z, length);
                     continue;
                 }
@@ -519 +519 @@
     _maxVelocityScale.z = (1.0f / _tickCountZ) * 0.8f;
 
-    TRACE("Tick counts: %d %d %d\n", _tickCountX, _tickCountY, _tickCountZ);
+    TRACE("Tick counts: %d %d %d", _tickCountX, _tickCountY, _tickCountZ);
 
     int pointCount = _tickCountX * _tickCountY * _tickCountZ;

trunk/packages/vizservers/nanovis/Volume.cpp

@@ -53 +53 @@
     _isosurface(0)
 {
-    TRACE("Enter Volume(): %dx%dx%d\n", _width, _height, _depth);
+    TRACE("Enter: %dx%dx%d", _width, _height, _depth);
 
     _tex = new Texture3D(_width, _height, _depth, GL_FLOAT, GL_LINEAR, n);
@@ -59 +59 @@
     _data = new float[fcount];
     if (data != NULL) {
-        TRACE("data is copied\n");
+        TRACE("data is copied");
         memcpy(_data, data, fcount * sizeof(float));
         _tex->initialize(_data);
     } else {
-        TRACE("data is null\n");
+        TRACE("data is null");
         memset(_data, 0, sizeof(_width * _height * _depth * _numComponents * 
                                 sizeof(float)));
@@ -80 +80 @@
     addCutplane(3, 0.5f);
 
-    TRACE("Leave Volume()\n");
+    TRACE("Leave");
 }
 
 Volume::~Volume()
 {
-    TRACE("In ~Volume()");
+    TRACE("Enter");
 
     delete [] _data;

trunk/packages/vizservers/nanovis/VolumeInterpolator.cpp

@@ -25 +25 @@
 {
     if (_volumes.size() > 0) {
-        TRACE("\tVolume Interpolation Started\n");
+        TRACE("Volume Interpolation Started");
         _started = true;
     } else {
-        TRACE("\tVolume Interpolation did not get started\n");
+        TRACE("Volume Interpolation NOT Started");
         _started = false;
     }
@@ -34 +34 @@
     gettimeofday(&clock, NULL);
     _startTime = clock.tv_sec + clock.tv_usec/1000000.0;
-    TRACE("End Start - VolumeInterpolator\n");
+    TRACE("Leave");
 }
 
@@ -98 +98 @@
         }
 
-        TRACE("n = %d count = %d\n", n, count);
+        TRACE("n = %d count = %d", n, count);
         if (n >= limit) {
             *key1 = *key2 = limit;
@@ -125 +125 @@
             _volumes[0]->depth() != refPtr->depth() || 
             _volumes[0]->numComponents() != refPtr->numComponents()) {
-            TRACE("The volume should be the same width, height, number of components\n");
+            TRACE("The volume should be the same width, height, number of components");
             return;
         }
@@ -155 +155 @@
         _volume->opacityScale(refPtr->opacityScale());
         _volume->isosurface(0);
-        TRACE("VOL : location %f %f %f\n\tid : %s\n", loc.x, loc.y, loc.z, 
+        TRACE("VOL : location %f %f %f\n\tid : %s", loc.x, loc.y, loc.z, 
                refPtr->name());
     }
     _volumes.push_back(_volume);
-    TRACE("a Volume[%s] is added to VolumeInterpolator\n", refPtr->name());
+    TRACE("a Volume[%s] is added to VolumeInterpolator", refPtr->name());
 }
 

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -129 +129 @@
     float *z_steps = new float[volumes.size()];
 
-    TRACE("start loop %d\n", volumes.size());
+    TRACE("start loop %d", volumes.size());
     for (size_t i = 0; i < volumes.size(); i++) {
         Volume *volPtr = volumes[i];
@@ -145 +145 @@
         Vector3 volScaling = volPtr->getPhysicalScaling();
 
-        TRACE("VOL POS: %g %g %g\n",
+        TRACE("VOL POS: %g %g %g",
               volPos.x, volPos.y, volPos.z);
-        TRACE("VOL SCALE: %g %g %g\n",
+        TRACE("VOL SCALE: %g %g %g",
               volScaling.x, volScaling.y, volScaling.z);
 
@@ -352 +352 @@
         }
     } //iterate all volumes
-    TRACE("end loop\n");
+    TRACE("end loop");
 
     // We sort all the polygons according to their eye-space depth, from
@@ -401 +401 @@
 
 #ifdef notdef
-        TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d z_step=%g avgSD=%g\n", 
+        TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d z_step=%g avgSD=%g", 
               volPtr->name(), volPtr, slice_index, volume_index, z_step, avgSampleDistance);
 #endif

trunk/packages/vizservers/nanovis/config.h

@@ -38 +38 @@
 
 /*
- * Enable render server
- */
-#define XINETD
-
-/*
  * Enable event logging
  */

trunk/packages/vizservers/nanovis/define.h

@@ -25 +25 @@
     switch(status) {                                            \
     case GL_FRAMEBUFFER_COMPLETE_EXT:                           \
-        TRACE("framebuffer complete!\n");                       \
+        TRACE("framebuffer complete!");                         \
         break;                                                  \
     case GL_FRAMEBUFFER_UNSUPPORTED_EXT:                        \
-        TRACE("framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");  \
+        TRACE("framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT");    \
         assert(0);                                              \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:              \
-        TRACE("framebuffer INCOMPLETE_ATTACHMENT\n");           \
+        TRACE("framebuffer INCOMPLETE_ATTACHMENT");             \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:      \
-        TRACE("framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n");  \
+        TRACE("framebuffer FRAMEBUFFER_MISSING_ATTACHMENT");    \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:              \
-        TRACE("framebuffer FRAMEBUFFER_DIMENSIONS\n");          \
+        TRACE("framebuffer FRAMEBUFFER_DIMENSIONS");            \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:                 \
-        TRACE("framebuffer INCOMPLETE_FORMATS\n");              \
+        TRACE("framebuffer INCOMPLETE_FORMATS");                \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:             \
-        TRACE("framebuffer INCOMPLETE_DRAW_BUFFER\n");          \
+        TRACE("framebuffer INCOMPLETE_DRAW_BUFFER");            \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:             \
-        TRACE("framebuffer INCOMPLETE_READ_BUFFER\n");          \
+        TRACE("framebuffer INCOMPLETE_READ_BUFFER");            \
         break;                                                  \
     case GL_FRAMEBUFFER_BINDING_EXT:                            \
-        TRACE("framebuffer BINDING_EXT\n");                     \
+        TRACE("framebuffer BINDING_EXT");                       \
         break;                                                  \
     default:                                                    \
-        ERROR("unknown framebuffer error %d\n", status);        \
+        ERROR("unknown framebuffer error %d", status);          \
         /* programming error; will fail on all hardware */      \
         assert(0);                                              \

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -63 +63 @@
                    std::iostream& fin)
 {
-    TRACE("load_volume_stream %s\n", tag);
+    TRACE("load_volume_stream %s", tag);
 
     Rappture::MeshTri2D xymesh;
@@ -213 +213 @@
     }
 
-    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f\n", 
+    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f", 
           nx, ny, nxy, nz, dx, dy, dz, x0, y0, z0);
 
@@ -257 +257 @@
 #ifdef notdef
                 if (isnan(dval[p])) {
-                    TRACE("Found NAN in input at %d,%d,%d\n", ix, iy, iz);
+                    TRACE("Found NAN in input at %d,%d,%d", ix, iy, iz);
                 }
 #endif
@@ -488 +488 @@
     }
 
-    TRACE("nx = %i ny = %i nz = %i\n", nx, ny, nz);
-    TRACE("x0 = %lg y0 = %lg z0 = %lg\n", x0, y0, z0);
-    TRACE("lx = %lg ly = %lg lz = %lg\n", lx, ly, lz);
-    TRACE("dx = %lg dy = %lg dz = %lg\n", dx, dy, dz);
-    TRACE("dataMin = %lg dataMax = %lg nzero_min = %lg\n",
+    TRACE("nx = %i ny = %i nz = %i", nx, ny, nz);
+    TRACE("x0 = %lg y0 = %lg z0 = %lg", x0, y0, z0);
+    TRACE("lx = %lg ly = %lg lz = %lg", lx, ly, lz);
+    TRACE("dx = %lg dy = %lg dz = %lg", dx, dy, dz);
+    TRACE("dataMin = %lg dataMax = %lg nzero_min = %lg",
           vmin, vmax, nzero_min);
 
@@ -521 +521 @@
     if (volPtr) {
         volPtr->location(Vector3(dx0, dy0, dz0));
-        TRACE("Set volume location to %g %g %g\n", dx0, dy0, dz0);
+        TRACE("Set volume location to %g %g %g", dx0, dy0, dz0);
     }
     return volPtr;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -189 +189 @@
 const float def_eye_z = 2.5f;
 
-#ifndef XINETD
-// Variables for mouse events
-// Last locations mouse events
-static int left_last_x;
-static int left_last_y;
-static int right_last_x;
-static int right_last_y;
-static bool left_down = false;
-static bool right_down = false;
-#endif /*XINETD*/
-
 // Image based flow visualization slice location
 // FLOW
@@ -208 +197 @@
 NanoVis::removeAllData()
 {
-    TRACE("in removeAllData\n");
+    TRACE("Enter");
     if (grid != NULL) {
         TRACE("Deleting grid");
@@ -278 +267 @@
     }
 #endif
+    TRACE("Leave");
 }
 
@@ -480 +470 @@
 doExit(int code)
 {
-    TRACE("in doExit: %d\n", code);
+    TRACE("in doExit: %d", code);
     NanoVis::removeAllData();
 
@@ -489 +479 @@
 #endif
 
-#ifdef XINETD
     NvExitService();
-#endif
 
 #ifdef KEEPSTATS
@@ -507 +495 @@
     int result;
 
-    TRACE("command: '%s'", Tcl_DStringValue(dsPtr));
+#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'", stats.nCommands+1, cmd.c_str());
+#endif
 
     gettimeofday(&tv, NULL);
@@ -524 +517 @@
     stats.cmdTime += finish - start;
     stats.nCommands++;
-    TRACE("leaving executeCommand status=%d\n", result);
+    TRACE("leaving executeCommand status=%d", result);
     return result;
 }
@@ -533 +526 @@
     /* Move the camera and its target by equal amounts along the x and y
      * axes. */
-    TRACE("pan: x=%f, y=%f\n", dx, dy);
+    TRACE("pan: x=%f, y=%f", dx, dy);
 
     cam->x(def_eye_x - dx);
     cam->y(def_eye_y + dy);
-    TRACE("set eye to %f %f\n", cam->x(), cam->y());
+    TRACE("set eye to %f %f", cam->x(), cam->y());
 }
 
@@ -545 +538 @@
     /* Move the camera and its target by equal amounts along the x and y
      * axes. */
-    TRACE("zoom: z=%f\n", z);
+    TRACE("zoom: z=%f", z);
 
     cam->z(def_eye_z / z);
-    TRACE("set cam z to %f\n", cam->z());
+    TRACE("set cam z to %f", cam->z());
 }
 
@@ -628 +621 @@
                       int width, int height, const char *volArg)
 {
-    TRACE("in renderLegend\n");
+    TRACE("Enter");
 
     int old_width = winWidth;
@@ -668 +661 @@
     delete legendTexture;
     legendTexture = NULL;
-    TRACE("leaving renderLegend\n");
+    TRACE("Leave");
     return TCL_OK;
 }
@@ -676 +669 @@
 NanoVis::initOffscreenBuffer()
 {
-    TRACE("in initOffscreenBuffer\n");
+    TRACE("Enter");
     assert(_finalFbo == 0);
     // Initialize a fbo for final display.
@@ -715 +708 @@
     }
 
-    TRACE("leaving initOffscreenBuffer\n");
+    TRACE("Leave");
 }
 
@@ -722 +715 @@
 NanoVis::resizeOffscreenBuffer(int w, int h)
 {
-    TRACE("in resizeOffscreenBuffer(%d, %d)\n", w, h);
+    TRACE("Enter (%d, %d)", w, h);
     if ((w == winWidth) && (h == winHeight)) {
         return;
@@ -732 +725 @@
         fonts->resize(w, h);
     }
-    TRACE("screenBuffer size: %d %d\n", w, h);
+    TRACE("screenBuffer size: %d %d", w, h);
 
     if (screenBuffer != NULL) {
@@ -747 +740 @@
     glDeleteRenderbuffersEXT(1, &_finalDepthRb);
 
-    TRACE("before deleteframebuffers\n");
+    TRACE("before deleteframebuffers");
     glDeleteFramebuffersEXT(1, &_finalFbo);
 
-    TRACE("reinitialize FBO\n");
+    TRACE("reinitialize FBO");
     //Reinitialize final fbo for final display
     glGenFramebuffersEXT(1, &_finalFbo);
@@ -788 +781 @@
     }
 
-    TRACE("change camera\n");
+    TRACE("change camera");
     //change the camera setting
     cam->setScreenSize(0, 0, winWidth, winHeight);
     planeRenderer->setScreenSize(winWidth, winHeight);
 
-    TRACE("leaving resizeOffscreenBuffer(%d, %d)\n", w, h);
+    TRACE("Leave (%d, %d)", w, h);
 }
 
@@ -800 +793 @@
 {
     if (!NvShader::printErrorInfo()) {
-        TRACE("Cg error, exiting...\n");
+        TRACE("Cg error, exiting...");
         doExit(-1);
     }
@@ -808 +801 @@
 {
     // print OpenGL driver information
-    TRACE("-----------------------------------------------------------\n");
-    TRACE("OpenGL version: %s\n", glGetString(GL_VERSION));
-    TRACE("OpenGL vendor: %s\n", glGetString(GL_VENDOR));
-    TRACE("OpenGL renderer: %s\n", glGetString(GL_RENDERER));
-    TRACE("-----------------------------------------------------------\n");
+    TRACE("-----------------------------------------------------------");
+    TRACE("OpenGL version: %s", glGetString(GL_VERSION));
+    TRACE("OpenGL vendor: %s", glGetString(GL_VENDOR));
+    TRACE("OpenGL renderer: %s", glGetString(GL_RENDERER));
+    TRACE("-----------------------------------------------------------");
 
     if (path == NULL) {
-        ERROR("No path defined for shaders or resources\n");
+        ERROR("No path defined for shaders or resources");
         doExit(1);
     }
     GLenum err = glewInit();
     if (GLEW_OK != err) {
-        ERROR("Can't init GLEW: %s\n", glewGetErrorString(err));
+        ERROR("Can't init GLEW: %s", glewGetErrorString(err));
         doExit(1);
     }
-    TRACE("Using GLEW %s\n", glewGetString(GLEW_VERSION));
+    TRACE("Using GLEW %s", glewGetString(GLEW_VERSION));
 
     // OpenGL 2.1 includes VBOs, PBOs, MRT, NPOT textures, point parameters, point sprites,
     // GLSL 1.2, and occlusion queries.
     if (!GLEW_VERSION_2_1) {
-        ERROR("OpenGL version 2.1 or greater is required\n");
+        ERROR("OpenGL version 2.1 or greater is required");
         doExit(1);
     }
@@ -835 +828 @@
     // indirect GLX contexts
     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).\n");
+        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).");
         doExit(1);
     }
@@ -843 +836 @@
     // Framebuffer objects were promoted in 3.0
     if (!GLEW_EXT_framebuffer_object) {
-        ERROR("EXT_framebuffer_oject extension is required\n");
+        ERROR("EXT_framebuffer_oject extension is required");
         doExit(1);
     }
@@ -849 +842 @@
     // FIXME: can use NPOT in place of rectangle textures
     if (!GLEW_ARB_texture_rectangle) {
-        ERROR("ARB_texture_rectangle extension is required\n");
+        ERROR("ARB_texture_rectangle extension is required");
         doExit(1);
     }
@@ -856 +849 @@
     if (!GLEW_ARB_texture_float ||
         !GLEW_ARB_color_buffer_float) {
-        ERROR("ARB_texture_float and ARB_color_buffer_float extensions are required\n");
+        ERROR("ARB_texture_float and ARB_color_buffer_float extensions are required");
         doExit(1);
     }
@@ -863 +856 @@
     if (!GLEW_NV_vertex_program3 ||
         !GLEW_NV_fragment_program2) {
-        ERROR("NV_vertex_program3 and NV_fragment_program2 extensions are required\n");
+        ERROR("NV_vertex_program3 and NV_fragment_program2 extensions are required");
         doExit(1);
     }
 
     if (!R2FilePath::getInstance()->setPath(path)) {
-        ERROR("can't set file path to %s\n", path);
+        ERROR("can't set file path to %s", path);
         doExit(1);
     }
@@ -901 +894 @@
 NanoVis::initGL()
 {
-    TRACE("in initGL\n");
+    TRACE("in initGL");
     //buffer to store data read from the screen
     if (screenBuffer) {
@@ -955 +948 @@
     //assert(glGetError()==0);
 
-    TRACE("leaving initGL\n");
+    TRACE("leaving initGL");
 }
 
@@ -1088 +1081 @@
             sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
 
-        TRACE("Writing %s\n", filename);
+        TRACE("Writing %s", filename);
         f = fopen(filename, "wb");
         if (f == 0) {
-            ERROR("cannot create file\n");
+            ERROR("cannot create file");
         }
     } else {
         f = fopen("/tmp/image.bmp", "wb");
         if (f == 0) {
-            ERROR("cannot create file\n");
+            ERROR("cannot create file");
         }
     }
     if (fwrite(header, SIZEOF_BMP_HEADER, 1, f) != 1) {
-        ERROR("can't write header: short write\n");
+        ERROR("can't write header: short write");
     }
     if (fwrite(screenBuffer, (3*winWidth+pad)*winHeight, 1, f) != 1) {
-        ERROR("can't write data: short write\n");
+        ERROR("can't write data: short write");
     }
     fclose(f);
@@ -1211 +1204 @@
     char header[200];
 
-    TRACE("Enter ppmWrite (%dx%d)\n", winWidth, winHeight);
+    TRACE("Enter (%dx%d)", winWidth, winHeight);
     // Generate the PPM binary file header
     sprintf(header, "P6 %d %d %d\n", winWidth, winHeight, PPM_MAXVAL);
@@ -1246 +1239 @@
     }
     if (writev(1, iov, nRecs) < 0) {
-        ERROR("write failed: %s\n", strerror(errno));
+        ERROR("write failed: %s", strerror(errno));
     }
     free(iov);
     stats.nFrames++;
     stats.nBytes += (bytesPerRow * winHeight);
-    TRACE("Leaving ppmWrite (%dx%d)\n", winWidth, winHeight);
+    TRACE("Leave (%dx%d)", winWidth, winHeight);
 }
 
@@ -1288 +1281 @@
     iov[1].iov_len = dlen;
     if (writev(1, iov, nRecs) < 0) {
-        ERROR("write failed: %s\n", strerror(errno));
+        ERROR("write failed: %s", strerror(errno));
     }
     delete [] iov;
@@ -1298 +1291 @@
 NanoVis::idle()
 {
-    TRACE("in idle()\n");
+    TRACE("Enter");
+
     glutSetWindow(renderWindow);
 
-#ifdef XINETD
-    xinetdListen();
-#else
-    glutPostRedisplay();
-#endif
-    TRACE("leaving idle()\n");
-}
-
-void 
-NanoVis::displayOffscreenBuffer()
-{
-    TRACE("in display_offscreen_buffer\n");
-
-    glEnable(GL_TEXTURE_2D);
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-    glBindTexture(GL_TEXTURE_2D, _finalColorTex);
-
-    glViewport(0, 0, winWidth, winHeight);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    gluOrtho2D(0, winWidth, 0, winHeight);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-
-    glColor3f(1.,1.,1.);                //MUST HAVE THIS LINE!!!
-    glBegin(GL_QUADS);
-    {
-        glTexCoord2f(0, 0); glVertex2f(0, 0);
-        glTexCoord2f(1, 0); glVertex2f(winWidth, 0);
-        glTexCoord2f(1, 1); glVertex2f(winWidth, winHeight);
-        glTexCoord2f(0, 1); glVertex2f(0, winHeight);
-    }
-    glEnd();
-
-    TRACE("leaving display_offscreen_buffer\n");
+    processCommands();
+
+    TRACE("Leave");
 }
 
@@ -1435 +1397 @@
             volInterp->getStartTime();
 
-        TRACE("%lf %lf\n", elapsed_time, 
+        TRACE("%lf %lf", elapsed_time, 
               volInterp->getInterval());
         float fraction;
@@ -1446 +1408 @@
             fraction = f / volInterp->getInterval();
         }
-        TRACE("fraction : %f\n", fraction);
+        TRACE("fraction : %f", fraction);
         volInterp->update(fraction);
     }
@@ -1456 +1418 @@
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
 
-    TRACE("in SetVolumeRanges\n");
+    TRACE("in SetVolumeRanges");
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
@@ -1503 +1465 @@
     }
     Volume::updatePending = false;
-    TRACE("leaving SetVolumeRanges\n");
+    TRACE("leaving SetVolumeRanges");
 }
 
@@ -1511 +1473 @@
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
 
-    TRACE("in setHeightmapRanges\n");
+    TRACE("in setHeightmapRanges");
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
@@ -1564 +1526 @@
     }
     HeightMap::updatePending = false;
-    TRACE("leaving setHeightmapRanges\n");
+    TRACE("leaving setHeightmapRanges");
 }
 
@@ -1570 +1532 @@
 NanoVis::display()
 {
-    TRACE("in display\n");
+    TRACE("Enter");
+
     if (flags & MAP_FLOWS) {
 #ifdef notdef
@@ -1594 +1557 @@
     bindOffscreenBuffer();
 
-    TRACE("in display: glClear\n");
+    TRACE("glClear");
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
 
     if (volumeMode) {
-        TRACE("in display: volumeMode\n");
+        TRACE("volumeMode");
         //3D rendering mode
         glEnable(GL_DEPTH_TEST);
@@ -1659 +1622 @@
 
         if (heightmapTable.numEntries > 0) {
-            TRACE("in display: render heightmap\n");
+            TRACE("render heightmap");
             Tcl_HashEntry *hPtr;
             Tcl_HashSearch iter;
@@ -1681 +1644 @@
     perf->reset();
     CHECK_FRAMEBUFFER_STATUS();
-    TRACE("leaving display\n");
-}
-
-#ifndef XINETD
+    TRACE("Leave");
+}
+
 void 
-NanoVis::mouse(int button, int state, int x, int y)
-{
-    if (button == GLUT_LEFT_BUTTON) {
-        if (state == GLUT_DOWN) {
-            left_last_x = x;
-            left_last_y = y;
-            left_down = true;
-            right_down = false;
-        } else {
-            left_down = false;
-            right_down = false;
-        }
-    } else {
-        //TRACE("right mouse\n");
-
-        if (state == GLUT_DOWN) {
-            //TRACE("right mouse down\n");
-            right_last_x = x;
-            right_last_y = y;
-            left_down = false;
-            right_down = true;
-        } else {
-            //TRACE("right mouse up\n");
-            left_down = false;
-            right_down = false;
-        }
-    }
-}
-
-void
-NanoVis::updateRot(int delta_x, int delta_y)
-{
-    Vector3 angle;
-
-    angle = cam->rotate();
-    angle.x += delta_x;
-    angle.y += delta_y;
-
-    if (angle.x > 360.0) {
-        angle.x -= 360.0;
-    } else if(angle.x < -360.0) {
-        angle.x += 360.0;
-    }
-    if (angle.y > 360.0) {
-        angle.y -= 360.0;
-    } else if(angle.y < -360.0) {
-        angle.y += 360.0;
-    }
-    cam->rotate(angle);
-}
-
-void 
-NanoVis::updateTrans(int delta_x, int delta_y, int delta_z)
-{
-    cam->x(cam->x() + delta_x * 0.03);
-    cam->y(cam->y() + delta_y * 0.03);
-    cam->z(cam->z() + delta_z * 0.03);
-}
-
-void 
-NanoVis::keyboard(unsigned char key, int x, int y)
-{
-#ifdef EVENTLOG
-    if (log) {
-        float param[3];
-        param[0] = cam->x();
-        param[1] = cam->y();
-        param[2] = cam->z();
-        Event* tmp = new Event(EVENT_MOVE, param, NvGetTimeInterval());
-        tmp->write(event_log);
-        delete tmp;
-    }
-#endif
-
-    switch (key) {
-    case 'a': {
-        TRACE("flowvis activated\n");
-        char cmd[] = {
-            "foreach flow [flow names] {\n"
-            "    $flow configure -hide no -slice yes\n"
-            "}\n"
-        };
-        Tcl_Eval(interp, cmd);
-    }
-        break;
-    case 'd': {
-        TRACE("flowvis deactivated\n");
-        char cmd[] = {
-            "foreach flow [flow names] {\n"
-            "    $flow configure -hide yes -slice no\n"
-            "}\n"
-        };
-        Tcl_Eval(interp, cmd);
-    }
-        break;
-    case 'r': {
-        TRACE("flowvis reset\n");
-        char cmd[] = {
-            "flow reset\n"
-        };
-        Tcl_Eval(interp, cmd);
-    }
-        break;
-    }
-}
-
-void 
-NanoVis::motion(int x, int y)
-{
-    int old_x, old_y;
-
-    if (left_down) {
-        old_x = left_last_x;
-        old_y = left_last_y;
-    } else if (right_down) {
-        old_x = right_last_x;
-        old_y = right_last_y;
-    }
-
-    int delta_x = x - old_x;
-    int delta_y = y - old_y;
-
-    //more coarse event handling
-    //if(abs(delta_x)<10 && abs(delta_y)<10)
-    //return;
-
-    if (left_down) {
-        left_last_x = x;
-        left_last_y = y;
-
-        updateRot(-delta_y, -delta_x);
-    } else if (right_down) {
-        //TRACE("right mouse motion (%d,%d)\n", x, y);
-
-        right_last_x = x;
-        right_last_y = y;
-
-        updateTrans(0, 0, delta_x);
-    }
-
-#ifdef EVENTLOG
-    Vector3 angle = cam->rotate();
-    Event* tmp = new Event(EVENT_ROTATE, &angle, NvGetTimeInterval());
-    tmp->write(event_log);
-    delete tmp;
-#endif
-    glutPostRedisplay();
-}
-
-void 
-NanoVis::render()
-{
-    if (licRenderer != NULL) {
-        licRenderer->convolve();
-    }
-
-#ifdef notdef
-    if ((flowVisRenderer != NULL) && (flowVisRenderer->active())) {
-        flowVisRenderer->advect();
-    }
-#endif
-    update();
-    display();
-    glutSwapBuffers();
-}
-
-void 
-NanoVis::resize(int x, int y)
-{
-    glViewport(0, 0, x, y);
-}
-
-#endif /*XINETD*/
-
-void 
-NanoVis::xinetdListen()
+NanoVis::processCommands()
 {
     flags &= ~REDRAW_PENDING;
 
-    TRACE("Enter xinetdListen\n");
+    TRACE("Enter");
 
     int flags = fcntl(0, F_GETFL, 0);
@@ -1887 +1674 @@
         //  here.
         //
-        TRACE("in xinetdListen: EOF=%d\n", feof(NanoVis::stdin));
+        TRACE("EOF=%d", feof(NanoVis::stdin));
         while (!feof(NanoVis::stdin)) {
             int c = fgetc(NanoVis::stdin);
@@ -1940 +1727 @@
             iov[1].iov_len = msgSize;
             if (writev(1, iov, 2) < 0) {
-                ERROR("write failed: %s\n", strerror(errno));
+                ERROR("write failed: %s", strerror(errno));
             }
         }
-        TRACE("Leaving xinetd_listen on ERROR\n");
+        TRACE("Leaving on ERROR");
         return;
     }
@@ -1956 +1743 @@
     display();
 
-#ifdef XINETD
     readScreen();
-#else
-    displayOffscreenBuffer(); //display the final rendering on screen
-    readScreen();
-    glutSwapBuffers();
-#endif
 
     if (feof(NanoVis::stdin)) {
@@ -1968 +1749 @@
     }
 #ifdef DO_RLE
-    do_rle();
+    doRle();
     int sizes[2] = {  offsets_size*sizeof(offsets[0]), rle_size };
-    TRACE("Writing %d,%d\n", sizes[0], sizes[1]); 
+    TRACE("Writing %d,%d", sizes[0], sizes[1]); 
     write(1, &sizes, sizeof(sizes));
     write(1, offsets, offsets_size*sizeof(offsets[0]));
@@ -1977 +1758 @@
     ppmWrite("nv>image -type image -bytes");
 #endif
-    TRACE("Leaving xinetd_listen OK\n");
+    TRACE("Leave");
 }
 
@@ -2006 +1787 @@
     glutIdleFunc(NanoVis::idle);
 
-#ifndef XINETD
-    glutMouseFunc(NanoVis::mouse);
-    glutMotionFunc(NanoVis::motion);
-    glutKeyboardFunc(NanoVis::keyboard);
-    glutReshapeFunc(NanoVis::resize);
-    glutDisplayFunc(NanoVis::render);
-#else
     glutDisplayFunc(NanoVis::display);
     glutReshapeFunc(NanoVis::resizeOffscreenBuffer);
-#endif
 
     while (1) {
@@ -2085 +1858 @@
         // See if we can derive the path from the location of the program.
         // Assume program is in the form <path>/bin/nanovis.
-
-#ifdef XINETD
         path = argv[0];
         p = strrchr((char *)path, '/');
@@ -2094 +1865 @@
         }
         if (p == NULL) {
-            TRACE("path not specified\n");
+            TRACE("path not specified");
             return 1;
         }
@@ -2101 +1872 @@
         sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
         path = newPath;
-#else
-        char buff[256];
-        getcwd(buff, 255);
-        p = strrchr(buff, '/');
-        if (p != NULL) {
-            *p = '\0';
-        }
-        newPath = new char[(strlen(buff) + 15) * 2 + 1];
-        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", buff, buff);
-        path = newPath;
-#endif
     }
 
     R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
 
-#ifdef XINETD
 #ifdef notdef
     signal(SIGPIPE, SIG_IGN);
 #endif
     NvInitService();
-#endif
 
     NanoVis::init(path);

trunk/packages/vizservers/nanovis/nanovis.h

@@ -72 +72 @@
     };
 
-    static void xinetdListen();
+    static void processCommands();
     static void init(const char *path);
     static void initGL();
     static void initOffscreenBuffer();
     static void resizeOffscreenBuffer(int w, int h);
-    static void displayOffscreenBuffer();
     static void display();
     static void draw3dAxis();
@@ -118 +117 @@
 
     static void removeVolume(Volume *volPtr);
-
-#ifndef XINETD
-    static void keyboard(unsigned char key, int x, int y);
-    static void mouse(int button, int state, int x, int y);
-    static void motion(int x, int y);
-    static void updateRot(int delta_x, int delta_y);
-    static void updateTrans(int delta_x, int delta_y, int delta_z);
-    static void resize(int w, int h);
-    static void render();
-#endif
 
     static void readScreen()