Changeset: f0e222fbde19 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0e222fbde19 Modified Files: gdk/gdk.h gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_tracer.h Branch: gdk_tracer Log Message:
Added GDKtracer to gdk_posix - fix in gdk_private
diffs (truncated from 401 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1956,98 +1956,98 @@ gdk_export str GDKstrndup(const char *s,
* the calling function.
*/
#ifdef __GNUC__
-#define GDKmalloc(s)
\
- ({
\
- size_t _size = (s);
\
- void *_res = GDKmalloc(_size); \
+#define GDKmalloc(s) \
+ ({ \
+ size_t _size = (s); \
+ void *_res = GDKmalloc(_size); \
DEBUG(ALLOC, "GDKmalloc(%zu) -> %p\n", \
- _size, _res);
\
- _res;
\
+ _size, _res); \
+ _res; \
})
-#define GDKzalloc(s)
\
- ({
\
- size_t _size = (s);
\
- void *_res = GDKzalloc(_size); \
+#define GDKzalloc(s) \
+ ({ \
+ size_t _size = (s); \
+ void *_res = GDKzalloc(_size); \
DEBUG(ALLOC, "GDKzalloc(%zu) -> %p\n", \
- _size, _res);
\
- _res;
\
+ _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); \
DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n", \
- _ptr, _size, _res);
\
- _res;
\
+ _ptr, _size, _res); \
+ _res; \
})
-#define GDKfree(p)
\
- ({
\
- void *_ptr = (p);
\
- if (_ptr)
\
+#define GDKfree(p) \
+ ({ \
+ void *_ptr = (p); \
+ if (_ptr) \
DEBUG(ALLOC, "GDKfree(%p)\n", _ptr); \
- GDKfree(_ptr);
\
+ GDKfree(_ptr); \
})
-#define GDKstrdup(s)
\
- ({
\
- const char *_str = (s);
\
- void *_res = GDKstrdup(_str); \
+#define GDKstrdup(s) \
+ ({ \
+ const char *_str = (s); \
+ void *_res = GDKstrdup(_str); \
DEBUG(ALLOC, "GDKstrdup(len=%zu) -> %p\n", \
_str ? strlen(_str) : 0, _res); \
- _res;
\
+ _res; \
})
-#define GDKstrndup(s, n)
\
- ({
\
- const char *_str = (s);
\
- size_t _n = (n);
\
- void *_res = GDKstrndup(_str, _n); \
+#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;
\
+ _n, _res); \
+ _res; \
})
-#define GDKmmap(p, m, l)
\
- ({
\
- const char *_path = (p);
\
- int _mode = (m);
\
- size_t _len = (l);
\
+#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;
\
+ _path ? _path : "NULL", \
+ (unsigned) _mode, _len, \
+ _res); \
+ _res; \
})
-#define malloc(s)
\
- ({
\
- size_t _size = (s);
\
- void *_res = malloc(_size);
\
- DEBUG(ALLOC, "malloc(%zu) -> %p\n", \
- _size, _res);
\
- _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); \
+#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;
\
+ _nmemb, _size, _res); \
+ _res; \
})
-#define realloc(p, s)
\
- ({
\
- void *_ptr = (p);
\
- size_t _size = (s);
\
- void *_res = realloc(_ptr, _size); \
+#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;
\
+ _ptr, _size, _res); \
+ _res; \
})
-#define free(p)
\
- ({
\
- void *_ptr = (p);
\
- DEBUG(ALLOC, "free(%p)\n", _ptr); \
- free(_ptr);
\
+#define free(p) \
+ ({ \
+ void *_ptr = (p); \
+ DEBUG(ALLOC, "free(%p)\n", _ptr); \
+ free(_ptr); \
})
#else
static inline void *
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -19,6 +19,7 @@
#include "gdk.h" /* includes gdk_posix.h */
#include "gdk_private.h"
#include "mutils.h"
+#include "gdk_tracer.h"
#include <unistd.h>
#include <string.h> /* strncpy */
@@ -382,9 +383,7 @@ MT_munmap(void *p, size_t len)
GDKsyserror("MT_munmap: munmap(%p,%zu) failed\n",
p, len);
VALGRIND_FREELIKE_BLOCK(p, 0);
-#ifdef MMAP_DEBUG
- fprintf(stderr, "#munmap(%p,%zu) = %d\n", p, len, ret);
-#endif
+ DEBUG(GDK_POSIX, "munmap(%p,%zu) = %d\n", p, len, ret);
return ret;
}
@@ -415,7 +414,7 @@ MT_mremap(const char *path, int mode, vo
GDKsyserror("MT_mremap: munmap(%p,%zu) failed\n",
((char *) old_address + *new_size),
old_size - *new_size);
- fprintf(stderr, "= %s:%d: MT_mremap(%s,%p,%zu,%zu):
munmap() failed\n", __FILE__, __LINE__, path?path:"NULL", old_address,
old_size, *new_size);
+ ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu): munmap()
failed\n", path?path:"NULL", old_address, old_size, *new_size);
/* even though the system call failed, we
* don't need to propagate the error up: the
* address should still work in the same way
@@ -423,18 +422,14 @@ MT_mremap(const char *path, int mode, vo
return old_address;
}
if (path && truncate(path, *new_size) < 0)
- fprintf(stderr, "#MT_mremap(%s): truncate failed\n",
path);
-#ifdef MMAP_DEBUG
- fprintf(stderr, "MT_mremap(%s,%p,%zu,%zu) -> shrinking\n",
path?path:"NULL", old_address, old_size, *new_size);
-#endif
+ ERROR(GDK_POSIX, "MT_mremap(%s): truncate failed\n",
path);
+ DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> shrinking\n",
path?path:"NULL", old_address, old_size, *new_size);
#endif /* !STATIC_CODE_ANALYSIS */
return old_address;
}
if (*new_size == old_size) {
/* do nothing */
-#ifdef MMAP_DEBUG
- fprintf(stderr, "MT_mremap(%s,%p,%zu,%zu) -> unchanged\n",
path?path:"NULL", old_address, old_size, *new_size);
-#endif
+ DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> unchanged\n",
path?path:"NULL", old_address, old_size, *new_size);
return old_address;
}
@@ -443,12 +438,12 @@ MT_mremap(const char *path, int mode, vo
if ((fd = open(path, O_RDWR | O_CLOEXEC)) < 0) {
GDKsyserror("MT_mremap: open(%s) failed\n", path);
- fprintf(stderr, "= %s:%d: MT_mremap(%s,%p,%zu,%zu):
open() failed\n", __FILE__, __LINE__, path, old_address, old_size, *new_size);
+ ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu): open()
failed\n", path, old_address, old_size, *new_size);
return NULL;
}
if (GDKextendf(fd, *new_size, path) != GDK_SUCCEED) {
close(fd);
- fprintf(stderr, "= %s:%d: MT_mremap(%s,%p,%zu,%zu):
GDKextendf() failed\n", __FILE__, __LINE__, path, old_address, old_size,
*new_size);
+ ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu):
GDKextendf() failed\n", path, old_address, old_size, *new_size);
return NULL;
}
#ifdef HAVE_MREMAP
@@ -507,7 +502,7 @@ MT_mremap(const char *path, int mode, vo
#else
if ((fd = open("/dev/zero", O_RDWR | O_CLOEXEC)) < 0) {
GDKsyserror("MT_mremap: open(/dev/zero) failed\n");
- fprintf(stderr, "= %s:%d: MT_mremap(%s,%p,%zu,%zu):
open('/dev/zero') failed\n", __FILE__, __LINE__, path?path:"NULL", old_address,
old_size, *new_size);
+ ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu):
open('/dev/zero') failed\n", path?path:"NULL", old_address, old_size,
*new_size);
return NULL;
}
#endif
@@ -583,7 +578,7 @@ MT_mremap(const char *path, int mode, vo
p = malloc(strlen(path) + 5);
if (p == NULL){
GDKsyserror("MT_mremap:
malloc() failed\n");
- fprintf(stderr, "= %s:%d:
MT_mremap(%s,%p,%zu,%zu): fd < 0\n", __FILE__, __LINE__, path, old_address,
old_size, *new_size);
+ ERROR(GDK_POSIX,
"MT_mremap(%s,%p,%zu,%zu): fd < 0\n", path, old_address, old_size, *new_size);
return NULL;
}
@@ -593,7 +588,7 @@ MT_mremap(const char *path, int mode, vo
if (fd < 0) {
GDKsyserror("MT_mremap:
open(%s) failed\n", (char *) p);
free(p);
- fprintf(stderr, "= %s:%d:
MT_mremap(%s,%p,%zu,%zu): fd < 0\n", __FILE__, __LINE__, path, old_address,
old_size, *new_size);
+ ERROR(GDK_POSIX,
"MT_mremap(%s,%p,%zu,%zu): fd < 0\n", path, old_address, old_size, *new_size);
return NULL;
}
free(p);
@@ -638,8 +633,8 @@ MT_mremap(const char *path, int mode, vo
errno = err; /* restore for
error message */
GDKsyserror("MT_mremap: growing
file failed\n");
close(fd);
- fprintf(stderr,
- "= %s:%d:
MT_mremap(%s,%p,%zu,%zu): write() or "
+ ERROR(GDK_POSIX,
+
"MT_mremap(%s,%p,%zu,%zu): write() or "
#ifdef HAVE_FALLOCATE
"fallocate()"
#else
@@ -649,7 +644,7 @@ MT_mremap(const char *path, int mode, vo
"ftruncate()"
#endif
#endif
- " failed\n", __FILE__,
__LINE__, path, old_address, old_size, *new_size);
+ " failed\n", path,
old_address, old_size, *new_size);
return NULL;
}
p = mmap(NULL, *new_size, prot, flags,
@@ -668,11 +663,9 @@ MT_mremap(const char *path, int mode, vo
if (fd >= 0)
close(fd);
}
-#ifdef MMAP_DEBUG
- fprintf(stderr, "MT_mremap(%s,%p,%zu,%zu) -> %p%s\n", path?path:"NULL",
old_address, old_size, *new_size, p, path && mode & MMAP_COPY ? " private" :
"");
-#endif
+ DEBUG(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu) -> %p%s\n",
path?path:"NULL", old_address, old_size, *new_size, p, path && mode & MMAP_COPY
? " private" : "");
if (p == MAP_FAILED)
- fprintf(stderr, "= %s:%d: MT_mremap(%s,%p,%zu,%zu): p ==
MAP_FAILED\n", __FILE__, __LINE__, path?path:"NULL", old_address, old_size,
*new_size);
+ ERROR(GDK_POSIX, "MT_mremap(%s,%p,%zu,%zu): p == MAP_FAILED\n",
path?path:"NULL", old_address, old_size, *new_size);
return p == MAP_FAILED ? NULL : p;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
