Changeset 2278 for trunk/packages/vizservers/vtkvis

Timestamp:

Jun 17, 2011 1:14:51 PM (13 years ago)

Author:

ldelgass

Message:

Delete Tcl interpreter and NULL out global pointers before exit to appease
valgrind. The Tcl interpreter namespace teardown still contains some reachable
blocks on exit due to an unmatched Tcl_Preserve, but I'm not sure how to solve
that.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderServer.cpp (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (1 diff)
• RpVtkRendererCmd.h (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -193 +193 @@
     }
 
+    exitTcl(interp);
+    interp = NULL;
+
     delete g_renderer;
+    g_renderer = NULL;
 
     TRACE("Exiting VTKVis Server");

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -2242 +2242 @@
     return interp;
 }
+
+/**
+ * \brief Delete Tcl commands and interpreter
+ *
+ */
+void Rappture::VtkVis::exitTcl(Tcl_Interp *interp)
+{
+
+    Tcl_DeleteCommand(interp, "axis");
+    Tcl_DeleteCommand(interp, "camera");
+    Tcl_DeleteCommand(interp, "colormap");
+    Tcl_DeleteCommand(interp, "contour2d");
+    Tcl_DeleteCommand(interp, "dataset");
+    Tcl_DeleteCommand(interp, "glyphs");
+    Tcl_DeleteCommand(interp, "heightmap");
+    Tcl_DeleteCommand(interp, "legend");
+    Tcl_DeleteCommand(interp, "polydata");
+    Tcl_DeleteCommand(interp, "pseudocolor");
+    Tcl_DeleteCommand(interp, "screen");
+    Tcl_DeleteCommand(interp, "volume");
+
+    Tcl_DeleteInterp(interp);
+}

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.h

@@ -17 +17 @@
 extern int processCommands(Tcl_Interp *interp, FILE *fin, FILE *fout);
 extern Tcl_Interp *initTcl();
+extern void exitTcl(Tcl_Interp *interp);
 
 }