Changeset 773 for vanHelsing/trunk

Timestamp:

Jul 3, 2009, 5:19:08 PM (16 years ago)

Author:

hmueller

Message:

Clibbac now uses Python memory management

Location:

vanHelsing/trunk

Files:

• bconsole.py (modified) (1 diff)
• clib/clibbac.cxx (modified) (2 diffs)
• setup.py (modified) (1 diff)

vanHelsing/trunk/bconsole.py

@@ -44 +44 @@
 }
 
-#import clibbac
+import clibbac
 
 class ConsoleError(IOError):

vanHelsing/trunk/clib/clibbac.cxx

@@ -16 +16 @@
     retlen = strlen(binstr) * 2 + 2;
 
-// TODO replace malloc by python mem handler
-    retbuf = (char *) malloc(retlen);
+    retbuf = (char *) PyMem_Malloc(retlen);
     if (retbuf == NULL)
         return NULL;
@@ -25 +24 @@
 
     result = Py_BuildValue("s", retbuf);
-    free(retbuf);
+    PyMem_Free(retbuf);
 
     return result;

vanHelsing/trunk/setup.py

@@ -10 +10 @@
                     include_dirs = ['bacula_repo/src/'],
                     libraries = ['crypto', 'ssl', 'bac'],
+                    library_dirs = ['build/lib/'],
+                    runtime_library_dirs = ['build/lib/'],
                     )