Changeset: 267bbffea763 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=267bbffea763
Modified Files:
gdk/gdk_tracer.c
gdk/gdk_tracer.h
Branch: gdk_tracer
Log Message:
Changed logging.showinfo() output message
diffs (58 lines):
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -544,18 +544,28 @@ GDKtracer_show_info(void)
max_width = comp_width;
}
- GDK_TRACER_OSTREAM("# LOG level per component\n");
+
GDK_TRACER_OSTREAM("\n###############################################################\n");
+ GDK_TRACER_OSTREAM("# Available logging levels\n");
+ for(i = 0; i < LOG_LEVELS_COUNT; i++)
+ {
+ GDK_TRACER_OSTREAM("# (%d) %s\n", i, LEVEL_STR[i]);
+ }
+
+ GDK_TRACER_OSTREAM("\n# You can use one of the following layers to
massively set the LOG level\n");
+ for(i = 0; i < LAYERS_COUNT; i++)
+ {
+ GDK_TRACER_OSTREAM("# (%d) %s\n", i, LAYER_STR[i]);
+ }
+
+ GDK_TRACER_OSTREAM("\n# LOG level per component\n");
for(i = 0; i < COMPONENTS_COUNT; i++)
{
space = (int) (max_width - strlen(COMPONENT_STR[i]) + 30);
- GDK_TRACER_OSTREAM("# %s %*s\n", COMPONENT_STR[i], space,
LEVEL_STR[LVL_PER_COMPONENT[i]]);
+ if(i < 10)
+ GDK_TRACER_OSTREAM("# (%d) %s %*s\n", i, COMPONENT_STR[i], space,
LEVEL_STR[LVL_PER_COMPONENT[i]]);
+ else
+ GDK_TRACER_OSTREAM("# (%d) %s %*s\n", i, COMPONENT_STR[i], space,
LEVEL_STR[LVL_PER_COMPONENT[i]]);
}
-
- GDK_TRACER_OSTREAM("# You can use one of the following layers to massively
set the LOG level\n");
- for(i = 0; i < LAYERS_COUNT; i++)
- {
- GDK_TRACER_OSTREAM("# %s\n", LAYER_STR[i]);
- }
-
+
GDK_TRACER_OSTREAM("###############################################################\n");
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -351,8 +351,11 @@ gdk_tracer;
// Produces messages to the output stream. It is also used as a fallback
mechanism
// in case GDKtracer fails to log for whatever reason.
-#define GDK_TRACER_OSTREAM(MSG, ...) \
- mnstr_printf(GDKstdout, MSG, ## __VA_ARGS__); \
+#define GDK_TRACER_OSTREAM(MSG, ...) \
+ do { \
+ mnstr_printf(GDKstdout, MSG, ## __VA_ARGS__); \
+ } while (0) \
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
