MonetDB: gdk_tracer - Changed the way that exceptions are handle...

[Thodoris Zois]

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

Changed the way that exceptions are handled in tracer.c


diffs (101 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
@@ -29,8 +29,7 @@ static char *exceptionNames[] = {
 /*11 */        "ArithmeticException",
 /*12 */        "PermissionDeniedException",
 /*13 */        "SQLException",
-/*14 */ "TracerException",
-/*15 */        "Deprecated operation",
+/*14 */        "Deprecated operation",
 /*EOE*/        NULL
 };
 
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
@@ -26,8 +26,7 @@ enum malexception {
        PARSE,
        ARITH,
        PERMD,
-       SQL,
-       TRACER
+       SQL
 };
 
 #define MAL_SUCCEED ((str) 0) /* no error */
diff --git a/monetdb5/modules/mal/tracer.c b/monetdb5/modules/mal/tracer.c
--- a/monetdb5/modules/mal/tracer.c
+++ b/monetdb5/modules/mal/tracer.c
@@ -36,7 +36,7 @@ TRACERset_component_level(void *ret, int
     (void) ret;
     GDK_result = GDKtracer_set_component_level(comp_id, lvl_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, ILLEGAL_ARGUMENT); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED; 
 }
@@ -48,7 +48,7 @@ TRACERreset_component_level(void *ret, i
     (void) ret;
     GDK_result = GDKtracer_reset_component_level(comp_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, _OPERATION_FAILED); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " OPERATION_FAILED"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
@@ -60,7 +60,7 @@ TRACERset_layer_level(void *ret, int *la
     (void) ret;
     GDK_result = GDKtracer_set_layer_level(layer_id, lvl_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, ILLEGAL_ARGUMENT); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED; 
 }
@@ -72,7 +72,7 @@ TRACERreset_layer_level(void *ret, int *
     (void) ret;
     GDK_result = GDKtracer_reset_layer_level(layer_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, _OPERATION_FAILED); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " OPERATION_FAILED"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
@@ -84,7 +84,7 @@ TRACERset_flush_level(void *ret, int *lv
     (void) ret;
     GDK_result = GDKtracer_set_flush_level(lvl_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, ILLEGAL_ARGUMENT); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
@@ -95,7 +95,7 @@ TRACERreset_flush_level(void)
 {
     GDK_result = GDKtracer_reset_flush_level();
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, _OPERATION_FAILED); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " OPERATION_FAILED"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
@@ -107,7 +107,7 @@ TRACERset_adapter(void *ret, int *adapte
     (void) ret;
     GDK_result = GDKtracer_set_adapter(adapter_id);
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, ILLEGAL_ARGUMENT); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
@@ -118,7 +118,7 @@ TRACERreset_adapter(void)
 {
     GDK_result = GDKtracer_reset_adapter();
     if(GDK_result == GDK_FAIL)
-        throw(TRACER, __FUNCTION__, _OPERATION_FAILED); 
+        GDK_TRACER_REPORT_EXCEPTION("[%s] " OPERATION_FAILED"\n", 
__FUNCTION__);
 
     return MAL_SUCCEED;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list