Changeset: 9e08318eb37f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9e08318eb37f
Modified Files:
gdk/gdk.h
gdk/gdk_utils.c
Branch: Dec2025
Log Message:
Debug code.
diffs (132 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1809,6 +1809,15 @@ gdk_export void ma_info(const allocator
_sa, ma_name(_sa), _ptr, _sz, _osz, _res); \
_res; \
})
+#define ma_free(sa, p) \
+ ({ \
+ allocator *_sa = (sa); \
+ void *_p = (p); \
+ TRC_DEBUG(ALLOC, \
+ "ma_free(%p(%s),%p)\n", \
+ _sa, ma_name(_sa), _p); \
+ ma_free(_sa, _p); \
+ })
#define ma_strdup(sa, s) \
({ \
allocator *_sa = (sa); \
@@ -1830,7 +1839,18 @@ gdk_export void ma_info(const allocator
_sa, ma_name(_sa), _l, _res); \
_res; \
})
-#define create_allocator(sa, nm, lk)
\
+#define ma_strconcat(sa, s1, s2) \
+ ({ \
+ allocator *_sa = (sa); \
+ const char *_s1 = (s1); \
+ const char *_s2 = (s2); \
+ char *_res = ma_strconcat(_sa, _s1, _s2); \
+ TRC_DEBUG(ALLOC, \
+ "ma_strconcat(%p(%s),len1=%zu,len2=%zu) -> %p\n", \
+ _sa, ma_name(_sa), strlen(_s1), strlen(_s2), _res); \
+ _res; \
+ })
+#define create_allocator(sa, nm, lk) \
({ \
allocator *_sa = (sa); \
const char *_nm = (nm); \
@@ -1841,6 +1861,41 @@ gdk_export void ma_info(const allocator
_sa, ma_name(_sa), _res, ma_name(_res)); \
_res; \
})
+#define ma_open(sa) \
+ ({ \
+ allocator *_sa = (sa); \
+ allocator_state _as = ma_open(_sa); \
+ TRC_DEBUG(ALLOC, \
+ "ma_open(%p(%s)) -> tmp_used = %zu\n", \
+ _sa, ma_name(_sa), _as.tmp_used); \
+ _as; \
+ })
+#define ma_close(sa, as) \
+ ({ \
+ allocator *_sa = (sa); \
+ allocator_state *_as = (as); \
+ TRC_DEBUG(ALLOC, \
+ "ma_close(%p(%s), tmp_used = %zu)\n", \
+ _sa, ma_name(_sa), _as->tmp_used); \
+ ma_close(_sa, _as); \
+ })
+#define ma_reset(sa) \
+ ({ \
+ allocator *_sa = (sa); \
+ allocator *_sa2 = ma_reset(_sa); \
+ TRC_DEBUG(ALLOC, \
+ "ma_reset(%p(%s)) -> %p\n", \
+ _sa, ma_name(_sa), _sa2); \
+ _sa2; \
+ })
+#define ma_destroy(sa) \
+ ({ \
+ allocator *_sa = (sa); \
+ TRC_DEBUG(ALLOC, \
+ "ma_destroy(%p(%s))\n", \
+ _sa, ma_name(_sa)); \
+ ma_destroy(_sa); \
+ })
#endif
#endif /* _GDK_H_ */
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1903,6 +1903,7 @@ static inline void
/*
* Reset allocator to initial state
*/
+#undef ma_reset
allocator *
ma_reset(allocator *sa)
{
@@ -2156,6 +2157,7 @@ ma_zalloc(allocator *sa, size_t sz)
return r;
}
+#undef ma_destroy
void
ma_destroy(allocator *sa)
{
@@ -2210,6 +2212,7 @@ ma_strdup(allocator *sa, const char *s)
return ma_strndup(sa, s, strlen(s));
}
+#undef ma_strconcat
char *
ma_strconcat(allocator *sa, const char *s1, const char *s2)
{
@@ -2243,6 +2246,7 @@ ma_get_eb(allocator *sa)
return &sa->eb;
}
+#undef ma_open
allocator_state
ma_open(allocator *sa)
{
@@ -2264,6 +2268,7 @@ ma_open(allocator *sa)
return st;
}
+#undef ma_close
void
ma_close(allocator *sa, const allocator_state *state)
{
@@ -2303,6 +2308,7 @@ ma_tmp_active(const allocator *a)
return a && (a->tmp_used > 0);
}
+#undef ma_free
void
ma_free(allocator *sa, void *obj)
{
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
