Commit c19f2e32 authored by Simon Marlow's avatar Simon Marlow
Browse files

Include pinned memory in the stats for allocated memory

This broke with the changes to the pinned object handling in
parent 016fd74d
......@@ -290,7 +290,7 @@ GarbageCollect (nat collect_gen,
// gather blocks allocated using allocatePinned() from each capability
// and put them on the g0->large_object list.
allocated += collect_pinned_object_blocks();
// Initialise all the generations/steps that we're collecting.
for (g = 0; g <= N; g++) {
......@@ -764,6 +764,7 @@ allocatePinned (Capability *cap, W_ n)
// g0->large_objects.
if (bd != NULL) {
dbl_link_onto(bd, &cap->pinned_object_blocks);
cap->total_allocated += bd->free - bd->start;
// We need to find another block. We could just allocate one,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment