projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split GC.c, and move storage manager into sm/ directory
[ghc-hetmet.git]
/
rts
/
RetainerProfile.c
diff --git
a/rts/RetainerProfile.c
b/rts/RetainerProfile.c
index
a18a194
..
cd00013
100644
(file)
--- a/
rts/RetainerProfile.c
+++ b/
rts/RetainerProfile.c
@@
-20,15
+20,15
@@
#include "RtsUtils.h"
#include "RetainerProfile.h"
#include "RetainerSet.h"
#include "RtsUtils.h"
#include "RetainerProfile.h"
#include "RetainerSet.h"
+#include "Storage.h"
#include "Schedule.h"
#include "Schedule.h"
+#include "Stable.h"
#include "Printer.h"
#include "Printer.h"
-#include "Storage.h"
#include "RtsFlags.h"
#include "Weak.h"
#include "Sanity.h"
#include "Profiling.h"
#include "Stats.h"
#include "RtsFlags.h"
#include "Weak.h"
#include "Sanity.h"
#include "Profiling.h"
#include "Stats.h"
-#include "BlockAlloc.h"
#include "ProfHeap.h"
#include "Apply.h"
#include "ProfHeap.h"
#include "Apply.h"
@@
-591,8
+591,8
@@
push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
return; // no child
break;
return; // no child
break;
- case TVAR_WAIT_QUEUE:
- *first_child = (StgClosure *)((StgTVarWaitQueue *)c)->waiting_tso;
+ case TVAR_WATCH_QUEUE:
+ *first_child = (StgClosure *)((StgTVarWatchQueue *)c)->closure;
se.info.next.step = 2; // 2 = second
break;
case TVAR:
se.info.next.step = 2; // 2 = second
break;
case TVAR:
@@
-830,13
+830,13
@@
pop( StgClosure **c, StgClosure **cp, retainer *r )
*r = se->c_child_r;
return;
*r = se->c_child_r;
return;
- case TVAR_WAIT_QUEUE:
+ case TVAR_WATCH_QUEUE:
if (se->info.next.step == 2) {
if (se->info.next.step == 2) {
- *c = (StgClosure *)((StgTVarWaitQueue *)se->c)->next_queue_entry;
+ *c = (StgClosure *)((StgTVarWatchQueue *)se->c)->next_queue_entry;
se->info.next.step++; // move to the next step
// no popOff
} else {
se->info.next.step++; // move to the next step
// no popOff
} else {
- *c = (StgClosure *)((StgTVarWaitQueue *)se->c)->prev_queue_entry;
+ *c = (StgClosure *)((StgTVarWatchQueue *)se->c)->prev_queue_entry;
popOff();
}
*cp = se->c;
popOff();
}
*cp = se->c;
@@
-844,7
+844,7
@@
pop( StgClosure **c, StgClosure **cp, retainer *r )
return;
case TVAR:
return;
case TVAR:
- *c = (StgClosure *)((StgTVar *)se->c)->first_wait_queue_entry;
+ *c = (StgClosure *)((StgTVar *)se->c)->first_watch_queue_entry;
*cp = se->c;
*r = se->c_child_r;
popOff();
*cp = se->c;
*r = se->c_child_r;
popOff();
@@
-1125,7
+1125,7
@@
isRetainer( StgClosure *c )
case BCO:
case ARR_WORDS:
// STM
case BCO:
case ARR_WORDS:
// STM
- case TVAR_WAIT_QUEUE:
+ case TVAR_WATCH_QUEUE:
case TREC_HEADER:
case TREC_CHUNK:
return rtsFalse;
case TREC_HEADER:
case TREC_CHUNK:
return rtsFalse;