Changeset: d8aeefb807c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8aeefb807c7
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_runtime.c
Branch: default
Log Message:
Remove some head properties
The headless world does not require storage size analysis.
diffs (89 lines):
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -1478,29 +1478,15 @@ memProfileVector(stream *out, int cells)
Hash *h;
mnstr_printf(out, "\tdesc=" PTRFMT " size=" SZFMT "\n",
PTRFMTCAST b, sizeof(*b));
- hp = &b->H->heap;
- if (hp && hp->base) {
- mnstr_printf(out, "\ttail=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST hp->base, hp->size);
- }
hp = &b->T->heap;
if (hp && hp->base) {
mnstr_printf(out, "\thead=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST hp->base, hp->size);
}
- hp = b->H->vheap;
- if (hp && hp->base) {
- mnstr_printf(out, "\thheap=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST hp->base, hp->size);
- }
hp = b->T->vheap;
if (hp && hp->base) {
mnstr_printf(out, "\ttheap=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST hp->base, hp->size);
}
- h = b->H->hash;
- if (h && h->mask) {
- mnstr_printf(out, "\thhash=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST h, sizeof(*h));
- mnstr_printf(out, "\thhashlink=" PTRFMT "
size=" SZFMT "\n", PTRFMTCAST h->Link,
- (h->mask + h->lim + 1) *
sizeof(int));
- }
h = b->T->hash;
if (h && h->mask) {
mnstr_printf(out, "\tthash=" PTRFMT " size="
SZFMT "\n", PTRFMTCAST h, sizeof(*h));
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -813,15 +813,10 @@ getDiskSpace(void)
if (!isVIEW(b)) {
BUN cnt = BATcount(b);
- size += headsize(b, cnt);
size += tailsize(b, cnt);
/* the upperbound is used for the heaps
*/
- if (b->H->vheap)
- size += b->H->vheap->size;
if (b->T->vheap)
size += b->T->vheap->size;
- if (b->H->hash)
- size += sizeof(BUN) * cnt;
if (b->T->hash)
size += sizeof(BUN) * cnt;
}
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -85,9 +85,6 @@ getMemoryClaim(MalBlkPtr mb, MalStkPtr s
return 0;
}
cnt = BATcount(b);
- heapinfo(&b->H->heap); total += vol;
- heapinfo(b->H->vheap); total += vol;
- hashinfo(b->H->hash); total += vol;
heapinfo(&b->T->heap); total += vol;
heapinfo(b->T->vheap); total += vol;
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -254,7 +254,6 @@ lng getVolume(MalStkPtr stk, InstrPtr pc
cnt = BATcount(b);
/* Usually reading views cost as much as full bats.
But when we output a slice that is not the case. */
- vol += ((rd && !isview) || !VIEWhparent(b)) ?
headsize(b, cnt) : 0;
vol += ((rd && !isview) || !VIEWtparent(b)) ?
tailsize(b, cnt) : 0;
}
}
@@ -289,12 +288,8 @@ updateFootPrint(MalBlkPtr mb, MalStkPtr
if (b == NULL || isVIEW(b) || b->batPersistence == PERSISTENT)
return;
cnt = BATcount(b);
- total += heapinfo(&b->H->heap);
- total += heapinfo(b->H->vheap);
-
total += heapinfo(&b->T->heap);
total += heapinfo(b->T->vheap);
- total += hashinfo(b->H->hash);
total += hashinfo(b->T->hash);
BBPunfix(b->batCacheid);
// no concurrency protection (yet)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
