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

Paul Brossier committed 13 years ago

Commit 9e6695d1 parent 90a8f2f5 files · +21 −12Browse files

Showing the changes to python (5 of 5 files). Show all

Unified · Split

5 files

@@ -164,7 +164,7 @@ Py_min_removal(PyObject * self, PyObject * args) · 163 unmodified lines
164	fvec_min_removal (vec);	164	fvec_min_removal (vec);
165		165
166	// since this function does not return, we could return None	166	// since this function does not return, we could return None
167	//return Py_None;	167	//Py_RETURN_NONE;
168	// however it is convenient to return the modified vector	168	// however it is convenient to return the modified vector
169	return (PyObject *) PyAubio_CFvecToArray(vec);	169	return (PyObject *) PyAubio_CFvecToArray(vec);
170	// or even without converting it back to an array	170	// or even without converting it back to an array

@@ -99,7 +99,7 @@ Py_filter_set_c_weighting (Py_filter * self, PyObject *args) · 98 unmodified lines
99	"error when setting filter to C-weighting");	99	"error when setting filter to C-weighting");
100	return NULL;	100	return NULL;
101	}	101	}
102	return Py_None;	102	Py_RETURN_NONE;
103	}	103	}
104		104
105	static PyObject *	105	static PyObject *
@@ -117,7 +117,7 @@ Py_filter_set_a_weighting (Py_filter * self, PyObject *args) · 11 unmodified lines
117	"error when setting filter to A-weighting");	117	"error when setting filter to A-weighting");
118	return NULL;	118	return NULL;
119	}	119	}
120	return Py_None;	120	Py_RETURN_NONE;
121	}	121	}
122		122
123	static PyObject *	123	static PyObject *
@@ -135,7 +135,7 @@ Py_filter_set_biquad(Py_filter * self, PyObject *args) · 11 unmodified lines
135	"error when setting filter with biquad coefficients");	135	"error when setting filter with biquad coefficients");
136	return NULL;	136	return NULL;
137	}	137	}
138	return Py_None;	138	Py_RETURN_NONE;
139	}	139	}
140		140
141	static PyMemberDef Py_filter_members[] = {	141	static PyMemberDef Py_filter_members[] = {

@@ -109,7 +109,7 @@ Py_filterbank_set_triangle_bands (Py_filterbank * self, PyObject *args) · 108 unmodified lines
109	"error when setting filter to A-weighting");	109	"error when setting filter to A-weighting");
110	return NULL;	110	return NULL;
111	}	111	}
112	return Py_None;	112	Py_RETURN_NONE;
113	}	113	}
114		114
115	static PyObject *	115	static PyObject *
@@ -128,7 +128,7 @@ Py_filterbank_set_mel_coeffs_slaney (Py_filterbank * self, PyObject *args) · 12 unmodified lines
128	"error when setting filter to A-weighting");	128	"error when setting filter to A-weighting");
129	return NULL;	129	return NULL;
130	}	130	}
131	return Py_None;	131	Py_RETURN_NONE;
132	}	132	}
133		133
134	static PyObject *	134	static PyObject *
@@ -158,7 +158,7 @@ Py_filterbank_set_coeffs (Py_filterbank * self, PyObject *args) · 23 unmodified lines
158	"error when setting filter coefficients");	158	"error when setting filter coefficients");
159	return NULL;	159	return NULL;
160	}	160	}
161	return Py_None;	161	Py_RETURN_NONE;
162	}	162	}
163		163
164	static PyObject *	164	static PyObject *

@@ -342,7 +342,7 @@ def gen_do_output_params(outputparams, name): · 341 unmodified lines
342	else:	342	else:
343	returnval += " return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"	343	returnval += " return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
344	else:	344	else:
345	returnval = " return Py_None;";	345	returnval += " Py_RETURN_NONE"
346	# end of output strings	346	# end of output strings
347	return outputvecs, outputcreate, returnval	347	return outputvecs, outputcreate, returnval
348		348
@@ -473,7 +473,7 @@ Py%(funcname)s (Py_%(objname)s self, PyObject args) · 124 unmodified lines
473	"error running %(funcname)s");	473	"error running %(funcname)s");
474	return NULL;	474	return NULL;
475	}	475	}
476	return Py_None;	476	Py_RETURN_NONE;
477	}	477	}
478	""" % {'funcname': method_name, 'objname': name,	478	""" % {'funcname': method_name, 'objname': name,
479	'out_type': out_type, 'setter_args': setter_args, 'parse_args': parse_args }	479	'out_type': out_type, 'setter_args': setter_args, 'parse_args': parse_args }

     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]):
                 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
+    from unittest import main
-  main()
+    main()

Keyboard shortcuts