Changeset: a9fcc68cb526 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9fcc68cb526
Modified Files:
gdk/gdk_logger.c
Branch: mlogger
Log Message:
Added Tracer -> gdk_logger.c
diffs (truncated from 679 to 300 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -57,6 +57,7 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_logger.h"
+#include "gdk_tracer.h"
#include <string.h>
/*
@@ -179,7 +180,7 @@ logbat_new(int tt, BUN size, role_t role
if (role == PERSISTENT)
BATmode(nb, false);
} else {
- fprintf(stderr, "!ERROR: logbat_new: creating new
BAT[void:%s]#" BUNFMT " failed\n", ATOMname(tt), size);
+ Trace(M_ERROR, "creating new BAT[void:%s]#" BUNFMT " failed\n",
ATOMname(tt), size);
}
return nb;
}
@@ -201,7 +202,7 @@ log_write_format(logger *l, logformat *d
mnstr_writeLng(l->log, data->nr) &&
mnstr_writeInt(l->log, data->tid))
return GDK_SUCCEED;
- fprintf(stderr, "!ERROR: log_write_format: write failed\n");
+ Trace(M_ERROR, "write failed\n");
return GDK_FAIL;
}
@@ -214,7 +215,7 @@ log_read_string(logger *l)
assert(!l->inmemory);
if (mnstr_readInt(l->log, &len) != 1) {
- fprintf(stderr, "!ERROR: log_read_string: read failed\n");
+ Trace(M_ERROR, "read failed\n");
//MK This leads to non-repeatable log structure?
return NULL;
}
@@ -222,14 +223,14 @@ log_read_string(logger *l)
return NULL;
buf = GDKmalloc(len);
if (buf == NULL) {
- fprintf(stderr, "!ERROR: log_read_string: malloc failed\n");
+ Trace(M_ERROR, "malloc failed\n");
/* this is bad */
return (char *) -1;
}
if ((nr = mnstr_read(l->log, buf, 1, len)) != (ssize_t) len) {
buf[len - 1] = 0;
- fprintf(stderr, "!ERROR: log_read_string: couldn't read name
(%s) %zd\n", buf, nr);
+ Trace(M_ERROR, "couldn't read name (%s) %zd\n", buf, nr);
GDKfree(buf);
return NULL;
}
@@ -247,7 +248,7 @@ log_write_string(logger *l, const char *
assert(len <= INT_MAX);
if (!mnstr_writeInt(l->log, (int) len) ||
mnstr_write(l->log, n, 1, len) != (ssize_t) len) {
- fprintf(stderr, "!ERROR: log_write_string: write failed\n");
+ Trace(M_ERROR, "write failed\n");
return GDK_FAIL;
}
return GDK_SUCCEED;
@@ -257,7 +258,7 @@ static log_return
log_read_clear(logger *lg, trans *tr, char *name, char tpe, oid id)
{
if (lg->debug & 1)
- fprintf(stderr, "#logger found log_read_clear %s\n", NAME(name,
tpe, id));
+ Trace(M_DEBUG, "logger found %s\n", NAME(name, tpe, id));
if (tr_grow(tr) != GDK_SUCCEED)
return LOG_ERR;
tr->changes[tr->nr].type = LOG_CLEAR;
@@ -292,7 +293,7 @@ la_bat_clear(logger *lg, logaction *la)
BAT *b;
if (lg->debug & 1)
- fprintf(stderr, "#la_bat_clear %s\n", NAME(la->name, la->tpe,
la->cid));
+ Trace(M_DEBUG, "la_bat_clear %s\n", NAME(la->name, la->tpe,
la->cid));
/* do we need to skip these old updates */
if (avoid_snapshot(lg, bid))
@@ -319,7 +320,7 @@ log_read_seq(logger *lg, logformat *l)
assert(!lg->inmemory);
assert(l->nr <= (lng) INT_MAX);
if (mnstr_readLng(lg->log, &val) != 1) {
- fprintf(stderr, "!ERROR: log_read_seq: read failed\n");
+ Trace(M_ERROR, "read failed\n");
return LOG_EOF;
}
@@ -349,7 +350,7 @@ log_write_id(logger *l, char tpe, oid id
if (mnstr_writeChr(l->log, tpe) &&
mnstr_writeLng(l->log, lid))
return GDK_SUCCEED;
- fprintf(stderr, "!ERROR: log_write_id: write failed\n");
+ Trace(M_ERROR, "write failed\n");
return GDK_FAIL;
}
@@ -361,7 +362,7 @@ log_read_id(logger *lg, char *tpe, oid *
assert(!lg->inmemory);
if (mnstr_readChr(lg->log, tpe) != 1 ||
mnstr_readLng(lg->log, &lid) != 1) {
- fprintf(stderr, "!ERROR: log_read_id: read failed\n");
+ Trace(M_ERROR, "read failed\n");
return LOG_EOF;
}
*id = (oid)lid;
@@ -482,7 +483,7 @@ log_read_updates(logger *lg, trans *tr,
assert(!lg->inmemory);
if (lg->debug & 1)
- fprintf(stderr, "#logger found log_read_updates %s %s " LLFMT
"\n", name, l->flag == LOG_INSERT ? "insert" : "update", l->nr);
+ Trace(M_DEBUG, "logger found %s %s " LLFMT "\n", name, l->flag
== LOG_INSERT ? "insert" : "update", l->nr);
if (b) {
ht = TYPE_void;
@@ -770,7 +771,7 @@ log_read_create(logger *lg, trans *tr, c
assert(!lg->inmemory);
if (lg->debug & 1)
- fprintf(stderr, "#log_read_create %s\n", name);
+ Trace(M_DEBUG, "log_read_create %s\n", name);
if (buf == NULL)
return LOG_EOF;
@@ -779,7 +780,7 @@ log_read_create(logger *lg, trans *tr, c
ha = buf;
ta = strchr(buf, ',');
if (ta == NULL) {
- fprintf(stderr, "!ERROR: log_read_create: inconsistent data
read\n");
+ Trace(M_ERROR, "inconsistent data read\n");
return LOG_ERR;
}
*ta++ = 0; /* skip over , */
@@ -1009,7 +1010,7 @@ tr_abort(logger *lg, trans *tr)
int i;
if (lg->debug & 1)
- fprintf(stderr, "#tr_abort\n");
+ Trace(M_DEBUG, "tr_abort\n");
for (i = 0; i < tr->nr; i++)
la_destroy(&tr->changes[i]);
@@ -1022,7 +1023,7 @@ tr_commit(logger *lg, trans *tr)
int i;
if (lg->debug & 1)
- fprintf(stderr, "#tr_commit\n");
+ Trace(M_DEBUG, "tr_commit\n");
for (i = 0; i < tr->nr; i++) {
if (la_apply(lg, &tr->changes[i]) != GDK_SUCCEED) {
@@ -1053,11 +1054,11 @@ logger_open(logger *lg)
}
len = snprintf(id, sizeof(id), LLFMT, lg->id);
if (len == -1 || len >= BUFSIZ) {
- fprintf(stderr, "!ERROR: logger_open: filename is too large\n");
+ Trace(M_ERROR, "filename is too large\n");
return GDK_FAIL;
}
if (!(filename = GDKfilepath(BBPselectfarm(PERSISTENT, 0, offheap),
lg->dir, LOGFILE, id))) {
- fprintf(stderr, "!ERROR: logger_open: allocation failure\n");
+ Trace(M_ERROR, "allocation failure\n");
return GDK_FAIL;
}
@@ -1069,7 +1070,7 @@ logger_open(logger *lg)
lg->end = 0;
if (lg->log == NULL || mnstr_errnr(lg->log)) {
- fprintf(stderr, "!ERROR: logger_open: creating %s failed\n",
filename);
+ Trace(M_ERROR, "creating %s failed\n", filename);
GDKfree(filename);
return GDK_FAIL;
}
@@ -1100,7 +1101,7 @@ logger_readlog(logger *lg, char *filenam
GDKdebug &= ~(CHECKMASK|PROPMASK);
if (lg->debug & 1) {
- fprintf(stderr, "#logger_readlog opening %s\n", filename);
+ Trace(M_DEBUG, "opening %s\n", filename);
}
lg->log = open_rstream(filename);
@@ -1129,7 +1130,7 @@ logger_readlog(logger *lg, char *filenam
break;
}
if ((fd = getFileNo(lg->log)) < 0 || fstat(fd, &sb) < 0) {
- fprintf(stderr, "!ERROR: logger_readlog: fstat on opened file
%s failed\n", filename);
+ Trace(M_ERROR, "fstat on opened file %s failed\n", filename);
close_stream(lg->log);
lg->log = NULL;
GDKdebug = dbg;
@@ -1173,14 +1174,13 @@ logger_readlog(logger *lg, char *filenam
if (lg->debug & 1) {
fprintf(stderr, "#logger_readlog: ");
if (l.flag > 0 &&
- l.flag < (char) (sizeof(log_commands) /
sizeof(log_commands[0])))
- fprintf(stderr, "%s", log_commands[(int)
l.flag]);
- else
- fprintf(stderr, "%d", l.flag);
- fprintf(stderr, " %d " LLFMT, l.tid, l.nr);
- if (name)
- fprintf(stderr, " %s", name);
- fprintf(stderr, "\n");
+ l.flag < (char) (sizeof(log_commands) /
sizeof(log_commands[0]))) {
+ Trace(M_DEBUG, "logger_readlog %s %d " LLFMT "
%s\n",
+ log_commands[(int) l.flag], l.tid,
l.nr, (name ? name : " "));
+ } else {
+ Trace(M_DEBUG, "logger_readlog %d %d " LLFMT "
%s\n",
+ l.flag, l.tid, l.nr, (name ? name : "
"));
+ }
}
/* find proper transaction record */
if (l.flag != LOG_START)
@@ -1203,7 +1203,7 @@ logger_readlog(logger *lg, char *filenam
break;
}
if (lg->debug & 1)
- fprintf(stderr, "#logger tstart %d\n", tr->tid);
+ Trace(M_DEBUG, "logger tstart %d\n", tr->tid);
break;
case LOG_END:
if (tr == NULL)
@@ -1325,7 +1325,7 @@ logger_readlogs(logger *lg, FILE *fp, ch
assert(!lg->inmemory);
if (lg->debug & 1) {
- fprintf(stderr, "#logger_readlogs logger id is " LLFMT "\n",
lg->id);
+ Trace(M_DEBUG, "logger id is " LLFMT "\n", lg->id);
}
if (fgets(id, sizeof(id), fp) != NULL) {
@@ -1333,7 +1333,7 @@ logger_readlogs(logger *lg, FILE *fp, ch
lng lid = strtoll(id, NULL, 10);
if (lg->debug & 1) {
- fprintf(stderr, "#logger_readlogs last logger id
written in %s is " LLFMT "\n", filename, lid);
+ Trace(M_DEBUG, "last logger id written in %s is " LLFMT
"\n", filename, lid);
}
if (lid >= lg->id) {
@@ -1375,7 +1375,7 @@ static gdk_return
logger_commit(logger *lg)
{
if (lg->debug & 1)
- fprintf(stderr, "#logger_commit\n");
+ Trace(M_DEBUG, "logger_commit\n");
/* cleanup old snapshots */
if (BATcount(lg->snapshots_bid)) {
@@ -1488,7 +1488,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
if (list_bid == catalog_bid && BUNfnd(dcatalog, &pos) !=
BUN_NONE)
continue;
if (debug & 1)
- fprintf(stderr, "#commit new %s (%d) %s\n",
+ Trace(M_DEBUG, "commit new %s (%d) %s\n",
BBPname(col), col,
(list_bid == catalog_bid) ? (char *)
BUNtvar(iter, p) : "snapshot");
assert(col);
@@ -1500,7 +1500,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
str name = (str) BUNtvar(iter, p);
if (debug & 1)
- fprintf(stderr, "#commit extra %s %s\n",
+ Trace(M_DEBUG, "commit extra %s %s\n",
name,
(list_bid == catalog_bid) ? (char *)
BUNtvar(iter, p) : "snapshot");
assert(BBPindex(name));
@@ -1645,7 +1645,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
res = TMsubcommit_list(n, i);
GDKfree(n);
if (res != GDK_SUCCEED)
- fprintf(stderr, "!ERROR: bm_subcommit: commit failed\n");
+ Trace(M_ERROR, "commit failed\n");
return res;
}
@@ -1747,7 +1747,7 @@ logger_load(int debug, const char *fn, c
goto error;
}
if (debug & 1)
- fprintf(stderr, "#create %s catalog\n", fn);
+ Trace(M_DEBUG, "create %s catalog\n", fn);
/* give the catalog bats names so we can find them
* next time */
@@ -2409,13 +2409,13 @@ logger_new(int debug, const char *fn, co
char filename[FILENAME_MAX];
if (!GDKinmemory() && MT_path_absolute(logdir)) {
- fprintf(stderr, "!ERROR: logger_new: logdir must be relative
path\n");
+ Trace(M_ERROR, "logdir must be relative path\n");
return NULL;
}
lg = GDKmalloc(sizeof(struct logger));
if (lg == NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
