Changeset a28dab6 for python/ext/py-source.c

Timestamp:

Apr 18, 2016, 1:18:01 PM (9 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:

59cb451

Parents:

f2caa92

Message:

python/ext/py-source.c: start fixing memory leak (see #49)

File:

• python/ext/py-source.c (modified) (6 diffs)

python/ext/py-source.c

@@ -9 +9 @@
   uint_t channels;
   uint_t hop_size;
+  fvec_t *read_to;
+  fmat_t *mread_to;
 } Py_source;
 
@@ -146 +148 @@
   }
 
+  self->read_to = new_fvec(self->hop_size);
+  self->mread_to = new_fmat (self->channels, self->hop_size);
+
   return 0;
 }
 
-AUBIO_DEL(source)
+static void
+Py_source_del (Py_source *self, PyObject *unused)
+{
+  del_aubio_source(self->o);
+  del_fvec(self->read_to);
+  del_fmat(self->mread_to);
+  self->ob_type->tp_free((PyObject *) self);
+}
+
 
 /* function Py_source_do */
@@ -158 +171 @@
 
   /* output vectors prototypes */
-  fvec_t* read_to;
   uint_t read;
 
@@ -167 +179 @@
 
   /* creating output read_to as a new_fvec of length self->hop_size */
-  read_to = new_fvec (self->hop_size);
   read = 0;
 
 
   /* compute _do function */
-  aubio_source_do (self->o, read_to, &read);
+  aubio_source_do (self->o, self->read_to, &read);
 
   PyObject *outputs = PyList_New(0);
-  PyList_Append( outputs, (PyObject *)PyAubio_CFvecToArray (read_to));
-  //del_fvec (read_to);
+  PyList_Append( outputs, (PyObject *)PyAubio_CFvecToArray (self->read_to));
   PyList_Append( outputs, (PyObject *)PyInt_FromLong (read));
   return outputs;
@@ -188 +198 @@
 
   /* output vectors prototypes */
-  fmat_t* read_to;
   uint_t read;
 
@@ -196 +205 @@
 
 
-  /* creating output read_to as a new_fvec of length self->hop_size */
-  read_to = new_fmat (self->channels, self->hop_size);
+  /* creating output mread_to as a new_fvec of length self->hop_size */
   read = 0;
 
 
   /* compute _do function */
-  aubio_source_do_multi (self->o, read_to, &read);
+  aubio_source_do_multi (self->o, self->mread_to, &read);
 
   PyObject *outputs = PyList_New(0);
-  PyList_Append( outputs, (PyObject *)PyAubio_CFmatToArray (read_to));
-  //del_fvec (read_to);
+  PyList_Append( outputs, (PyObject *)PyAubio_CFmatToArray (self->mread_to));
   PyList_Append( outputs, (PyObject *)PyInt_FromLong (read));
   return outputs;