diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-09-12 10:01:40 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-09-12 10:01:40 +0000 |
| commit | fdd7a41eec615cf3d77a95896a6183326e60c2ca (patch) | |
| tree | 6e1a8dfa38fec07853a1a628946a6f95e239738a /rts/Schedule.c | |
| parent | 561ca008ff2485af1446303217d6e7ab1148d50a (diff) | |
| download | haskell-fdd7a41eec615cf3d77a95896a6183326e60c2ca.tar.gz | |
Fix some bugs in the stack-reducing code (#2571)
Diffstat (limited to 'rts/Schedule.c')
| -rw-r--r-- | rts/Schedule.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index a41dd676d4..3f428141df 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -2192,7 +2192,7 @@ static StgTSO * threadStackUnderflow (Task *task STG_UNUSED, StgTSO *tso) { bdescr *bd, *new_bd; - lnat new_tso_size_w, tso_size_w; + lnat free_w, tso_size_w; StgTSO *new_tso; tso_size_w = tso_sizeW(tso); @@ -2207,19 +2207,19 @@ threadStackUnderflow (Task *task STG_UNUSED, StgTSO *tso) // while we are moving the TSO: lockClosure((StgClosure *)tso); - new_tso_size_w = round_to_mblocks(tso_size_w/2); - - debugTrace(DEBUG_sched, "thread %ld: reducing TSO size from %lu words to %lu", - (long)tso->id, tso_size_w, new_tso_size_w); + // this is the number of words we'll free + free_w = round_to_mblocks(tso_size_w/2); bd = Bdescr((StgPtr)tso); - new_bd = splitLargeBlock(bd, new_tso_size_w / BLOCK_SIZE_W); - new_bd->free = bd->free; + new_bd = splitLargeBlock(bd, free_w / BLOCK_SIZE_W); bd->free = bd->start + TSO_STRUCT_SIZEW; new_tso = (StgTSO *)new_bd->start; memcpy(new_tso,tso,TSO_STRUCT_SIZE); - new_tso->stack_size = new_tso_size_w - TSO_STRUCT_SIZEW; + new_tso->stack_size = new_bd->free - new_tso->stack; + + debugTrace(DEBUG_sched, "thread %ld: reducing TSO size from %lu words to %lu", + (long)tso->id, tso_size_w, tso_sizeW(new_tso)); tso->what_next = ThreadRelocated; tso->_link = new_tso; // no write barrier reqd: same generation |