ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-27 19:46:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

snapshot

Browse Source
This commit is contained in:
Joel Dice 2007-06-21 14:44:35 -06:00
parent 1992482236
commit 8d0c5f4186
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/heap.cpp
View File

@ -116,6 +116,16 @@ class Segment {
} }
} }
void replaceWith(Map* m) {
assert(segment->context, m);
assert(segment->context, bitsPerRecord == m->bitsPerRecord);
assert(segment->context, scale == m->scale);
m->segment = 0;
if (child) child->replaceWith(m->child);
}
unsigned offset() { unsigned offset() {
unsigned n = segment->capacity; unsigned n = segment->capacity;
if (child) n += child->footprint(segment->capacity); if (child) n += child->footprint(segment->capacity);
@ -134,12 +144,10 @@ class Segment {
} }
unsigned size() { unsigned size() {
assert(segment->context, segment);
return size(max(segment->capacity, 1)); return size(max(segment->capacity, 1));
} }
unsigned indexOf(void* p) { unsigned indexOf(void* p) {
assert(segment->context, segment);
assert(segment->context, assert(segment->context,
segment->position segment->position
and p >= segment->data and p >= segment->data
@ -258,7 +266,7 @@ class Segment {
unsigned footprint(unsigned capacity) { unsigned footprint(unsigned capacity) {
unsigned n = capacity; unsigned n = capacity;
if (map) n += map->size(capacity); if (map) n += map->footprint(capacity);
return n; return n;
} }
@ -291,7 +299,7 @@ class Segment {
} }
void replaceWith(Segment* s) { void replaceWith(Segment* s) {
system(context)->free(data); if (data) system(context)->free(data);
data = s->data; data = s->data;
s->data = 0; s->data = 0;
@ -303,8 +311,12 @@ class Segment {
s->capacity = 0; s->capacity = 0;
if (s->map) { if (s->map) {
map = s->map; if (map) {
map->setSegment(this); map->replaceWith(s->map);
} else {
map = s->map;
map->setSegment(this);
}
s->map = 0; s->map = 0;
} else { } else {
map = 0; map = 0;
@ -1023,6 +1035,8 @@ collect2(Context* c)
void void
collect(Context* c) collect(Context* c)
{ {
if (c->gen1.data == 0) initGen1(c);
switch (c->mode) { switch (c->mode) {
case MinorCollection: { case MinorCollection: {
initNextGen1(c); initNextGen1(c);