Changeset: 04f19aa4157c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04f19aa4157c
Modified Files:
gdk/gdk.h
gdk/gdk_system_private.h
gdk/gdk_tracer.c
gdk/gdk_tracer.h
monetdb5/modules/mal/tracer.c
Branch: Mar2025
Log Message:
Use a macro to translate tokens to the tracer name space.
diffs (truncated from 412 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1676,8 +1676,8 @@ gdk_export gdk_return GDKtracer_fill_com
#define GDKerror(...) TRC_ERROR(GDK, __VA_ARGS__)
#define GDKsyserr(errno, ...) \
- GDKtracer_log(__FILE__, __func__, __LINE__, TRC_M_ERROR, \
- TRC_GDK, GDKstrerror(errno, (char[64]){0}, 64), \
+ GDKtracer_log(__FILE__, __func__, __LINE__, TRC_NAME(M_ERROR), \
+ TRC_NAME(GDK), GDKstrerror(errno, (char[64]){0}, 64), \
__VA_ARGS__)
#define GDKsyserror(...) GDKsyserr(errno, __VA_ARGS__)
@@ -2377,8 +2377,8 @@ TIMEOUT_ERROR(const QryCtx *qc, const ch
{
const char *e = TIMEOUT_MESSAGE(qc);
if (e) {
- GDKtracer_log(file, func, lineno, TRC_M_ERROR, TRC_GDK, NULL,
- "%s\n", e);
+ GDKtracer_log(file, func, lineno, TRC_NAME(M_ERROR),
+ TRC_NAME(GDK), NULL, "%s\n", e);
}
}
@@ -2549,8 +2549,8 @@ gdk_export size_t sa_size( allocator *sa
size_t _sz = (sz); \
void *_res = sa_alloc(_sa, _sz); \
TRC_DEBUG(ALLOC, \
- "sa_alloc(%p,%zu) -> %p\n", \
- _sa, _sz, _res); \
+ "sa_alloc(%p,%zu) -> %p\n", \
+ _sa, _sz, _res); \
_res; \
})
#define sa_zalloc(sa, sz) \
@@ -2559,8 +2559,8 @@ gdk_export size_t sa_size( allocator *sa
size_t _sz = (sz); \
void *_res = sa_zalloc(_sa, _sz); \
TRC_DEBUG(ALLOC, \
- "sa_zalloc(%p,%zu) -> %p\n", \
- _sa, _sz, _res); \
+ "sa_zalloc(%p,%zu) -> %p\n", \
+ _sa, _sz, _res); \
_res; \
})
#define sa_realloc(sa, ptr, sz, osz) \
@@ -2571,8 +2571,8 @@ gdk_export size_t sa_size( allocator *sa
size_t _osz = (osz); \
void *_res = sa_realloc(_sa, _ptr, _sz, _osz); \
TRC_DEBUG(ALLOC, \
- "sa_realloc(%p,%p,%zu,%zu) -> %p\n", \
- _sa, _ptr, _sz, _osz, _res); \
+ "sa_realloc(%p,%p,%zu,%zu) -> %p\n", \
+ _sa, _ptr, _sz, _osz, _res); \
_res; \
})
#define sa_strdup(sa, s) \
@@ -2581,8 +2581,8 @@ gdk_export size_t sa_size( allocator *sa
const char *_s = (s); \
char *_res = sa_strdup(_sa, _s); \
TRC_DEBUG(ALLOC, \
- "sa_strdup(%p,len=%zu) -> %p\n", \
- _sa, strlen(_s), _res); \
+ "sa_strdup(%p,len=%zu) -> %p\n", \
+ _sa, strlen(_s), _res); \
_res; \
})
#define sa_strndup(sa, s, l) \
@@ -2592,8 +2592,8 @@ gdk_export size_t sa_size( allocator *sa
size_t _l = (l); \
char *_res = sa_strndup(_sa, _s, _l); \
TRC_DEBUG(ALLOC, \
- "sa_strndup(%p,len=%zu) -> %p\n", \
- _sa, _l, _res); \
+ "sa_strndup(%p,len=%zu) -> %p\n", \
+ _sa, _l, _res); \
_res; \
})
#endif
diff --git a/gdk/gdk_system_private.h b/gdk/gdk_system_private.h
--- a/gdk/gdk_system_private.h
+++ b/gdk/gdk_system_private.h
@@ -33,8 +33,9 @@ bool MT_thread_override_limits(void)
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), \
(LPTSTR) _osmsgbuf, sizeof(_osmsgbuf), \
NULL); \
- GDKtracer_log(__FILE__, __func__, __LINE__, TRC_M_ERROR, \
- TRC_GDK, _osmsgbuf, __VA_ARGS__); \
+ GDKtracer_log(__FILE__, __func__, __LINE__, \
+ TRC_NAME(M_ERROR), TRC_NAME(GDK), \
+ _osmsgbuf, __VA_ARGS__); \
SetLastError(0); \
} while (0)
#endif
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -15,9 +15,9 @@
#include "gdk_private.h"
#include "mutils.h"
-#define DEFAULT_ADAPTER TRC_BASIC
-#define DEFAULT_LOG_LEVEL TRC_M_ERROR
-#define DEFAULT_FLUSH_LEVEL TRC_M_DEBUG
+#define DEFAULT_ADAPTER TRC_NAME(BASIC)
+#define DEFAULT_LOG_LEVEL TRC_NAME(M_ERROR)
+#define DEFAULT_FLUSH_LEVEL TRC_NAME(M_DEBUG)
#define FILE_NAME "mdbtrace.log"
@@ -104,7 +104,7 @@ static const char *level_str[] = {
#define GDK_TRACER_RESET_OUTPUT() \
do { \
write_to_tracer = false; \
- for (int i = 0; !write_to_tracer && i < (int)
TRC_COMPONENTS_COUNT; i++) { \
+ for (int i = 0; !write_to_tracer && i < (int)
TRC_NAME(COMPONENTS_COUNT); i++) { \
write_to_tracer = (log_level_t)
ATOMIC_GET(&lvl_per_component[i]) > DEFAULT_LOG_LEVEL; \
} \
} while(0)
@@ -211,22 +211,22 @@ set_level_for_layer(int layer, log_level
}
MT_lock_unset(&GDKtracer_lock);
- for (int i = 0; i < TRC_COMPONENTS_COUNT; i++) {
- if (layer == TRC_MDB_ALL) {
+ for (int i = 0; i < TRC_NAME(COMPONENTS_COUNT); i++) {
+ if (layer == TRC_NAME(MDB_ALL)) {
ATOMIC_SET(&lvl_per_component[i], (ATOMIC_BASE_TYPE)
level);
} else {
tok = component_str[i];
switch (layer) {
- case TRC_SQL_ALL:
+ case TRC_NAME(SQL_ALL):
if (strncmp(tok, "SQL_", 4) == 0)
ATOMIC_SET(&lvl_per_component[i],
(ATOMIC_BASE_TYPE) level);
break;
- case TRC_MAL_ALL:
+ case TRC_NAME(MAL_ALL):
if (strncmp(tok, "MAL_", 4) == 0)
ATOMIC_SET(&lvl_per_component[i],
(ATOMIC_BASE_TYPE) level);
break;
- case TRC_GDK_ALL:
+ case TRC_NAME(GDK_ALL):
if (strncmp(tok, "GDK", 3) == 0)
ATOMIC_SET(&lvl_per_component[i],
(ATOMIC_BASE_TYPE) level);
break;
@@ -244,41 +244,41 @@ static inline adapter_t
find_adapter(const char *adptr)
{
if (adptr == NULL)
- return TRC_ADAPTERS_COUNT;
+ return TRC_NAME(ADAPTERS_COUNT);
- for (int i = 0; i < (int) TRC_ADAPTERS_COUNT; i++) {
+ for (int i = 0; i < (int) TRC_NAME(ADAPTERS_COUNT); i++) {
if (strcasecmp(adapter_str[i], adptr) == 0) {
return (adapter_t) i;
}
}
- return TRC_ADAPTERS_COUNT;
+ return TRC_NAME(ADAPTERS_COUNT);
}
static inline log_level_t
find_level(const char *lvl)
{
if (lvl == NULL)
- return TRC_LOG_LEVELS_COUNT;
+ return TRC_NAME(LOG_LEVELS_COUNT);
- for (int i = 0; i < (int) TRC_LOG_LEVELS_COUNT; i++) {
+ for (int i = 0; i < (int) TRC_NAME(LOG_LEVELS_COUNT); i++) {
if (strcasecmp(level_str[i] + 2, lvl) == 0) {
return (log_level_t) i;
}
}
- return TRC_LOG_LEVELS_COUNT;
+ return TRC_NAME(LOG_LEVELS_COUNT);
}
static inline layer_t
find_layer(const char *layer)
{
if (layer == NULL)
- return TRC_LAYERS_COUNT;
- for (int i = 0; i < (int) TRC_LAYERS_COUNT; i++) {
+ return TRC_NAME(LAYERS_COUNT);
+ for (int i = 0; i < (int) TRC_NAME(LAYERS_COUNT); i++) {
if (strcasecmp(layer_str[i], layer) == 0) {
return (layer_t) i;
}
}
- return TRC_LAYERS_COUNT;
+ return TRC_NAME(LAYERS_COUNT);
}
static inline component_t
@@ -286,14 +286,14 @@ find_component(const char *comp)
{
/* special case for the (currently) three components that end in _ */
if (comp == NULL || *comp == 0 || comp[strlen(comp) - 1] == '_')
- return TRC_COMPONENTS_COUNT;
+ return TRC_NAME(COMPONENTS_COUNT);
- for (int i = 0; i < (int) TRC_COMPONENTS_COUNT; i++) {
+ for (int i = 0; i < (int) TRC_NAME(COMPONENTS_COUNT); i++) {
if (strcasecmp(component_str[i], comp) == 0) {
return (component_t) i;
}
}
- return TRC_COMPONENTS_COUNT;
+ return TRC_NAME(COMPONENTS_COUNT);
}
@@ -321,7 +321,7 @@ reinit(void)
// GDKtracer needs to reopen the file only in
// case the adapter is BASIC
- if ((adapter_t) ATOMIC_GET(&cur_adapter) != TRC_BASIC)
+ if ((adapter_t) ATOMIC_GET(&cur_adapter) != TRC_NAME(BASIC))
return;
if (active_tracer) {
@@ -338,7 +338,7 @@ reinit(void)
gdk_return
GDKtracer_stop(void)
{
- set_level_for_layer(TRC_MDB_ALL, DEFAULT_LOG_LEVEL);
+ set_level_for_layer(TRC_NAME(MDB_ALL), DEFAULT_LOG_LEVEL);
if (active_tracer) {
if (active_tracer != stderr)
fclose(active_tracer);
@@ -355,11 +355,11 @@ GDKtracer_set_component_level(const char
log_level_t level = find_level(lvl);
component_t component = find_component(comp);
- if (level == TRC_LOG_LEVELS_COUNT) {
+ if (level == TRC_NAME(LOG_LEVELS_COUNT)) {
GDKerror("unknown level\n");
return GDK_FAIL;
}
- if (component == TRC_COMPONENTS_COUNT) {
+ if (component == TRC_NAME(COMPONENTS_COUNT)) {
GDKerror("unknown component\n");
return GDK_FAIL;
}
@@ -382,7 +382,7 @@ GDKtracer_get_component_level(const char
{
component_t component = find_component(comp);
- if (component == TRC_COMPONENTS_COUNT) {
+ if (component == TRC_NAME(COMPONENTS_COUNT)) {
GDKerror("unknown component\n");
return NULL;
}
@@ -395,7 +395,7 @@ GDKtracer_reset_component_level(const ch
{
component_t component = find_component(comp);
- if (component == TRC_COMPONENTS_COUNT) {
+ if (component == TRC_NAME(COMPONENTS_COUNT)) {
GDKerror("unknown component\n");
return GDK_FAIL;
}
@@ -413,11 +413,11 @@ GDKtracer_set_layer_level(const char *la
{
layer_t lyr = find_layer(layer);
log_level_t level = find_level(lvl);
- if (level == TRC_LOG_LEVELS_COUNT) {
+ if (level == TRC_NAME(LOG_LEVELS_COUNT)) {
GDKerror("unknown level\n");
return GDK_FAIL;
}
- if (lyr == TRC_LAYERS_COUNT) {
+ if (lyr == TRC_NAME(LAYERS_COUNT)) {
GDKerror("unknown layer\n");
return GDK_FAIL;
}
@@ -431,7 +431,7 @@ gdk_return
GDKtracer_reset_layer_level(const char *layer)
{
layer_t lyr = find_layer(layer);
- if (lyr == TRC_LAYERS_COUNT) {
+ if (lyr == TRC_NAME(LAYERS_COUNT)) {
GDKerror("unknown layer\n");
return GDK_FAIL;
}
@@ -445,7 +445,7 @@ gdk_return
GDKtracer_set_flush_level(const char *lvl)
{
log_level_t level = find_level(lvl);
- if (level == TRC_LOG_LEVELS_COUNT) {
+ if (level == TRC_NAME(LOG_LEVELS_COUNT)) {
GDKerror("unknown level\n");
return GDK_FAIL;
}
@@ -467,7 +467,7 @@ gdk_return
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
