fixed mem leaks in transforms and agg

jdh2358 · jdh2358 · commit e11f0f981104 · 2004-07-22T03:02:17.000Z
svn path=/trunk/matplotlib/; revision=422
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,13 @@
 New entries should be added at the top
 
+2004-07-21 Applied backend_agg memory leak patch from hayden
+           - jocallo@online.no.  Found and fixed a leak in binary
+	   operations on transforms.  Moral of the story:  never incref
+	   where you meant to decref!- JDH
+
+2004-07-21 Fixed a to string memory allocation bug in agg and image
+           modules - JDH
+
 2004-07-21 Added mpl_connect and mpl_disconnect to matlab interface -
            JDH
 
diff --git a/TODO b/TODO
@@ -469,10 +469,16 @@
 
 -- font dict in wx is broken w/ respect to new font names
 
--- update nav section of tutorial
+-- DONE update nav section of tutorial
 
 -- track down transforms memleak
 
 -- DONE make sure you handle cacheing of rotated mathtext properly
 
-- handle deprecated connect across backends graciously
+-- handle deprecated connect across backends graciously
+
+-- embedding_in_wx3 seems broken with numeric
+
+-- add new connect to API_CHANGES
+
+--port new toolbar to embedding examples
diff --git a/examples/embedding_in_gtk.py b/examples/embedding_in_gtk.py
@@ -2,10 +2,13 @@
 from matplotlib.numerix import arange, sin, pi
 
 import matplotlib
-matplotlib.use('GTK')
+matplotlib.use('GTKAgg')  # or 'GTK'
 
 from matplotlib.axes import Subplot
-from matplotlib.backends.backend_gtk import FigureCanvasGTK
+
+# swith comments for gtk over gtkagg
+#from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
+from matplotlib.backends.backend_gtkagg import FigureCanvasGTKAgg as FigureCanvas
 from matplotlib.figure import Figure
 
 import gtk
@@ -26,7 +29,7 @@
 a.plot(t,s)
 
 
-canvas = FigureCanvasGTK(f)  # a gtk.DrawingArea
+canvas = FigureCanvas(f)  # a gtk.DrawingArea
 vbox.pack_start(canvas)
 
 #button = gtk.Button('Quit')
diff --git a/examples/embedding_in_gtk2.py b/examples/embedding_in_gtk2.py
@@ -2,8 +2,14 @@
 from matplotlib.numerix import arange, sin, pi
 
 import matplotlib
-matplotlib.use('GTK')
-from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
+matplotlib.use('GTKAgg')  # or 'GTK'
+
+# swith comments for gtk over gtkagg
+from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
+#from matplotlib.backends.backend_gtkagg import FigureCanvasGTKAgg as FigureCanvas
+
+# or NavigationToolbar for classic
+from matplotlib.backends.backend_gtk import NavigationToolbar2GTK as NavigationToolbar
 
 from matplotlib.axes import Subplot
 from matplotlib.figure import Figure
@@ -26,11 +32,11 @@
 ax.plot(t,s)
 
 
-canvas = FigureCanvasGTK(fig)  # a gtk.DrawingArea
+canvas = FigureCanvas(fig)  # a gtk.DrawingArea
 canvas.show()
 vbox.pack_start(canvas)
 
-toolbar = NavigationToolbar(canvas, win)
+toolbar = NavigationToolbar(canvas)
 toolbar.show()
 vbox.pack_start(toolbar, gtk.FALSE, gtk.FALSE)
 
diff --git a/examples/embedding_in_wx2.py b/examples/embedding_in_wx2.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 """
-An example of how to use wx or wxagg in an application w. or w/o the toolbar
+An example of how to use wx or wxagg in an application with the new
+toolbar - comment out the setA_toolbar line for no toolbar
 """
 
 from matplotlib.numerix import arange, sin, pi
@@ -14,7 +15,7 @@
 # comment out the following to use wx rather than wxagg
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
-from matplotlib.backends.backend_wx import NavigationToolbarWx as NavigationToolbar
+from matplotlib.backends.backend_wx import NavigationToolbar2Wx
 
 from matplotlib.figure import Figure
 
@@ -34,7 +35,6 @@ def __init__(self):
         s = sin(2*pi*t)
         
         self.axes.plot(t,s)
-
         self.canvas = FigureCanvas(self, -1, self.figure)
 
         self.sizer = wxBoxSizer(wxVERTICAL)
@@ -46,7 +46,7 @@ def __init__(self):
 
 
     def add_toolbar(self):
-        self.toolbar = NavigationToolbar(self.canvas, True)
+        self.toolbar = NavigationToolbar2Wx(self.canvas)
         self.toolbar.Realize()
         if wxPlatform == '__WXMAC__':
             # Mac platform (OSX 10.3, MacPython) does not seem to cope with
