Changeset: cb9a65a2dd70 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb9a65a2dd70 Modified Files: gdk/gdk.h gdk/gdk_hash.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_system.h gdk/gdk_tracer.h Branch: gdk_tracer Log Message:
Added GDKtracer to gdk.h, gdk_hash, gdk_orderidx, gdk_private, gdk_system
diffs (truncated from 799 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1956,260 +1956,191 @@ gdk_export str GDKstrndup(const char *s,
* the calling function.
*/
#ifdef __GNUC__
-#define GDKmalloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = GDKmalloc(_size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKmalloc(%zu) -> %p" \
- " %s[%s:%d]\n", \
- _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKmalloc(s)
\
+ ({
\
+ size_t _size = (s);
\
+ void *_res = GDKmalloc(_size); \
+ DEBUG(ALLOC, "GDKmalloc(%zu) -> %p\n", \
+ _size, _res);
\
+ _res;
\
})
-#define GDKzalloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = GDKzalloc(_size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKzalloc(%zu) -> %p" \
- " %s[%s:%d]\n", \
- _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKzalloc(s)
\
+ ({
\
+ size_t _size = (s);
\
+ void *_res = GDKzalloc(_size); \
+ DEBUG(ALLOC, "GDKzalloc(%zu) -> %p\n", \
+ _size, _res);
\
+ _res;
\
})
-#define GDKrealloc(p, s) \
- ({ \
- void *_ptr = (p); \
- size_t _size = (s); \
+#define GDKrealloc(p, s)
\
+ ({
\
+ void *_ptr = (p);
\
+ size_t _size = (s);
\
void *_res = GDKrealloc(_ptr, _size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKrealloc(%p,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _ptr, _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+ DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n", \
+ _ptr, _size, _res);
\
+ _res;
\
})
-#define GDKfree(p) \
- ({ \
- void *_ptr = (p); \
- ALLOCDEBUG if (_ptr) \
- fprintf(stderr, \
- "#GDKfree(%p)" \
- " %s[%s:%d]\n", \
- _ptr, \
- __func__, __FILE__, __LINE__); \
- GDKfree(_ptr); \
+#define GDKfree(p)
\
+ ({
\
+ void *_ptr = (p);
\
+ if (_ptr)
\
+ DEBUG(ALLOC, "GDKfree(%p)\n", _ptr); \
+ GDKfree(_ptr);
\
})
-#define GDKstrdup(s) \
- ({ \
- const char *_str = (s); \
- void *_res = GDKstrdup(_str); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKstrdup(len=%zu) -> %p" \
- " %s[%s:%d]\n", \
- _str ? strlen(_str) : 0, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKstrdup(s)
\
+ ({
\
+ const char *_str = (s);
\
+ void *_res = GDKstrdup(_str); \
+ DEBUG(ALLOC, "GDKstrdup(len=%zu) -> %p\n", \
+ _str ? strlen(_str) : 0, _res); \
+ _res;
\
})
-#define GDKstrndup(s, n) \
- ({ \
- const char *_str = (s); \
- size_t _n = (n); \
- void *_res = GDKstrndup(_str, _n); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKstrndup(len=%zu) -> %p" \
- " %s[%s:%d]\n", \
- _n, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKstrndup(s, n)
\
+ ({
\
+ const char *_str = (s);
\
+ size_t _n = (n);
\
+ void *_res = GDKstrndup(_str, _n); \
+ DEBUG(ALLOC, "GDKstrndup(len=%zu) -> %p\n", \
+ _n, _res);
\
+ _res;
\
})
-#define GDKmmap(p, m, l) \
- ({ \
- const char *_path = (p); \
- int _mode = (m); \
- size_t _len = (l); \
- void *_res = GDKmmap(_path, _mode, _len); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKmmap(%s,0x%x,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _path ? _path : "NULL", \
- (unsigned) _mode, _len, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKmmap(p, m, l)
\
+ ({
\
+ const char *_path = (p);
\
+ int _mode = (m);
\
+ size_t _len = (l);
\
+ void *_res = GDKmmap(_path, _mode, _len); \
+ DEBUG(ALLOC, "GDKmmap(%s,0x%x,%zu) -> %p\n",\
+ _path ? _path : "NULL",
\
+ (unsigned) _mode, _len,
\
+ _res);
\
+ _res;
\
})
-#define malloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = malloc(_size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#malloc(%zu) -> %p" \
- " %s[%s:%d]\n", \
- _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define malloc(s)
\
+ ({
\
+ size_t _size = (s);
\
+ void *_res = malloc(_size);
\
+ DEBUG(ALLOC, "malloc(%zu) -> %p\n", \
+ _size, _res);
\
+ _res;
\
})
-#define calloc(n, s) \
- ({ \
- size_t _nmemb = (n); \
- size_t _size = (s); \
- void *_res = calloc(_nmemb,_size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#calloc(%zu,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _nmemb, _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define calloc(n, s)
\
+ ({
\
+ size_t _nmemb = (n);
\
+ size_t _size = (s);
\
+ void *_res = calloc(_nmemb,_size); \
+ DEBUG(ALLOC, "calloc(%zu,%zu) -> %p\n", \
+ _nmemb, _size, _res);
\
+ _res;
\
})
-#define realloc(p, s) \
- ({ \
- void *_ptr = (p); \
- size_t _size = (s); \
- void *_res = realloc(_ptr, _size); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#realloc(%p,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _ptr, _size, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define realloc(p, s)
\
+ ({
\
+ void *_ptr = (p);
\
+ size_t _size = (s);
\
+ void *_res = realloc(_ptr, _size); \
+ DEBUG(ALLOC, "realloc(%p,%zu) -> %p\n", \
+ _ptr, _size, _res);
\
+ _res;
\
})
-#define free(p) \
- ({ \
- void *_ptr = (p); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#free(%p)" \
- " %s[%s:%d]\n", \
- _ptr, \
- __func__, __FILE__, __LINE__); \
- free(_ptr); \
+#define free(p)
\
+ ({
\
+ void *_ptr = (p);
\
+ DEBUG(ALLOC, "free(%p)\n", _ptr); \
+ free(_ptr);
\
})
#else
static inline void *
-GDKmalloc_debug(size_t size, const char *filename, int lineno)
+GDKmalloc_debug(size_t size)
{
void *res = GDKmalloc(size);
- ALLOCDEBUG fprintf(stderr,
- "#GDKmalloc(%zu) -> %p [%s:%d]\n",
- size, res, filename, lineno);
+ DEBUG(ALLOC, "GDKmalloc(%zu) -> %p\n", size, res);
return res;
}
-#define GDKmalloc(s) GDKmalloc_debug((s), __FILE__, __LINE__)
+#define GDKmalloc(s) GDKmalloc_debug((s))
static inline void *
-GDKzalloc_debug(size_t size, const char *filename, int lineno)
+GDKzalloc_debug(size_t size)
{
void *res = GDKzalloc(size);
- ALLOCDEBUG fprintf(stderr,
- "#GDKzalloc(%zu) -> %p [%s:%d]\n",
- size, res, filename, lineno);
+ DEBUG(ALLOC, "GDKzalloc(%zu) -> %p\n",
+ size, res);
return res;
}
-#define GDKzalloc(s) GDKzalloc_debug((s), __FILE__, __LINE__)
+#define GDKzalloc(s) GDKzalloc_debug((s))
static inline void *
-GDKrealloc_debug(void *ptr, size_t size, const char *filename, int lineno)
+GDKrealloc_debug(void *ptr, size_t size)
{
void *res = GDKrealloc(ptr, size);
- ALLOCDEBUG fprintf(stderr,
- "#GDKrealloc(%p,%zu) -> "
- "%p [%s:%d]\n",
- ptr, size, res,
- filename, lineno);
+ DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n",
+ ptr, size, res);
return res;
}
-#define GDKrealloc(p, s) GDKrealloc_debug((p), (s), __FILE__, __LINE__)
+#define GDKrealloc(p, s) GDKrealloc_debug((p), (s))
static inline void
-GDKfree_debug(void *ptr, const char *filename, int lineno)
+GDKfree_debug(void *ptr)
{
- ALLOCDEBUG fprintf(stderr, "#GDKfree(%p) [%s:%d]\n",
- ptr, filename, lineno);
+ DEBUG(ALLOC, "GDKfree(%p)\n", ptr);
GDKfree(ptr);
}
-#define GDKfree(p) GDKfree_debug((p), __FILE__, __LINE__)
+#define GDKfree(p) GDKfree_debug((p))
static inline char *
-GDKstrdup_debug(const char *str, const char *filename, int lineno)
+GDKstrdup_debug(const char *str)
{
void *res = GDKstrdup(str);
- ALLOCDEBUG fprintf(stderr, "#GDKstrdup(len=%zu) -> "
- "%p [%s:%d]\n",
- str ? strlen(str) : 0, res, filename, lineno);
+ DEBUG(ALLOC, "GDKstrdup(len=%zu) -> %p\n",
+ str ? strlen(str) : 0, res);
return res;
}
-#define GDKstrdup(s) GDKstrdup_debug((s), __FILE__, __LINE__)
+#define GDKstrdup(s) GDKstrdup_debug((s))
static inline char *
-GDKstrndup_debug(const char *str, size_t n, const char *filename, int lineno)
+GDKstrndup_debug(const char *str, size_t n)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
