Changeset: 9430ba64a724 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9430ba64a724 Modified Files: gdk/gdk_tracer.h sql/backends/monet5/sql_scenario.c sql/include/sql_mem.h Branch: tracer Log Message:
Added tracer to sql_mem
diffs (158 lines):
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -26,7 +26,8 @@
typedef enum {
// ALL
ALL,
-
+ ALLOC,
+
// SQL
SQL_ALL,
SQL_ATOM_TR,
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -562,7 +562,7 @@ SQLinit(Client c)
freeException(other);
if (msg)
- fprintf(stderr, "%s", msg);
+ INFO(SQL_ALL, "%s\n", msg);
#endif
} else { /* handle upgrades */
if (!m->sa)
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -10,6 +10,7 @@
#define _SQL_MEM_H_
#include "gdk.h"
+#include "gdk_tracer.h"
#define SQL_OK 1
#define SQL_ERR 0
@@ -79,74 +80,58 @@ extern size_t sa_size( sql_allocator *sa
#define _strlen(s) (int)strlen(s)
#if !defined(NDEBUG) && !defined(STATIC_CODE_ANALYSIS) && defined(__GNUC__)
-#define sa_alloc(sa, sz) \
- ({ \
- sql_allocator *_sa = (sa); \
- size_t _sz = (sz); \
- void *_res = sa_alloc(_sa, _sz); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#sa_alloc(%p,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _sa, _sz, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define sa_alloc(sa, sz)
\
+ ({
\
+ sql_allocator *_sa = (sa);
\
+ size_t _sz = (sz);
\
+ void *_res = sa_alloc(_sa, _sz);
\
+ DEBUG(ALLOC,
\
+ "sa_alloc(%p, %zu) -> %p\n",
\
+ _sa, _sz, _res);
\
+ _res;
\
})
-#define sa_zalloc(sa, sz) \
- ({ \
- sql_allocator *_sa = (sa); \
- size_t _sz = (sz); \
- void *_res = sa_zalloc(_sa, _sz); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#sa_zalloc(%p,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _sa, _sz, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define sa_zalloc(sa, sz)
\
+ ({
\
+ sql_allocator *_sa = (sa);
\
+ size_t _sz = (sz);
\
+ void *_res = sa_zalloc(_sa, _sz);
\
+ DEBUG(ALLOC,
\
+ "sa_zalloc(%p, %zu) -> %p\n",
\
+ _sa, _sz, _res);
\
+ _res;
\
})
-#define sa_realloc(sa, ptr, sz, osz) \
- ({ \
- sql_allocator *_sa = (sa); \
- void *_ptr = (ptr); \
- size_t _sz = (sz); \
- size_t _osz = (osz); \
+#define sa_realloc(sa, ptr, sz, osz)
\
+ ({
\
+ sql_allocator *_sa = (sa);
\
+ void *_ptr = (ptr);
\
+ size_t _sz = (sz);
\
+ size_t _osz = (osz);
\
void *_res = sa_realloc(_sa, _ptr, _sz, _osz); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#sa_realloc(%p,%p,%zu,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _sa, _ptr, _sz, _osz, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+ DEBUG(ALLOC,
\
+ "sa_realloc(%p, %p, %zu, %zu) -> %p",
\
+ _sa, _ptr, _sz, _osz, _res);
\
+ _res;
\
})
-#define sa_strdup(sa, s) \
- ({ \
- sql_allocator *_sa = (sa); \
- const char *_s = (s); \
- char *_res = sa_strdup(_sa, _s); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#sa_strdup(%p,len=%zu) -> %p" \
- " %s[%s:%d]\n", \
- _sa, strlen(_s), _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define sa_strdup(sa, s)
\
+ ({
\
+ sql_allocator *_sa = (sa);
\
+ const char *_s = (s);
\
+ char *_res = sa_strdup(_sa, _s);
\
+ DEBUG(ALLOC,
\
+ "sa_strdup(%p, len = %zu) -> %p",
\
+ _sa, strlen(_s), _res);
\
+ _res;
\
})
-#define sa_strndup(sa, s, l) \
- ({ \
- sql_allocator *_sa = (sa); \
- const char *_s = (s); \
- size_t _l = (l); \
- char *_res = sa_strndup(_sa, _s, _l); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#sa_strndup(%p,len=%zu) -> %p" \
- " %s[%s:%d]\n", \
- _sa, _l, _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define sa_strndup(sa, s, l)
\
+ ({
\
+ sql_allocator *_sa = (sa);
\
+ const char *_s = (s);
\
+ size_t _l = (l);
\
+ char *_res = sa_strndup(_sa, _s, _l);
\
+ DEBUG(ALLOC,
\
+ "sa_strndup(%p, len = %zu) -> %p",
\
+ _sa, _l, _res);
\
+ _res;
\
})
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
