Changeset: 9de15bc13e66 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9de15bc13e66
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_heap.c
Branch: Dec2016
Log Message:
Print slightly more useful information in BBPdump().
diffs (114 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2082,42 +2082,57 @@ BBPdump(void)
continue;
fprintf(stderr,
"# %d[%s]: nme='%s' refs=%d lrefs=%d "
- "status=%d count=" BUNFMT " "
- "Theap=[" SZFMT "," SZFMT "] "
- "Tvheap=[" SZFMT "," SZFMT "] "
- "Thash=[" SZFMT "," SZFMT "]\n",
+ "status=%d count=" BUNFMT,
i,
ATOMname(b->ttype),
BBP_logical(i) ? BBP_logical(i) : "<NULL>",
BBP_refs(i),
BBP_lrefs(i),
BBP_status(i),
- b->batCount,
- HEAPmemsize(&b->theap),
- HEAPvmsize(&b->theap),
- HEAPmemsize(b->tvheap),
- HEAPvmsize(b->tvheap),
- b->thash && b->thash != (Hash *) -1 && b->thash !=
(Hash *) 1 ? HEAPmemsize(b->thash->heap) : 0,
- b->thash && b->thash != (Hash *) -1 && b->thash !=
(Hash *) 1 ? HEAPvmsize(b->thash->heap) : 0);
- if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
- cmem += HEAPmemsize(&b->theap);
- cvm += HEAPvmsize(&b->theap);
- nc++;
+ b->batCount);
+ if (b->batSharecnt >0)
+ fprintf(stderr, " shares=%d", b->batSharecnt);
+ if (b->theap.parentid) {
+ fprintf(stderr, " Theap -> %d", b->theap.parentid);
} else {
- mem += HEAPmemsize(&b->theap);
- vm += HEAPvmsize(&b->theap);
- n++;
+ fprintf(stderr,
+ " Theap=[" SZFMT "," SZFMT "]",
+ HEAPmemsize(&b->theap),
+ HEAPvmsize(&b->theap));
+ if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
+ cmem += HEAPmemsize(&b->theap);
+ cvm += HEAPvmsize(&b->theap);
+ nc++;
+ } else {
+ mem += HEAPmemsize(&b->theap);
+ vm += HEAPvmsize(&b->theap);
+ n++;
+ }
}
if (b->tvheap) {
- if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
- cmem += HEAPmemsize(b->tvheap);
- cvm += HEAPvmsize(b->tvheap);
+ if (b->tvheap->parentid != b->batCacheid) {
+ fprintf(stderr,
+ " Tvheap -> %d",
+ b->tvheap->parentid);
} else {
- mem += HEAPmemsize(b->tvheap);
- vm += HEAPvmsize(b->tvheap);
+ fprintf(stderr,
+ " Tvheap=[" SZFMT "," SZFMT "]",
+ HEAPmemsize(b->tvheap),
+ HEAPvmsize(b->tvheap));
+ if (BBP_logical(i) && BBP_logical(i)[0] == '.')
{
+ cmem += HEAPmemsize(b->tvheap);
+ cvm += HEAPvmsize(b->tvheap);
+ } else {
+ mem += HEAPmemsize(b->tvheap);
+ vm += HEAPvmsize(b->tvheap);
+ }
}
}
- if (b->thash && b->thash != (Hash *) -1 && b->thash != (Hash *)
1) {
+ if (b->thash && b->thash != (Hash *) -1) {
+ fprintf(stderr,
+ " Thash=[" SZFMT "," SZFMT "]",
+ HEAPmemsize(b->thash->heap),
+ HEAPvmsize(b->thash->heap));
if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
cmem += HEAPmemsize(b->thash->heap);
cvm += HEAPvmsize(b->thash->heap);
@@ -2126,6 +2141,7 @@ BBPdump(void)
vm += HEAPvmsize(b->thash->heap);
}
}
+ fprintf(stderr, "\n");
}
fprintf(stderr,
"# %d bats: mem=" SZFMT ", vm=" SZFMT " %d cached bats: mem="
SZFMT ", vm=" SZFMT "\n",
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -799,7 +799,7 @@ HEAPwarm(Heap *h)
size_t
HEAPvmsize(Heap *h)
{
- if (h && h->free)
+ if (h && h->base && h->free)
return h->size;
return 0;
}
@@ -809,7 +809,7 @@ HEAPvmsize(Heap *h)
size_t
HEAPmemsize(Heap *h)
{
- if (h && h->free && h->storage != STORE_MMAP)
+ if (h && h->base && h->free && h->storage != STORE_MMAP)
return h->size;
return 0;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
