Changeset: 012c28f2ae0e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=012c28f2ae0e
Modified Files:
gdk/gdk_bat.c
gdk/gdk_imprints.c
gdk/gdk_posix.c
gdk/gdk_tracer.h
gdk/gdk_utils.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/wlc.c
monetdb5/scheduler/run_memo.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/wlr.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
Branch: gdk_tracer
Log Message:
Renamed macro INFO to TRC_INFO and replaced in code
diffs (truncated from 466 to 300 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -449,7 +449,7 @@ BATextend(BAT *b, BUN newcap)
theap_size *= Tsize(b);
if (b->theap.base && GDKdebug & HEAPMASK)
- INFO(BAT_, "HEAPextend in BATextend %s %zu %zu\n",
b->theap.filename, b->theap.size, theap_size);
+ TRC_INFO(BAT_, "HEAPextend in BATextend %s %zu %zu\n",
b->theap.filename, b->theap.size, theap_size);
if (b->theap.base &&
HEAPextend(&b->theap, theap_size, b->batRestricted == BAT_READ) !=
GDK_SUCCEED)
return GDK_FAIL;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -659,7 +659,7 @@ IMPSremove(BAT *b)
if ((GDKdebug & ALGOMASK) &&
* (size_t *) imprints->imprints.base & (1 << 16))
- DEBUG(GDK_IMPRINTS, "Removing persisted imprints\n");
+ TRC_DEBUG(GDK_IMPRINTS, "Removing persisted
imprints\n");
if (HEAPdelete(&imprints->imprints, BBP_physical(b->batCacheid),
"timprints") != GDK_SUCCEED)
TRC_DEBUG(IO_, "IMPSremove(%s): imprints heap\n",
BATgetId(b));
@@ -740,7 +740,7 @@ IMPSprint(BAT *b)
int i;
if (!BATcheckimprints(b)) {
- DEBUG(GDK_IMPRINTS, "No imprint\n");
+ TRC_DEBUG(GDK_IMPRINTS, "No imprint\n");
return;
}
imprints = b->timprints;
@@ -749,33 +749,33 @@ IMPSprint(BAT *b)
max_bins = min_bins + 64;
cnt_bins = max_bins + 64;
- DEBUG(GDK_IMPRINTS,
+ TRC_DEBUG(GDK_IMPRINTS,
"bits = %d, impcnt = " BUNFMT ", dictcnt = " BUNFMT "\n",
imprints->bits, imprints->impcnt, imprints->dictcnt);
- DEBUG(GDK_IMPRINTS, "MIN\n");
+ TRC_DEBUG(GDK_IMPRINTS, "MIN\n");
for (i = 0; i < imprints->bits; i++) {
- DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", min_bins[i]);
+ TRC_DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", min_bins[i]);
}
- DEBUG(GDK_IMPRINTS, "MAX\n");
+ TRC_DEBUG(GDK_IMPRINTS, "MAX\n");
for (i = 0; i < imprints->bits; i++) {
- DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", max_bins[i]);
+ TRC_DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", max_bins[i]);
}
- DEBUG(GDK_IMPRINTS, "COUNT\n");
+ TRC_DEBUG(GDK_IMPRINTS, "COUNT\n");
for (i = 0; i < imprints->bits; i++) {
- DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", cnt_bins[i]);
+ TRC_DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]\n", cnt_bins[i]);
}
for (dcnt = 0, icnt = 0, pages = 1; dcnt < imprints->dictcnt; dcnt++) {
if (d[dcnt].repeat) {
BINSIZE(imprints->bits, IMPSPRNTMASK, " ");
pages += d[dcnt].cnt;
- DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]r %s\n", pages, s);
+ TRC_DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ]r %s\n", pages,
s);
icnt++;
} else {
l = icnt + d[dcnt].cnt;
for (; icnt < l; icnt++) {
BINSIZE(imprints->bits, IMPSPRNTMASK, " ");
- DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ] %s\n",
pages++, s);
+ TRC_DEBUG(GDK_IMPRINTS, "[ " BUNFMT " ] %s\n",
pages++, s);
}
}
}
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -383,7 +383,7 @@ MT_munmap(void *p, size_t len)
GDKsyserror("MT_munmap: munmap(%p,%zu) failed\n",
p, len);
VALGRIND_FREELIKE_BLOCK(p, 0);
- DEBUG(GDK_POSIX, "munmap(%p,%zu) = %d\n", p, len, ret);
+ TRC_DEBUG(GDK_POSIX, "munmap(%p,%zu) = %d\n", p, len, ret);
return ret;
}
@@ -423,13 +423,13 @@ MT_mremap(const char *path, int mode, vo
}
if (path && truncate(path, *new_size) < 0)
ERROR(GDK_POSIX, "MT_mremap(%s): truncate failed\n",
path);
- DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> shrinking\n",
path?path:"NULL", old_address, old_size, *new_size);
+ TRC_DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> shrinking\n",
path?path:"NULL", old_address, old_size, *new_size);
#endif /* !STATIC_CODE_ANALYSIS */
return old_address;
}
if (*new_size == old_size) {
/* do nothing */
- DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> unchanged\n",
path?path:"NULL", old_address, old_size, *new_size);
+ TRC_DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> unchanged\n",
path?path:"NULL", old_address, old_size, *new_size);
return old_address;
}
@@ -663,7 +663,7 @@ MT_mremap(const char *path, int mode, vo
if (fd >= 0)
close(fd);
}
- DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> %p%s\n",
path?path:"NULL", old_address, old_size, *new_size, p, path && mode & MMAP_COPY
? " private" : "");
+ TRC_DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> %p%s\n",
path?path:"NULL", old_address, old_size, *new_size, p, path && mode & MMAP_COPY
? " private" : "");
if (p == MAP_FAILED)
ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu): p == MAP_FAILED\n",
path?path:"NULL", old_address, old_size, *new_size);
return p == MAP_FAILED ? NULL : p;
@@ -677,7 +677,7 @@ MT_msync(void *p, size_t len)
if (ret < 0)
GDKsyserror("MT_msync: msync failed\n");
- DEBUG(GDK_POSIX, "msync(%p,%zu,MS_SYNC) = %d\n", p, len, ret);
+ TRC_DEBUG(GDK_POSIX, "msync(%p,%zu,MS_SYNC) = %d\n", p, len, ret);
return ret;
}
@@ -853,7 +853,7 @@ MT_mremap(const char *path, int mode, vo
MT_munmap(old_address, old_size);
}
- DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> %p\n", path?path:"NULL",
old_address, old_size, *new_size, p);
+ TRC_DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> %p\n",
path?path:"NULL", old_address, old_size, *new_size, p);
if (p == NULL)
ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu): p == NULL\n",
path?path:"NULL", old_address, old_size, *new_size);
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -225,13 +225,10 @@ extern LOG_LEVEL LVL_PER_COMPONENT[COMPO
#define ERROR(COMP, MSG, ...) \
GDK_TRACER_LOG(M_ERROR, COMP, MSG, ## __VA_ARGS__) \
-/* CHECK */
-// This was WARNING but this macro is defined in another file
-// also, included by GDK - Temp fix
-#define MDB_WARNING(COMP, MSG, ...) \
+#define TRC_WARNING(COMP, MSG, ...) \
GDK_TRACER_LOG(M_WARNING, COMP, MSG, ## __VA_ARGS__) \
-#define INFO(COMP, MSG, ...) \
+#define TRC_INFO(COMP, MSG, ...) \
GDK_TRACER_LOG(M_INFO, COMP, MSG, ## __VA_ARGS__) \
#define TRC_DEBUG(COMP, MSG, ...) \
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -893,7 +893,7 @@ GDKreset(int status)
killed = true;
e = MT_kill_thread(victim);
- INFO(GDK_UTILS, "Killing thread: %d\n",
e);
+ TRC_INFO(GDK_UTILS, "Killing thread:
%d\n", e);
(void) ATOMIC_DEC(&GDKnrofthreads);
}
GDKfree(t->name);
@@ -1132,9 +1132,9 @@ doGDKaddbuf(const char *prefix, const ch
}
*dst = '\0';
} else {
- INFO(GDK_UTILS, "%s%.*s%s", prefix, (int) messagelen, message,
suffix);
+ TRC_INFO(GDK_UTILS, "%s%.*s%s", prefix, (int) messagelen,
message, suffix);
}
- INFO(GDK_UTILS, "%s%.*s%s\n",
+ TRC_INFO(GDK_UTILS, "%s%.*s%s\n",
prefix[0] == '#' ? prefix + 1 : prefix,
(int) messagelen, message, suffix);
}
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -691,10 +691,10 @@ static void showFlowEvent(DataFlow flow,
int i;
FlowEvent fe = flow->status;
- INFO(MAL_DATAFLOW, "End of data flow '%d' done '%d'\n", pc, flow->stop
- flow->start);
+ TRC_INFO(MAL_DATAFLOW, "End of data flow '%d' done '%d'\n", pc,
flow->stop - flow->start);
for (i = 0; i < flow->stop - flow->start; i++)
if (fe[i].state != DFLOWwrapup && fe[i].pc >= 0) {
- INFO(MAL_DATAFLOW, "Missed pc %d status %d %d blocks
%d\n", fe[i].state, i, fe[i].pc, fe[i].blocks);
+ TRC_INFO(MAL_DATAFLOW, "Missed pc %d status %d %d
blocks %d\n", fe[i].state, i, fe[i].pc, fe[i].blocks);
debugInstruction(MAL_DATAFLOW, fe[i].flow->mb, 0,
getInstrPtr(fe[i].flow->mb, fe[i].pc), LIST_MAL_MAPI);
}
}
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -569,7 +569,7 @@ str runMALsequence(Client cntxt, MalBlkP
* time and print the query */
if (ATOMIC_CAS(&cntxt->lastprint, &lp, t)) {
const char *q = cntxt->getquery ?
cntxt->getquery(cntxt) : NULL;
- INFO(MAL_INTERPRETER, "%s: query
already running "LLFMT"s: %.200s\n",
+ TRC_INFO(MAL_INTERPRETER, "%s: query
already running "LLFMT"s: %.200s\n",
cntxt->mythread->name,
(lng) (time(0) -
cntxt->lastcmd),
q ? q : "");
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -647,10 +647,10 @@ debugInstruction(COMPONENT comp, MalBlkP
ps = instruction2str(mb, stk, p, flg);
/* ps[strlen(ps)-1] = 0; remove '\n' */
if ( ps ){
- DEBUG(comp, "%s%s\n", (flg & LIST_MAL_MAPI ? "=" : ""), ps);
+ TRC_DEBUG(comp, "%s%s\n", (flg & LIST_MAL_MAPI ? "=" : ""), ps);
GDKfree(ps);
} else {
- DEBUG(comp, "Failed instruction2str()\n");
+ TRC_DEBUG(comp, "Failed instruction2str()\n");
}
/* compiler complains about unused parameter */
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1032,7 +1032,7 @@ SERVERlisten_port(int *ret, int *pid)
str
SERVERstop(void *ret)
{
- INFO(MAL_SERVER, "Server stop\n");
+ TRC_INFO(MAL_SERVER, "Server stop\n");
ATOMIC_SET(&serverexiting, 1);
/* wait until they all exited, but skip the wait if the whole
* system is going down */
diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c
--- a/monetdb5/modules/mal/wlc.c
+++ b/monetdb5/modules/mal/wlc.c
@@ -401,7 +401,7 @@ WLCinit(void)
msg = WLCgetConfig();
if( msg)
- INFO(MAL_WLC, "%s\n", msg);
+ TRC_INFO(MAL_WLC, "%s\n", msg);
if (MT_create_thread(&wlc_logger, WLClogger , (void*) 0,
MT_THR_DETACHED,
"WLClogger") < 0) {
ERROR(MAL_WLC, "Thread could not be spawned\n");
diff --git a/monetdb5/scheduler/run_memo.c b/monetdb5/scheduler/run_memo.c
--- a/monetdb5/scheduler/run_memo.c
+++ b/monetdb5/scheduler/run_memo.c
@@ -177,7 +177,7 @@ RUNchoice(Client cntxt, MalBlkPtr mb, Ma
}
}
- TRC_DEBUG(MAL_MEMO, "Function target '%s' cost: %ld\n", getVarName(mb,
target), mincost);
+ TRC_DEBUG(MAL_MEMO, "Function target '%s' cost: %lld\n", getVarName(mb,
target), mincost);
(void) cntxt;
/* remove non-qualifying variables */
@@ -189,7 +189,7 @@ RUNchoice(Client cntxt, MalBlkPtr mb, Ma
propagateNonTarget(mb, pc + 1);
- TRC_DEBUG(MAL_MEMO, "Cost choice selected: %s %ld\n", getVarName(mb,
target), mincost);
+ TRC_DEBUG(MAL_MEMO, "Cost choice selected: %s %lld\n", getVarName(mb,
target), mincost);
debugFunction(MAL_MEMO, mb, stk, 1);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -99,7 +99,7 @@ print_stmtlist(sql_allocator *sa, stmt *
const char *rnme = table_name(sa, n->data);
const char *nme = column_name(sa, n->data);
- INFO(SQL_RELATION, "%s.%s\n", rnme ? rnme : "(null!)",
nme ? nme : "(null!)");
+ TRC_INFO(SQL_RELATION, "%s.%s\n", rnme ? rnme :
"(null!)", nme ? nme : "(null!)");
}
}
}
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -268,7 +268,7 @@ SQLshutdown_wrap(Client cntxt, MalBlkPtr
if ((msg = CLTshutdown(cntxt, mb, stk, pci)) == MAL_SUCCEED) {
/* administer the shutdown in the system log */
- INFO(SQL_MVC, "Shutdown: %s\n", *getArgReference_str(stk, pci,
0));
+ TRC_INFO(SQL_MVC, "Shutdown: %s\n", *getArgReference_str(stk,
pci, 0));
}
return msg;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -446,7 +446,7 @@ SQLinit(Client c)
MT_lock_unset(&sql_contextLock);
/* CHECK */
// Not sure if this is an info msg
- INFO(SQL_SCENARIO, "%s\n", msg);
+ TRC_INFO(SQL_SCENARIO, "%s\n", msg);
return msg;
}
be = c->sqlcontext;
@@ -562,7 +562,7 @@ SQLinit(Client c)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
