diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-05-05 11:49:47 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-05-05 11:49:47 +0000 |
| commit | 497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778 (patch) | |
| tree | 977b2376b794783041e795ee69f69765bf86ca86 /rts/Task.h | |
| parent | 7f148c3265edb930223f50c3702e33bc51f00bd1 (diff) | |
| download | haskell-497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778.tar.gz | |
Make the running_finalizers flag task-local
Fixes a bug reported by Lennart Augustsson, whereby we could get an
incorrect error from the RTS about re-entry from a finalizer,
Diffstat (limited to 'rts/Task.h')
| -rw-r--r-- | rts/Task.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rts/Task.h b/rts/Task.h index c2b58f2c45..2e0a4b83fa 100644 --- a/rts/Task.h +++ b/rts/Task.h @@ -134,6 +134,9 @@ typedef struct Task_ { rtsBool worker; // == rtsTrue if this is a worker Task rtsBool stopped; // this task has stopped or exited Haskell + // So that we can detect when a finalizer illegally calls back into Haskell + rtsBool running_finalizers; + SchedulerStatus stat; // return status StgClosure ** ret; // return value |