Changeset: d1ea3344a0f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1ea3344a0f9
Modified Files:
gdk/gdk_tracer.c
gdk/gdk_tracer.h
monetdb5/modules/mal/tracer.c
monetdb5/scheduler/run_isolate.h
sql/server/rel_distribute.c
Branch: gdk_tracer
Log Message:
Minor
diffs (158 lines):
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -66,7 +66,7 @@ static gdk_return
if(!output_file)
{
- GDK_TRACER_REPORT_EXCEPTION("Failed to initialize BASIC adapter. Could
not open file: %s\n", file_name);
+ GDK_TRACER_EXCEPTION("Failed to initialize BASIC adapter. Could not
open file: %s\n", file_name);
return GDK_FAIL;
}
@@ -145,7 +145,7 @@ static int
if(!tmp)
{
// Let GDKtracer_log to know about the failure
- GDK_TRACER_REPORT_EXCEPTION("Memory allocation failed\n");
+ GDK_TRACER_EXCEPTION("Memory allocation failed\n");
return -1;
}
else
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -345,22 +345,22 @@ gdk_tracer;
* GDKtracer Stream Macros
*/
// Exception
-#define GDK_TRACER_REPORT_EXCEPTION(MSG, ...) \
+#define GDK_TRACER_EXCEPTION(MSG, ...) \
mnstr_printf(GDKstdout, \
- "[%s] " \
- "%-"MXW"s " \
- "%"MXW"s:%d " \
- "%"MXW"s " \
- "%-"MXW"s " \
- "%-"MXW"s # "MSG, \
- GDKtracer_get_timestamp("%Y-%m-%d %H:%M:%S"), \
- __FILENAME__, \
- __FUNCTION__, \
- __LINE__, \
- STR(M_CRITICAL), \
- STR(GDK_TRACER), \
- MT_thread_getname(), \
- ## __VA_ARGS__); \
+ "[%s] " \
+ "%-"MXW"s " \
+ "%"MXW"s:%d " \
+ "%"MXW"s " \
+ "%-"MXW"s " \
+ "%-"MXW"s # "MSG, \
+ GDKtracer_get_timestamp("%Y-%m-%d %H:%M:%S"), \
+ __FILENAME__, \
+ __FUNCTION__, \
+ __LINE__, \
+ STR(M_CRITICAL), \
+ STR(GDK_TRACER), \
+ MT_thread_getname(), \
+ ## __VA_ARGS__); \
#define GDK_TRACER_OSTREAM(MSG, ...) \
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
@@ -33,7 +33,7 @@ TRACERset_component_level(void *ret, int
(void) ret;
GDK_result = GDKtracer_set_component_level(comp_id, lvl_id);
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -45,7 +45,7 @@ TRACERreset_component_level(void *ret, i
(void) ret;
GDK_result = GDKtracer_reset_component_level(comp_id);
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " _OPERATION_FAILED"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " _OPERATION_FAILED"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -57,7 +57,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)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -69,7 +69,7 @@ TRACERreset_layer_level(void *ret, int *
(void) ret;
GDK_result = GDKtracer_reset_layer_level(layer_id);
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " _OPERATION_FAILED"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " _OPERATION_FAILED"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -81,7 +81,7 @@ TRACERset_flush_level(void *ret, int *lv
(void) ret;
GDK_result = GDKtracer_set_flush_level(lvl_id);
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -93,7 +93,7 @@ TRACERreset_flush_level(void *ret)
(void) ret;
GDK_result = GDKtracer_reset_flush_level();
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " _OPERATION_FAILED"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " _OPERATION_FAILED"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -105,7 +105,7 @@ TRACERset_adapter(void *ret, int *adapte
(void) ret;
GDK_result = GDKtracer_set_adapter(adapter_id);
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " ILLEGAL_ARGUMENT"\n", __FUNCTION__);
return MAL_SUCCEED;
}
@@ -117,7 +117,7 @@ TRACERreset_adapter(void *ret)
(void) ret;
GDK_result = GDKtracer_reset_adapter();
if(GDK_result == GDK_FAIL)
- GDK_TRACER_REPORT_EXCEPTION("[%s] " _OPERATION_FAILED"\n",
__FUNCTION__);
+ GDK_TRACER_EXCEPTION("[%s] " _OPERATION_FAILED"\n", __FUNCTION__);
return MAL_SUCCEED;
}
diff --git a/monetdb5/scheduler/run_isolate.h b/monetdb5/scheduler/run_isolate.h
--- a/monetdb5/scheduler/run_isolate.h
+++ b/monetdb5/scheduler/run_isolate.h
@@ -15,5 +15,5 @@
#define DEBUG_RUN_ISOLATION
mal_export str RUNisolation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-#endif /* MAL_RUN_ISOLATION */
+#endif /* _RUN_ISOLATION */
diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c
--- a/sql/server/rel_distribute.c
+++ b/sql/server/rel_distribute.c
@@ -6,7 +6,6 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-/*#define DEBUG*/
#include "monetdb_config.h"
#include "rel_distribute.h"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
