Changeset: 4bc471f76eae for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bc471f76eae
Modified Files:
gdk/gdk_private.h
gdk/gdk_unique.c
Branch: gdk_tracer
Log Message:
Added gdk_tracer to gdk_private and gdk_unique
diffs (151 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -19,6 +19,7 @@
#define PERSISTENTIDX 1
#include "gdk_system_private.h"
+#include "gdk_tracer.h"
enum heaptype {
offheap,
@@ -379,12 +380,9 @@ extern MT_Lock GDKtmLock;
({ void *_ptr = (p); \
size_t _len = (l); \
gdk_return _res = GDKmunmap(_ptr, _len); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKmunmap(%p,%zu) -> %u" \
- " %s[%s:%d]\n", \
- _ptr, _len, _res, \
- __func__, __FILE__, __LINE__); \
+ DEBUG(ALLOC, \
+ "GDKmunmap(%p,%zu) -> %u\n", \
+ _ptr, _len, _res); \
_res; \
})
#define GDKmremap(p, m, oa, os, ns) \
@@ -396,24 +394,19 @@ extern MT_Lock GDKtmLock;
size_t *_ns = (ns); \
size_t _ons = *_ns; \
void *_res = GDKmremap(_path, _mode, _oa, _os, _ns); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKmremap(%s,0x%x,%p,%zu,%zu > %zu) -> %p" \
- " %s[%s:%d]\n", \
+ DEBUG(ALLOC,
\
+ "GDKmremap(%s,0x%x,%p,%zu,%zu > %zu) -> %p\n", \
_path ? _path : "NULL", (unsigned) _mode, \
- _oa, _os, _ons, *_ns, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+ _oa, _os, _ons, *_ns, _res); \
+ _res;
\
})
#else
static inline gdk_return
GDKmunmap_debug(void *ptr, size_t len, const char *filename, int lineno)
{
gdk_return res = GDKmunmap(ptr, len);
- ALLOCDEBUG fprintf(stderr,
- "#GDKmunmap(%p,%zu) -> %d [%s:%d]\n",
- ptr, len, (int) res, filename, lineno);
+ DEBUG(ALLOC, "GDKmunmap(%p,%zu) -> %d\n",
+ ptr, len, (int) res);
return res;
}
#define GDKmunmap(p, l) GDKmunmap_debug((p), (l), __FILE__,
__LINE__)
@@ -422,14 +415,9 @@ GDKmremap_debug(const char *path, int mo
{
size_t orig_new_size = *new_size;
void *res = GDKmremap(path, mode, old_address, old_size, new_size);
- ALLOCDEBUG
- fprintf(stderr,
- "#GDKmremap(%s,0x%x,%p,%zu,%zu > %zu) -> %p"
- " [%s:%d]\n",
- path ? path : "NULL", mode,
- old_address, old_size, orig_new_size, *new_size,
- res,
- filename, lineno);
+ DEBUG(ALLOC, "GDKmremap(%s,0x%x,%p,%zu,%zu > %zu) -> %p\n",
+ path ? path : "NULL", mode,
+ old_address, old_size, orig_new_size,
*new_size, res);
return res;
}
#define GDKmremap(p, m, oa, os, ns) GDKmremap_debug(p, m, oa, os, ns,
__FILE__, __LINE__)
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -46,7 +46,7 @@ BATunique(BAT *b, BAT *s)
if (b->tkey || cnt <= 1 || BATtdense(b)) {
/* trivial: already unique */
bn = canditer_slice(&ci, 0, ci.ncand);
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ")=" ALGOOPTBATFMT
": trivial case: "
"already unique, slice candidates\n",
@@ -59,7 +59,7 @@ BATunique(BAT *b, BAT *s)
(b->ttype == TYPE_void && is_oid_nil(b->tseqbase))) {
/* trivial: all values are the same */
bn = BATdense(0, ci.seq, 1);
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT ")=" ALGOOPTBATFMT
": trivial case: all equal\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -84,7 +84,7 @@ BATunique(BAT *b, BAT *s)
if (BATordered(b) || BATordered_rev(b)) {
const void *prev = NULL;
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT "): (reverse) sorted\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
for (i = 0; i < ci.ncand; i++) {
@@ -98,7 +98,7 @@ BATunique(BAT *b, BAT *s)
} else if (ATOMbasetype(b->ttype) == TYPE_bte) {
unsigned char val;
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT "): byte sized atoms\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
assert(vars == NULL);
@@ -123,7 +123,7 @@ BATunique(BAT *b, BAT *s)
} else if (ATOMbasetype(b->ttype) == TYPE_sht) {
unsigned short val;
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT "): short sized atoms\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
assert(vars == NULL);
@@ -156,7 +156,7 @@ BATunique(BAT *b, BAT *s)
/* we already have a hash table on b, or b is
* persistent and we could create a hash table, or b
* is a view on a bat that already has a hash table */
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT "): use existing hash\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
seq = b->hseqbase;
@@ -199,7 +199,7 @@ BATunique(BAT *b, BAT *s)
int len;
GDKclrerr(); /* not interested in BAThash errors */
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ",s="
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ",s="
ALGOOPTBATFMT "): create partial hash\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
nme = BBP_physical(b->batCacheid);
@@ -265,7 +265,7 @@ BATunique(BAT *b, BAT *s)
b->batDirtydesc = true;
}
bn = virtualize(bn);
- ALGODEBUG fprintf(stderr, "#BATunique(b=" ALGOBATFMT ","
+ DEBUG(ALGO, "BATunique(b=" ALGOBATFMT ","
"s=" ALGOOPTBATFMT ")="
ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
