octave-lojdl: src/mex.cc comparison

comparison src/mex.cc @ 5905:e5c0831a48bd

[project @ 2006-07-26 19:27:48 by jwe]

author	jwe
date	Wed, 26 Jul 2006 19:27:48 +0000
parents	11bb9bf343a0
children	288c341438f9

comparison

equal deleted inserted replaced

-:80d3933fb8b6
+:e5c0831a48bd
 #include "unwind-prot.h"
 #include "utils.h"
 #include "variables.h"
 // #define DEBUG 1
+static void
+xfree (void *ptr)
+{
+#ifdef DEBUG
+std::cerr << "free: " << ptr << std::endl;
+#endif
+::free (ptr);
+}
 static int
 max_str_len (int m, const char **str)
 {
 int max_len = 0;
 mxFree (fields);
 int ntot = nfields * get_number_of_elements ();
 for  (int i = 0; i < ntot; i++)
-mxDestroyArray (data[i]);
+delete data[i];
 mxFree (data);
 }
 octave_value as_octave_value (void) const
 ~mxArray_cell (void)
 {
 int nel = get_number_of_elements ();
 for  (int i = 0; i < nel; i++)
-mxDestroyArray (data[i]);
+delete data[i];
 mxFree (data);
 }
 octave_value as_octave_value (void) const
 mex (void) : memlist (), arraylist (), fname (0) { }
 ~mex (void)
 {
 if (! memlist.empty ())
-error ("mex: cleanup failed");
+error ("mex: %s: cleanup failed", function_name ());
 mxFree (fname);
 }
 const char *function_name (void) const
 // Free all unmarked pointers obtained from malloc and calloc.
 static void cleanup (void *ptr)
 {
 mex *context = static_cast<mex *> (ptr);
+// We can't use mex::free here because it modifies memlist.
 for (std::set<void *>::iterator p = context->memlist.begin ();
 	 p != context->memlist.end (); p++)
-context->free (*p);
+{
+	if (*p)
+	  {
+	    context->unmark (*p);
+	    xfree (*p);
+	  }
+}
+context->memlist.clear ();
+// We can't use mex::free_value here because it modifies arraylist.
 for (std::set<mxArray *>::iterator p = context->arraylist.begin ();
 	 p != context->arraylist.end (); p++)
-context->free_value (*p);
+delete *p;
+context->arraylist.clear ();
 }
 // allocate a pointer, and mark it to be freed on exit
 void *malloc_unmarked (size_t n)
 {
 if (! ptr)
 {
 	// FIXME -- could use "octave_new_handler();" instead
 	error ("%s: failed to allocate %d bytes of memory",
-	       mexFunctionName (), n);
+	       function_name (), n);
 	abort ();
 }
 global_mark (ptr);
 	if (p != global_memlist.end ())
 	  {
 	    global_memlist.erase (p);
-#ifdef DEBUG
+	    xfree (ptr);
-	    std::cerr << "free: " << ptr << std::endl;
-#endif
-	    ::free (ptr);
 	  }
 	else
 	  warning ("mxFree: skipping memory not allocated by mxMalloc, mxCalloc, or mxRealloc");
 }
 }
 }
 // Free an array and its contents.
 void free_value (mxArray *ptr)
 {
-arraylist.erase (ptr);
+std::set<mxArray *>::iterator p = arraylist.find (ptr);
-delete ptr;
+if (p != arraylist.end ())
+{
+	arraylist.erase (p);
+	delete ptr;
+}
+#ifdef DEBUG
+else
+warning ("mex::free_value: skipping memory not allocated by mex::make_value");
+#endif
 }
 // Mark an array and its contents so it will not be freed on exit.
 void persistent (mxArray *ptr)
 {
 // Mark a pointer to be freed on exit.
 void mark (void *p)
 {
 #ifdef DEBUG
 if (memlist.find (p) != memlist.end ())
-warning ("%s: double registration ignored", mexFunctionName ());
+warning ("%s: double registration ignored", function_name ());
 #endif
 memlist.insert (p);
 }
 // Unmark a pointer to be freed on exit, either because it was
 // made persistent, or because it was already freed.
-void unmark (void *p)
+void unmark (void *ptr)
 {
+std::set<void *>::iterator p = memlist.find (ptr);
+if (p != memlist.end ())
+memlist.erase (p);
 #ifdef DEBUG
-if (memlist.find (p) != memlist.end ())
+else
-warning ("%s: value not marked", mexFunctionName ());
+warning ("%s: value not marked", function_name ());
 #endif
-memlist.erase (p);
 }
 // List of memory resources we allocated.
 static std::set<void *> global_memlist;
 // Mark a pointer as one we allocated.
-void global_mark (void *p)
+void global_mark (void *ptr)
 {
 #ifdef DEBUG
-if (global_memlist.find (p) != global_memlist.end ())
+if (global_memlist.find (ptr) != global_memlist.end ())
-warning ("%s: double registration ignored", mexFunctionName ());
+warning ("%s: double registration ignored", function_name ());
 #endif
-global_memlist.insert (p);
+global_memlist.insert (ptr);
 }
 // Unmark a pointer as one we allocated.
-void global_unmark (void *p)
+void global_unmark (void *ptr)
 {
+std::set<void *>::iterator p = global_memlist.find (ptr);
+if (p != global_memlist.end ())
+global_memlist.erase (p);
 #ifdef DEBUG
-if (global_memlist.find (p) != global_memlist.end ())
+else
-warning ("%s: value not marked", mexFunctionName ());
+warning ("%s: value not marked", function_name ());
 #endif
-global_memlist.erase (p);
 }
 };
 // List of memory resources we allocated.
 std::set<void *> mex::global_memlist;
 int nout = nargout == 0 ? 1 : nargout;
 OCTAVE_LOCAL_BUFFER (mxArray *, argout, nout);
 for (int i = 0; i < nout; i++)
 argout[i] = 0;
+unwind_protect::begin_frame ("call_mex");
+// Save old mex pointer.
+unwind_protect_ptr (mex_context);
 mex context;
 unwind_protect::add (mex::cleanup, static_cast<void *> (&context));
 for (int i = 0; i < nargin; i++)
 argin[i] = context.make_value (args(i));
-// Save old mex pointer.
-unwind_protect_ptr (mex_context);
 if (setjmp (context.jump) == 0)
 {
 mex_context = &context;
 	  cmex_fptr fcn = FCN_PTR_CAST (cmex_fptr, f);
 	  fcn (nargout, argout, nargin, argin);
 	}
 }
-// Restore old mex pointer.
-unwind_protect::run ();
 // Convert returned array entries back into octave values.
 octave_value_list retval;
 	    }
 	}
 }
 // Clean up mex resources.
-unwind_protect::run ();
+unwind_protect::run_frame ("call_mex");
 return retval;
 }
 octave_value_list
 {
 if (mex_context)
 {
 const char *fname = mexFunctionName ();
-if (mex_lock_count.find (fname) == mex_lock_count.end ())
+std::map<std::string,int>::iterator p = mex_lock_count.find (fname);
+if (p == mex_lock_count.end ())
 	warning ("mexUnlock: funtion `%s' is not locked", fname);
 else
 	{
 	  int count = --mex_lock_count[fname];
 	  if (count == 0)
 	    {
 	      munlock (fname);
-	      mex_lock_count.erase (fname);
+	      mex_lock_count.erase (p);
 	    }
 	}
 }
 }

Mercurial > hg > octave-lojdl

comparison src/mex.cc @ 5905:e5c0831a48bd