Changeset 9e6695d

Timestamp:

Mar 8, 2013, 3:52:01 AM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

1ee4033

Parents:

90a8f2f

Message:

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

Location:

python

Files:

• ext/aubiomodule.c (modified) (1 diff)
• ext/py-filter.c (modified) (3 diffs)
• ext/py-filterbank.c (modified) (3 diffs)
• gen_pyobject.py (modified) (2 diffs)
• tests/test_sink.py (modified) (2 diffs)

python/ext/aubiomodule.c

@@ -165 +165 @@
 
   // 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);

python/ext/py-filter.c

@@ -100 +100 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 
@@ -118 +118 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 
@@ -136 +136 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 

python/ext/py-filterbank.c

@@ -110 +110 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 
@@ -129 +129 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 
@@ -159 +159 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 

python/gen_pyobject.py

@@ -343 +343 @@
       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
@@ -474 +474 @@
     return NULL;
   }
-  return Py_None;
+  Py_RETURN_NONE;
 }
 """ % {'funcname': method_name, 'objname': name, 

python/tests/test_sink.py

@@ -13 +13 @@
     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):
@@ -31 +40 @@
                 print "from", f.uri,
                 print "to", g.uri
+                #del f, g
 
 if __name__ == '__main__':
-  from unittest import main
-  main()
-
+    from unittest import main
+    main()