Changeset: c6b7e99b1e4e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6b7e99b1e4e
Modified Files:
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_tracer.h
Branch: Jun2020
Log Message:
Removed some ancient debugging code.
diffs (165 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -852,42 +852,6 @@ roundup_num(size_t number, int alignment
static void
-HEAP_printstatus(Heap *heap)
-{
- HEADER *hheader = HEAP_index(heap, 0, HEADER);
- size_t block, cur_free = hheader->head;
- CHUNK *blockp;
-
- TRC_DEBUG(TRACE,
- "HEAP has head %zu and alignment %d and size %zu\n",
- hheader->head, hheader->alignment, heap->free);
-
- /* Walk the blocklist */
- block = hheader->firstblock;
-
- while (block < heap->free) {
- blockp = HEAP_index(heap, block, CHUNK);
-
- if (block == cur_free) {
- TRC_DEBUG(TRACE,
- "Free block at %p has size %zu and next
%zu\n",
- (void *)block,
- blockp->size, blockp->next);
-
- cur_free = blockp->next;
- block += blockp->size;
- } else {
- size_t size = blocksize(hheader, blockp);
-
- TRC_DEBUG(TRACE,
- "Block at %zu with size %zu\n",
- block, size);
- block += size;
- }
- }
-}
-
-static void
HEAP_empty(Heap *heap, size_t nprivate, int alignment)
{
/* Find position of header block. */
@@ -910,11 +874,6 @@ HEAP_empty(Heap *heap, size_t nprivate,
assert(heap->size - head <= VAR_MAX);
headp->size = (size_t) (heap->size - head);
headp->next = 0;
- TRC_DEBUG_IF(TRACE)
- {
- TRC_DEBUG(TRACE, "We created the following heap\n");
- HEAP_printstatus(heap);
- }
}
void
@@ -950,8 +909,6 @@ HEAP_malloc(Heap *heap, size_t nbytes)
CHUNK *trailp;
HEADER *hheader = HEAP_index(heap, 0, HEADER);
- TRC_DEBUG(TRACE, "Enter malloc with %zu bytes\n", nbytes);
-
/* add space for size field */
nbytes += hheader->alignment;
nbytes = roundup_8(nbytes);
@@ -967,8 +924,6 @@ HEAP_malloc(Heap *heap, size_t nbytes)
for (block = hheader->head; block != 0; block = blockp->next) {
blockp = HEAP_index(heap, block, CHUNK);
- TRC_DEBUG(TRACE, "Block %zu is %zu bytes\n", block,
blockp->size);
-
assert(trail == 0 || block > trail);
if (trail != 0 && block <= trail) {
GDKerror("Free list is not orderered\n");
@@ -992,8 +947,6 @@ HEAP_malloc(Heap *heap, size_t nbytes)
assert(heap->free <= VAR_MAX);
block = (size_t) heap->free; /* current end-of-heap */
- TRC_DEBUG(TRACE, "No block found\n");
-
/* Increase the size of the heap. */
TRC_DEBUG(HEAP, "HEAPextend in HEAP_malloc %s %zu %zu\n",
heap->filename, heap->size, newsize);
if (HEAPextend(heap, newsize, false) != GDK_SUCCEED)
@@ -1004,8 +957,6 @@ HEAP_malloc(Heap *heap, size_t nbytes)
blockp = HEAP_index(heap, block, CHUNK);
trailp = HEAP_index(heap, trail, CHUNK);
- TRC_DEBUG(TRACE, "New block made at pos %zu with size %zu\n",
block, heap->size - block);
-
blockp->next = 0;
assert(heap->free - block <= VAR_MAX);
blockp->size = (size_t) (heap->free - block); /* determine
size of allocated block */
@@ -1013,8 +964,6 @@ HEAP_malloc(Heap *heap, size_t nbytes)
/* Try to join the last block in the freelist and the
* newly allocated memory */
if ((trail != 0) && (trail + trailp->size == block)) {
- TRC_DEBUG(TRACE, "Glue newly generated block to
adjacent last\n");
-
trailp->size += blockp->size;
trailp->next = blockp->next;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -352,7 +352,6 @@ MT_munmap(void *p, size_t len)
GDKsyserror("MT_munmap: munmap(%p,%zu) failed\n",
p, len);
VALGRIND_FREELIKE_BLOCK(p, 0);
- TRC_DEBUG(ALLOC, "munmap(%p,%zu) = %d\n", p, len, ret);
return ret;
}
@@ -389,13 +388,11 @@ MT_mremap(const char *path, int mode, vo
}
if (path && truncate(path, *new_size) < 0)
TRC_WARNING(GDK, "MT_mremap(%s): truncate failed\n",
path);
- TRC_DEBUG(ALLOC, "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 */
- TRC_DEBUG(ALLOC, "MT_mremap(%s,%p,%zu,%zu) -> unchanged\n",
path?path:"NULL", old_address, old_size, *new_size);
return old_address;
}
@@ -630,7 +627,6 @@ MT_mremap(const char *path, int mode, vo
GDKsyserror("MT_mremap(%s,%p,%zu,%zu): p == MAP_FAILED\n",
path?path:"NULL", old_address, old_size, *new_size);
if (fd >= 0)
close(fd);
- TRC_DEBUG(ALLOC, "MT_mremap(%s,%p,%zu,%zu) -> %p%s\n",
path?path:"NULL", old_address, old_size, *new_size, p, path && mode & MMAP_COPY
? " private" : "");
return p == MAP_FAILED ? NULL : p;
}
@@ -641,8 +637,6 @@ MT_msync(void *p, size_t len)
if (ret < 0)
GDKsyserror("MT_msync: msync failed\n");
-
- TRC_DEBUG(ALLOC, "msync(%p,%zu,MS_SYNC) = %d\n", p, len, ret);
return ret;
}
@@ -818,8 +812,6 @@ MT_mremap(const char *path, int mode, vo
MT_munmap(old_address, old_size);
}
- TRC_DEBUG(ALLOC, "MT_mremap(%s,%p,%zu,%zu) -> %p\n", path?path:"NULL",
old_address, old_size, *new_size, p);
-
if (p == NULL)
TRC_ERROR(GDK, "MT_mremap(%s,%p,%zu,%zu): p == NULL\n",
path?path:"NULL", old_address, old_size, *new_size);
return p;
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -102,7 +102,6 @@ typedef enum {
COMP( PERF ) \
COMP( TEM ) \
COMP( THRD ) \
- COMP( TRACE ) \
\
COMP( GEOM ) \
COMP( LIDAR ) \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
