Changeset: ffa136ec11c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffa136ec11c8
Modified Files:
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_tracer.h
Branch: gdk_tracer
Log Message:
Compilation fixes
diffs (92 lines):
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -608,7 +608,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "trivial case: 1 element per group\n",
MT_thread_getname(),
+ "trivial case: 1 element per group\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -660,7 +660,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "trivial case: single output group\n",
MT_thread_getname(),
+ "trivial case: single output group\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -698,7 +698,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "trivial case: copy input groups\n",
MT_thread_getname(),
+ "trivial case: copy input groups\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -801,7 +801,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "compare consecutive values\n",
MT_thread_getname(),
+ "compare consecutive values\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -859,7 +859,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "subscan old groups\n", MT_thread_getname(),
+ "subscan old groups\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -996,7 +996,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "use existing hash table\n",
MT_thread_getname(),
+ "use existing hash table\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
@@ -1062,7 +1062,7 @@ BATgroup_internal(BAT **groups, BAT **ex
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "create partial hash table%s\n",
MT_thread_getname(),
+ "create partial hash table%s\n",
BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -488,9 +488,8 @@ BAThash_impl(BAT *b, BAT *s, const char
break;
}
TRC_DEBUG_IF(ACCEL) if (p < cnt1)
- TRC_DEBUG_ENDIF(ACCEL, "Abort starthash with mask "
BUNFMT
- " at " BUNFMT "\n",
MT_thread_getname(), BATgetId(b),
- mask, p);
+ TRC_DEBUG_ENDIF(ACCEL, "BAThash(%s): Abort starthash
with mask " BUNFMT
+ " at " BUNFMT "\n",
BATgetId(b), mask, p);
if (p == cnt1 || mask == maxmask)
break;
mask <<= 2;
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -25,6 +25,7 @@
* in case GDKtracer fails to log for whatever reason.
* - Struct buffer with allocated space etc.
* - Flush buffer sends the messages to the selected adapter
+ * - Write about the log structure (e.g: MT_thread_get_name + datetime + blah
blah)
*/
#ifndef _GDK_TRACER_H_
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
