shithub: aubio

Info  •  Files  •  Log  •  Branches

python/: use Py_RETURN_NONE, fixing a memory bug triggered after opening many sinks

--- a/python/ext/aubiomodule.c

+++ b/python/ext/aubiomodule.c

@@ -164,7 +164,7 @@

   fvec_min_removal (vec);

   // since this function does not return, we could return None

-  //return Py_None;

+  //Py_RETURN_NONE;

   // however it is convenient to return the modified vector

   return (PyObject *) PyAubio_CFvecToArray(vec);

   // or even without converting it back to an array

--- a/python/ext/py-filter.c

+++ b/python/ext/py-filter.c

@@ -99,7 +99,7 @@

         "error when setting filter to C-weighting");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyObject * 

@@ -117,7 +117,7 @@

         "error when setting filter to A-weighting");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyObject *

@@ -135,7 +135,7 @@

         "error when setting filter with biquad coefficients");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyMemberDef Py_filter_members[] = {

--- a/python/ext/py-filterbank.c

+++ b/python/ext/py-filterbank.c

@@ -109,7 +109,7 @@

         "error when setting filter to A-weighting");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyObject *

@@ -128,7 +128,7 @@

         "error when setting filter to A-weighting");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyObject *

@@ -158,7 +158,7 @@

         "error when setting filter coefficients");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 static PyObject *

--- a/python/gen_pyobject.py

+++ b/python/gen_pyobject.py

@@ -342,7 +342,7 @@

     else:

       returnval += "  return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"

   else:

-    returnval = "  return Py_None;";

+    returnval += "  Py_RETURN_NONE"

   # end of output strings

   return outputvecs, outputcreate, returnval

@@ -473,7 +473,7 @@

         "error running %(funcname)s");

     return NULL;

   }

-  return Py_None;

+  Py_RETURN_NONE;

 }

 """ % {'funcname': method_name, 'objname': name, 

         'out_type': out_type, 'setter_args': setter_args, 'parse_args': parse_args }

--- a/python/tests/test_sink.py

+++ b/python/tests/test_sink.py

@@ -13,6 +13,15 @@

     def setUp(self):

         if not len(list_of_sounds): self.skipTest('add some sound files in \'python/tests/sounds\'')

+    def test_many_sinks(self):

+        for i in range(100):

+            g = sink('/tmp/f.wav', 0)

+            write = 256

+            for n in range(200):

+                vec = fvec(write)

+                g(vec, write)

+            del g

+

     def test_read(self):

         for path in list_of_sounds:

             for samplerate, hop_size in zip([0, 44100, 8000, 32000], [512, 1024, 64, 256]):

@@ -30,8 +39,8 @@

                 print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")",

                 print "from", f.uri,

                 print "to", g.uri

+                #del f, g

 if __name__ == '__main__':

-  from unittest import main

-  main()

-

+    from unittest import main

+    main()