diff --git a/examples/embedding_in_wx4.py b/examples/embedding_in_wx4.py
@@ -15,21 +15,21 @@
 # comment out the following to use wx rather than wxagg
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
-from matplotlib.backends.backend_wx import NavigationToolbarWx as NavigationToolbar
+from matplotlib.backends.backend_wx import NavigationToolbar2Wx
 
 from matplotlib.backends.backend_wx import _load_bitmap
 from matplotlib.figure import Figure
 from matplotlib.numerix import rand
 
 from wxPython.wx import *
 
-class MyNavigationToolbar(NavigationToolbar):
+class MyNavigationToolbar(NavigationToolbar2Wx):
     """
     Extend the default wx toolbar with your own event handlers
     """
     ON_CUSTOM = wxNewId()
     def __init__(self, canvas, cankill):
-        NavigationToolbar.__init__(self, canvas, cankill)
+        NavigationToolbar2Wx.__init__(self, canvas)
 
         # for simplicity I'm going to reuse a bitmap from wx, you'll
         # probably want to add your own.
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -969,13 +969,13 @@ RendererAgg::write_png(const Py::Tuple& args)
   info_ptr = png_create_info_struct(png_ptr);
   if (info_ptr == NULL) {
     fclose(fp);
-    png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+    png_destroy_write_struct(&png_ptr, &info_ptr);
     throw Py::RuntimeError("could not create info struct");
   }
   
   if (setjmp(png_ptr->jmpbuf)) {
     fclose(fp);
-    png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+    png_destroy_write_struct(&png_ptr, &info_ptr);
     throw Py::RuntimeError("error building image");
   }
   
@@ -997,7 +997,15 @@ RendererAgg::write_png(const Py::Tuple& args)
   png_write_info(png_ptr, info_ptr);
   png_write_image(png_ptr, row_pointers);
   png_write_end(png_ptr, info_ptr);
-  png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+
+  /* Changed calls to png_destroy_write_struct to follow
+     http://www.libpng.org/pub/png/libpng-manual.txt.  
+     This ensures the info_ptr memory is released.  
+  */
+
+  png_destroy_write_struct(&png_ptr, &info_ptr);
+
+ 
   fclose(fp);
   
   return Py::Object();
@@ -1176,6 +1184,7 @@ RendererAgg::~RendererAgg() {
   delete slineP8;
   delete slineBin;
   delete theRasterizer;
+  delete theRenderer;
   delete rendererBin;
   delete rendererBase;
   delete pixFmt;
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -105,8 +105,8 @@ BinOp::BinOp(LazyValue* lhs, LazyValue* rhs, int opcode) :
 
 BinOp::~BinOp() {
   _VERBOSE("BinOp::~BinOp");
-  Py_INCREF(_lhs);
-  Py_INCREF(_rhs);
+  Py_DECREF(_lhs);
+  Py_DECREF(_rhs);
 }
 
 Py::Object
diff --git a/unit/helpers.py b/unit/helpers.py
@@ -4,9 +4,12 @@
 from matplotlib.transforms import one, Point, Value, Bbox, get_bbox_transform
 
 
+def rand_val(N = 1):
+    if N==1: return Value(rand())
+    else: return [Value(val) for val in rand(N)]
+    
 def rand_point():
-    xy = rand(2)
-    return Point( Value(xy[0]),  Value(xy[1]) )
+    return Point( rand_val(), rand_val() )
 
 def rand_bbox():
     ll = rand_point()
diff --git a/unit/transform_memleak.py b/unit/transform_memleak.py
@@ -1,5 +1,5 @@
 import sys, time, os
-from helpers import rand_transform
+from helpers import rand_val, rand_point, rand_bbox, rand_transform
 
 def report_memory(i):
     pid = os.getpid()
@@ -9,6 +9,14 @@ def report_memory(i):
 
 N = 200
 for i in range(N):
+    v1, v2, v3, v4, v5 = rand_val(5)
+    b1 = v1 + v2
+    b2 = v3 -v4
+    b3 = v1*v2*b2 - b1
+    
+
+    p1 = rand_point()
+    box1 = rand_bbox()
     t = rand_transform()
     val = report_memory(i)
     if i==1: start = val

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ BinOp::BinOp(LazyValue* lhs, LazyValue* rhs, int opcode) :`
`105`	`105`
`106`	`106`	`BinOp::~BinOp() {`
`107`	`107`	`_VERBOSE("BinOp::~BinOp");`
`108`		`- Py_INCREF(_lhs);`
`109`		`- Py_INCREF(_rhs);`
	`108`	`+ Py_DECREF(_lhs);`
	`109`	`+ Py_DECREF(_rhs);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`Py::Object`