Mercurial > octave-nkf

changeset 14987:65f74f52886c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Memory leaks with matrices in JIT * src/pt-jit.cc (octave_jit_cast_any_matrix): Delete matrix. (octave_jit_cast_matrix_any): Release octave base value. (jit_info::execute): Clear previous variable. * src/pt-jit.h (jit_array::jit_array): Do not grab dimensions. (jit_array::grab_dimensions): Remove method.
author Max Brister <max@2bass.com>
date Tue, 10 Jul 2012 21:25:51 -0500
parents 70ff15b6d996
children 822d52bee973
files src/pt-jit.cc src/pt-jit.h
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/pt-jit.cc	Tue Jul 10 17:14:32 2012 -0500
+++ b/src/pt-jit.cc	Tue Jul 10 21:25:51 2012 -0500
@@ -176,6 +176,7 @@
   octave_value ret (*m->array);
   octave_base_value *rep = ret.internal_rep ();
   rep->grab ();
+  delete m->array;
 
   return rep;
 }
@@ -185,6 +186,7 @@
 {
   NDArray m = obv->array_value ();
   *ret = m;
+  obv->release ();
 }
 
 extern "C" double
@@ -3636,10 +3638,11 @@
     {
       if (arguments[i].second)
         {
-          octave_value current = symbol_table::varval (arguments[i].first);
+          octave_value &current = symbol_table::varref (arguments[i].first);
           octave_base_value *obv = current.internal_rep ();
           obv->grab ();
           real_arguments[i] = obv;
+          current = octave_value ();
         }
     }
 
--- a/src/pt-jit.h	Tue Jul 10 17:14:32 2012 -0500
+++ b/src/pt-jit.h	Tue Jul 10 21:25:51 2012 -0500
@@ -226,7 +226,6 @@
 {
   jit_array (T& from) : array (new T (from))
   {
-    grab_dimensions ();
     update ();
   }
 
@@ -244,11 +243,6 @@
     update ();
   }
 
-  void grab_dimensions (void)
-  {
-    ++(dimensions[-2]);
-  }
-
   operator T () const
   {
     return *array;