Changeset: b1a5d5a02a6c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1a5d5a02a6c
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_hash.c
gdk/gdk_posix.c
gdk/gdk_system.c
gdk/gdk_tm.c
gdk/gdk_utils.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/optimizer/opt_multiplex.c
Branch: Jun2020
Log Message:
Updated a bunch of tracer calls.
diffs (truncated from 367 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1419,10 +1419,11 @@ gdk_export BAT *BBPquickdesc(bat b, bool
#define GDKerror(format, ...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, NULL, format, ##__VA_ARGS__)
-#define GDKsyserror(format, ...) \
+#define GDKsyserr(errno, format, ...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_CRITICAL, \
GDK, GDKstrerror(errno, (char[64]){0}, 64), \
format, ##__VA_ARGS__)
+#define GDKsyserror(format, ...) GDKsyserr(errno, format, ##__VA_ARGS__)
#ifndef HAVE_EMBEDDED
gdk_export _Noreturn void GDKfatal(_In_z_ _Printf_format_string_ const char
*format, ...)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2425,6 +2425,7 @@ BATassertProps(BAT *b)
GDKfree(hs);
}
abort_check:
+ GDKclrerr();
assert(maxval == NULL || seenmax);
assert(minval == NULL || seenmin);
assert(!b->tnil || seennil);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -519,10 +519,10 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
}
if (BATttype(b) != BATttype(n) &&
- ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
- TRC_DEBUG(CHECK_, "Interpreting %s as %s.\n",
- ATOMname(BATttype(n)), ATOMname(BATttype(b)));
- }
+ ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
+ TRC_DEBUG(CHECK_, "Interpreting %s as %s.\n",
+ ATOMname(BATttype(n)), ATOMname(BATttype(b)));
+ }
cnt = canditer_init(&ci, n, s);
if (cnt == 0) {
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -375,9 +375,9 @@ recover_dir(int farmid, bool direxists)
if (direxists) {
/* just try; don't care about these non-vital files */
if (GDKunlink(farmid, BATDIR, "BBP", "bak") != GDK_SUCCEED)
- TRC_CRITICAL(GDK, "unlink of BBP.bak failed\n");
+ TRC_WARNING(GDK, "unlink of BBP.bak failed\n");
if (GDKmove(farmid, BATDIR, "BBP", "dir", BATDIR, "BBP", "bak")
!= GDK_SUCCEED)
- TRC_CRITICAL(GDK, "rename of BBP.dir to BBP.bak
failed\n");
+ TRC_WARNING(GDK, "rename of BBP.dir to BBP.bak
failed\n");
}
return GDKmove(farmid, BAKDIR, "BBP", "dir", BATDIR, "BBP", "dir");
}
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -199,13 +199,13 @@ HASHcollisions(BAT *b, Hash *h, const ch
max = cnt;
total += cnt;
}
- TRC_DEBUG(ACCELERATOR,
- "%s(" ALGOBATFMT "): statistics " BUNFMT ", "
- "entries " LLFMT ", nunique " BUNFMT ", nbucket " BUNFMT ", "
- "max " LLFMT ", avg %2.6f;\n",
- func, ALGOBATPAR(b), BATcount(b), entries,
- h->nunique, h->nbucket, max,
- entries == 0 ? 0 : total / entries);
+ TRC_DEBUG_ENDIF(ACCELERATOR,
+ "%s(" ALGOBATFMT "): statistics " BUNFMT ", "
+ "entries " LLFMT ", nunique " BUNFMT ", "
+ "nbucket " BUNFMT ", max " LLFMT ", avg %2.6f;\n",
+ func, ALGOBATPAR(b), BATcount(b), entries,
+ h->nunique, h->nbucket, max,
+ entries == 0 ? 0 : total / entries);
}
static gdk_return
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -582,32 +582,29 @@ MT_mremap(const char *path, int mode, vo
* operation, so we then
* need to try
* ftruncate */
- ((rt = posix_fallocate(fd, (off_t)
old_size, (off_t) *new_size - (off_t) old_size)) == EINVAL ? ftruncate(fd,
(off_t) *new_size) < 0 : rt != 0)
+ ((errno = posix_fallocate(fd,
(off_t) old_size, (off_t) *new_size - (off_t) old_size)) == EINVAL ?
ftruncate(fd, (off_t) *new_size) < 0 : errno != 0)
#else
ftruncate(fd, (off_t) *new_size) < 0
#endif
#endif
) {
- int err = errno, other;
+
GDKsyserror("MT_mremap(%s,%p,%zu,%zu): write() or "
+#ifdef HAVE_FALLOCATE
+ "fallocate()"
+#else
+#ifdef HAVE_POSIX_FALLOCATE
+ "posix_fallocate()"
+#else
+ "ftruncate()"
+#endif
+#endif
+ " failed\n", path,
old_address, old_size, *new_size);
/* extending failed:
* free any disk space
* allocated in the
* process */
- other = ftruncate(fd, (off_t)
old_size);
- (void) other; /* silence
compiler warning for ignoring result of ftruncate */
- errno = err; /* restore for
error message */
- GDKsyserror(
-
"MT_mremap(%s,%p,%zu,%zu): write() or "
-#ifdef HAVE_FALLOCATE
- "fallocate()"
-#else
-#ifdef HAVE_POSIX_FALLOCATE
- "posix_fallocate()"
-#else
- "ftruncate()"
-#endif
-#endif
- " failed\n", path,
old_address, old_size, *new_size);
+ if (ftruncate(fd, (off_t)
old_size) < 0)
+
GDKsyserror("MT_mremap(%s,%p,%zu,%zu): ftruncate() failed\n", path,
old_address, old_size, *new_size);
close(fd);
return NULL;
}
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -193,18 +193,17 @@ static DWORD threadslot = TLS_OUT_OF_IND
void
dump_threads(void)
{
- TRC_DEBUG_IF(THRD)
- {
+ TRC_DEBUG_IF(THRD) {
EnterCriticalSection(&winthread_cs);
for (struct winthread *w = winthreads; w; w = w->next) {
TRC_DEBUG_ENDIF(THRD, "%s, waiting for %s, working on
%.200s\n",
- w->threadname,
- w->lockwait ?
w->lockwait->name :
- w->semawait ?
w->semawait->name :
- w->joinwait ?
w->joinwait->threadname :
- "nothing",
- ATOMIC_GET(&w->exited)
? "exiting" :
- w->working ? w->working
: "nothing");
+ w->threadname,
+ w->lockwait ? w->lockwait->name :
+ w->semawait ? w->semawait->name :
+ w->joinwait ? w->joinwait->threadname :
+ "nothing",
+ ATOMIC_GET(&w->exited) ? "exiting" :
+ w->working ? w->working : "nothing");
}
LeaveCriticalSection(&winthread_cs);
}
@@ -216,16 +215,12 @@ MT_thread_init(void)
if (threadslot == TLS_OUT_OF_INDEXES) {
threadslot = TlsAlloc();
if (threadslot == TLS_OUT_OF_INDEXES) {
- char errmsg[256];
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL,
GetLastError(), 0, errmsg, sizeof(errmsg), NULL);
- TRC_CRITICAL(GDK, "Creating thread-local slot for
thread failed: %s\n", errmsg);
+ GDKwinerror("Creating thread-local slot for thread
failed");
return false;
}
mainthread.tid = GetCurrentThreadId();
if (TlsSetValue(threadslot, &mainthread) == 0) {
- char errmsg[256];
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL,
GetLastError(), 0, errmsg, sizeof(errmsg), NULL);
- TRC_CRITICAL(GDK, "Setting thread-local value failed:
%s\n", errmsg);
+ GDKwinerror("Setting thread-local value failed");
TlsFree(threadslot);
threadslot = TLS_OUT_OF_INDEXES;
return false;
@@ -425,12 +420,9 @@ MT_create_thread(MT_Id *t, void (*f) (vo
w->hdl = CreateThread(NULL, THREAD_STACK_SIZE, thread_starter, w,
0, &w->tid);
if (w->hdl == NULL) {
- char errmsg[256];
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
- 0, errmsg, sizeof(errmsg), NULL);
+ GDKwinerror("Failed to create thread");
LeaveCriticalSection(&winthread_cs);
free(w);
- TRC_ERROR(GDK, "Failed to create thread: %s\n", errmsg);
return -1;
}
/* must not fail after this: the thread has been started */
@@ -536,18 +528,17 @@ static pthread_key_t threadkey;
void
dump_threads(void)
{
- TRC_DEBUG_IF(THRD)
- {
+ TRC_DEBUG_IF(THRD) {
pthread_mutex_lock(&posthread_lock);
for (struct posthread *p = posthreads; p; p = p->next) {
TRC_DEBUG_ENDIF(THRD, "%s, waiting for %s, working on
%.200s\n",
- p->threadname,
- p->lockwait ?
p->lockwait->name :
- p->semawait ?
p->semawait->name :
- p->joinwait ?
p->joinwait->threadname :
- "nothing",
- ATOMIC_GET(&p->exited)
? "exiting" :
- p->working ? p->working
: "nothing");
+ p->threadname,
+ p->lockwait ? p->lockwait->name :
+ p->semawait ? p->semawait->name :
+ p->joinwait ? p->joinwait->threadname :
+ "nothing",
+ ATOMIC_GET(&p->exited) ? "exiting" :
+ p->working ? p->working : "nothing");
}
pthread_mutex_unlock(&posthread_lock);
}
@@ -559,12 +550,13 @@ MT_thread_init(void)
int ret;
if ((ret = pthread_key_create(&threadkey, NULL)) != 0) {
- TRC_CRITICAL(GDK, "Creating specific key for thread failed:
%s\n", GDKstrerror(ret, (char[128]){0}, 128));
+ GDKsyserr(ret, "Creating specific key for thread failed");
return false;
}
mainthread.tid = pthread_self();
if ((ret = pthread_setspecific(threadkey, &mainthread)) != 0) {
- TRC_CRITICAL(GDK, "Setting specific value failed: %s\n",
GDKstrerror(ret, (char[128]){0}, 128));
+ GDKsyserr(ret, "Setting specific value failed");
+ return false;
}
return true;
}
@@ -759,11 +751,11 @@ MT_create_thread(MT_Id *t, void (*f) (vo
return -1;
}
if ((ret = pthread_attr_init(&attr)) != 0) {
- TRC_ERROR(GDK, "Cannot init pthread attr: %s\n",
GDKstrerror(ret, (char[128]){0}, 128));
+ GDKsyserr(ret, "Cannot init pthread attr");
return -1;
}
if ((ret = pthread_attr_setstacksize(&attr, THREAD_STACK_SIZE)) != 0) {
- TRC_ERROR(GDK, "Cannot set stack size: %s\n", GDKstrerror(ret,
(char[128]){0}, 128));
+ GDKsyserr(ret, "Cannot set stack size");
pthread_attr_destroy(&attr);
return -1;
}
@@ -794,7 +786,7 @@ MT_create_thread(MT_Id *t, void (*f) (vo
*t = p->mtid = ++MT_thread_id;
ret = pthread_create(&p->tid, &attr, thread_starter, p);
if (ret != 0) {
- TRC_ERROR(GDK, "Cannot start thread: %s\n", GDKstrerror(ret,
(char[128]){0}, 128));
+ GDKsyserr(ret, "Cannot start thread");
free(p);
ret = -1;
} else {
@@ -848,7 +840,7 @@ MT_join_thread(MT_Id t)
ret = pthread_join(p->tid, NULL);
self->joinwait = NULL;
if (ret != 0) {
- TRC_DEBUG(THRD, "Joining thread failed: %s\n", GDKstrerror(ret,
(char[128]){0}, 128));
+ GDKsyserr(ret, "Joining thread failed");
return -1;
}
rm_posthread(p);
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -102,7 +102,7 @@ epilogue(int cnt, bat *subcommit)
if (b) {
/* check mmap modes */
if (BATcheckmodes(b, true) != GDK_SUCCEED)
- TRC_ERROR(GDK, "BATcheckmodes
failed\n");
+ TRC_WARNING(GDK, "BATcheckmodes
failed\n");
}
}
if ((BBP_status(bid) & BBPDELETED) && BBP_refs(bid) <= 0 &&
BBP_lrefs(bid) <= 0) {
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1616,7 +1616,7 @@ GDKmemfail(const char *s, size_t len)
}
*/
- TRC_ERROR(GDK, "%s(%zu) fails, try to free up space [memory in
use=%zu,virtual memory in use=%zu]\n", s, len, GDKmem_cursize(),
GDKvm_cursize());
+ TRC_WARNING(GDK, "%s(%zu) fails, try to free up space [memory in
use=%zu,virtual memory in use=%zu]\n", s, len, GDKmem_cursize(),
GDKvm_cursize());
}
/* Memory allocation
@@ -1836,7 +1836,7 @@ GDKrealloc(void *s, size_t size)
#ifndef NDEBUG
os[-1] &= ~2; /* not freed after all */
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
