Changeset: 14a02be09122 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14a02be09122
Modified Files:
gdk/gdk_heap.c
Branch: Aug2011
Log Message:
Merge with Apr2011 branch.
diffs (48 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -959,7 +959,7 @@
HEADER *hheader = HEAP_index(heap, 0, HEADER);
#ifdef TRACE
- THRprintf(GDKout, "#Enter malloc with " VARFMT " bytes\n", nbytes);
+ THRprintf(GDKout, "#Enter malloc with " SZFMT " bytes\n", nbytes);
#endif
/* add space for size field */
@@ -979,7 +979,7 @@
blockp = HEAP_index(heap, block, CHUNK);
#ifdef TRACE
- THRprintf(GDKout, "#block " VARFMT " is " VARFMT " bytes\n",
block, blockp->size);
+ THRprintf(GDKout, "#block " SZFMT " is " SZFMT " bytes\n",
block, blockp->size);
#endif
if ((trail != 0) && (block <= trail))
GDKfatal("HEAP_malloc: Free list is not orderered\n");
@@ -1019,7 +1019,7 @@
trailp = HEAP_index(heap, trail, CHUNK);
#ifdef TRACE
- THRprintf(GDKout, "#New block made at pos " VARFMT " with size
" SZFMT "\n", block, heap->size - block);
+ THRprintf(GDKout, "#New block made at pos " SZFMT " with size "
SZFMT "\n", block, heap->size - block);
#endif
blockp->next = 0;
@@ -1206,7 +1206,7 @@
if ((block <= prevblock) && (block != 0)) {
GDKerror("HEAP_check: Freelist is not ordered\n");
} else if (block <= 0 || block > heap->free) {
- GDKerror("HEAP_check: Entry freelist corrupt: block "
VARFMT " not in heap\n", block);
+ GDKerror("HEAP_check: Entry freelist corrupt: block "
SZFMT " not in heap\n", block);
} else {
freemask[pos] |= mask;
continue;
@@ -1247,7 +1247,7 @@
int mask = 1 << (idx & 31);
if (freemask[pos] & mask) {
- GDKerror("HEAP_check: Entry freelist corrupt: block "
VARFMT " not in blocklist\n", block);
+ GDKerror("HEAP_check: Entry freelist corrupt: block "
SZFMT " not in blocklist\n", block);
goto xit;
}
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
