Changeset: 70004bd9c9c1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70004bd9c9c1
Modified Files:
MonetDB5/modules/mal/wlc.c
sql/backends/monet5/wlr.c
Branch: gdk-tracer
Log Message:
Minor changes
diffs (60 lines):
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_ALL, "%s\n", msg);
+ 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/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -308,7 +308,7 @@ WLRprocessBatch(void *arg)
snprintf(line,
FILENAME_MAX,"#wlr.process:failed further parsing '%s':",path);
snprintf(wlr_error, FILENAME_MAX, "%.*s",
FILENAME_MAX, line);
INFO(SQL_WLR, "%s\n", line);
- fprintFunction(stderr, mb, 0, LIST_MAL_DEBUG );
+ debugFunction(SQL_WLR, mb, 0, LIST_MAL_DEBUG );
cleanup();
DEBUG(SQL_WLR, "Redo transaction error\n");
continue;
@@ -316,7 +316,7 @@ WLRprocessBatch(void *arg)
q= getInstrPtr(mb, mb->stop - 1);
if( getModuleId(q) != wlrRef){
DEBUG(SQL_WLR, "Unexpected instruction");
- fprintInstruction(stderr, mb, 0, q,
LIST_MAL_ALL);
+ debugInstruction(SQL_WLR, mb, 0, q,
LIST_MAL_ALL);
cleanup();
break;
@@ -358,7 +358,7 @@ WLRprocessBatch(void *arg)
CRITICAL(SQL_WLR, "Allocation
failure while starting the transaction\n");
} else {
DEBUG(SQL_WLR, "Process a
transaction\n");
- fprintFunction(stderr, mb, 0,
LIST_MAL_DEBUG | LIST_MAL_MAPI );
+ debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG | LIST_MAL_MAPI );
wlr_tag = tag; // remember
which transaction we executed
snprintf(wlr_read,
sizeof(wlr_read), "%s", tag_read);
@@ -376,7 +376,7 @@ WLRprocessBatch(void *arg)
if( msg != MAL_SUCCEED){
// they should always
succeed
msg
=createException(MAL,"wlr.process", "batch %d:"LLFMT" :%s\n", i, tag, msg);
- fprintFunction(stderr,
mb, 0, LIST_MAL_DEBUG );
+ debugFunction(SQL_WLR,
mb, 0, LIST_MAL_DEBUG );
if((other =
mvc_rollback(sql,0,NULL, false)) != MAL_SUCCEED) //an error was already
established
GDKfree(other);
} else
@@ -390,7 +390,7 @@ WLRprocessBatch(void *arg)
snprintf(line,
FILENAME_MAX,"#wlr.process:typechecking failed '%s':\n",path);
snprintf(wlr_error, FILENAME_MAX, "%s",
line);
INFO(SQL_WLR, "%s\n", line);
- fprintFunction(stderr, mb, 0,
LIST_MAL_DEBUG );
+ debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG );
}
cleanup();
if ( wlr_tag + 1 == wlc_tag || tag == wlr_limit)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
