MonetDB: tracer - Added GDKtracer to mal_exception

[Thodoris Zois]

Changeset: d7eab262fd6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7eab262fd6a
Modified Files:
        monetdb5/mal/mal_exception.c
        monetdb5/mal/mal_exception.h
Branch: tracer
Log Message:

Added GDKtracer to mal_exception


diffs (44 lines):

diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -13,6 +13,7 @@
 #include "monetdb_config.h"
 #include "mal_exception.h"
 #include "mal_private.h"
+#include "gdk_tracer.h"
 
 static char *exceptionNames[] = {
 /* 0 */        "MALException",
@@ -67,7 +68,7 @@ createExceptionInternal(enum malexceptio
                /* Leave a message behind in the logging system */
                len = snprintf(local, GDKMAXERRLEN, "%s:%s:", 
exceptionNames[type], fcn);
                len = vsnprintf(local + len, GDKMAXERRLEN, format, ap);
-               fprintf(stderr, "%s", local);
+               CRITICAL(M_ALL, "%s\n", local);
                return M5OutOfMemory;   /* last resort */
        }
        len = snprintf(message, GDKMAXERRLEN, "%s:%s:", exceptionNames[type], 
fcn);
@@ -86,9 +87,9 @@ createExceptionInternal(enum malexceptio
        }
        char *q = message;
        for (char *p = strchr(q, '\n'); p; q = p + 1, p = strchr(q, '\n'))
-               fprintf(stderr, "#%s:!ERROR:%.*s\n", MT_thread_getname(), (int) 
(p - q), q);
+               ERROR(M_ALL, "%s: %.*s\n", MT_thread_getname(), (int) (p - q), 
q);
        if (*q)
-               fprintf(stderr, "#%s:!ERROR:%s\n", MT_thread_getname(), q);
+               ERROR(M_ALL, "%s: %.*s\n", MT_thread_getname(), q);
        return message;
 }
 
diff --git a/monetdb5/mal/mal_exception.h b/monetdb5/mal/mal_exception.h
--- a/monetdb5/mal/mal_exception.h
+++ b/monetdb5/mal/mal_exception.h
@@ -10,8 +10,6 @@
 #define _MAL_EXCEPTION_H
 #include "mal_instruction.h"
 
-/* #define _DEBUG_EXCEPTION_           trace the exception handling */
-
 /* These are the exceptions known, adding new ones here requires to also
  * add the "full" name to the exceptionNames array in mal_exception.c */
 enum malexception {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list