MonetDB: malparsing - Exit leakage handling

[Martin Kersten]

Changeset: 68a2aa475062 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68a2aa475062
Modified Files:
        monetdb5/mal/mal.c
        monetdb5/mal/mal_atom.c
        monetdb5/mal/mal_atom.h
        monetdb5/modules/atoms/uuid.c
Branch: malparsing
Log Message:

Exit leakage handling


diffs (66 lines):

diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -35,6 +35,7 @@ int have_hge;
 #include "mal_private.h"
 #include "mal_runtime.h"
 #include "mal_resource.h"
+#include "mal_atom.h"
 
 #ifdef HAVE_LIBXML
 #include <libxml/parser.h>
@@ -168,13 +169,16 @@ void mserver_reset(int exit)
        mal_resource_reset();
        mal_runtime_reset();
        mal_module_reset();
+       mal_atom_reset();
        mdbExit();
        xmlCleanupParser();
+       GDKfree(mal_session_uuid);
 
        memset((char*)monet_cwd,0, sizeof(monet_cwd));
        monet_memory = 0;
        memset((char*)monet_characteristics,0, sizeof(monet_characteristics));
        mal_trace = 0;
+       mal_namespace_reset();
        /* No need to clean up the namespace, it will simply be extended
         * upon restart mal_namespace_reset(); */
        GDKreset(0, exit);      // terminate all other threads
diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c
--- a/monetdb5/mal/mal_atom.c
+++ b/monetdb5/mal/mal_atom.c
@@ -209,3 +209,13 @@ int malAtomSize(int size, int align, cha
        BATatoms[i].align = align;
        return i;
 }
+
+void
+mal_atom_reset(void)
+{
+       int i;
+       for( i = 0; i < GDKatomcnt; i++)
+       if( BATatoms[i].atomNull){
+               // TBD
+       }
+}
diff --git a/monetdb5/mal/mal_atom.h b/monetdb5/mal/mal_atom.h
--- a/monetdb5/mal/mal_atom.h
+++ b/monetdb5/mal/mal_atom.h
@@ -12,5 +12,6 @@
 /* #define MAL_ATOM_DEBUG  */
 
 mal_export int malAtomSize(int size, int align, char *name);
+mal_export void mal_atom_reset(void);
 
 #endif /*  _MAL_ATOM_H*/
diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -81,6 +81,7 @@ void
 UUIDpostlude(void)
 {
        GDKfree(mal_session_uuid);
+       GDKfree(uuid_session);
 }
 
 #define UUIDisnil(x)   (memcmp((x)->u, uuid_nil.u, UUID_SIZE) == 0)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list