[project @ 1996-07-19 18:36:04 by partain]

[ghc-hetmet.git] / ghc / runtime / gum / FetchMe.lhc

diff --git a/ghc/runtime/gum/FetchMe.lhc b/ghc/runtime/gum/FetchMe.lhc
index 984751d..98be3d5 100644 (file)
--- a/ghc/runtime/gum/FetchMe.lhc
+++ b/ghc/runtime/gum/FetchMe.lhc
@@ -41,7 +41,7 @@ STGFUN(FetchMe_entry)
     rGA = FETCHME_GA(Node);
     ASSERT(rGA->loc.gc.gtid != mytid);
 
-    TSO_LINK(CurrentTSO) = Nil_closure;
+    TSO_LINK(CurrentTSO) = Prelude_Z91Z93_closure;
     SET_INFO_PTR(Node, FMBQ_info);
     FMBQ_ENTRIES(Node) = (W_) CurrentTSO;
 
@@ -55,15 +55,17 @@ STGFUN(FetchMe_entry)
        QP_Event1("GR", CurrentTSO);
     }
 
-    if(do_gr_profile) {
+    if (RTSflags.ParFlags.granSimStats) {
         /* Note that CURRENT_TIME may perform an unsafe call */
        TIME now = CURRENT_TIME;
         TSO_EXECTIME(CurrentTSO) += now - TSO_BLOCKEDAT(CurrentTSO);
         TSO_FETCHCOUNT(CurrentTSO)++;
        TSO_QUEUE(CurrentTSO) = Q_FETCHING;
         TSO_BLOCKEDAT(CurrentTSO) = now;
-        DumpGranEventAndNode(GR_FETCH, CurrentTSO, (SAVE_R1).p, 
-          taskIDtoPE(rGA->loc.gc.gtid));
+        /* DumpGranEventAndNode(GR_FETCH, CurrentTSO, (SAVE_R1).p, 
+           taskIDtoPE(rGA->loc.gc.gtid)); */
+       DumpRawGranEvent(CURRENT_PROC,taskIDtoPE(rGA->loc.gc.gtid),GR_FETCH,
+                        CurrentTSO,(SAVE_R1).p,0);
     }
 
     /* Assign a brand-new global address to the newly created FMBQ */
@@ -124,7 +126,7 @@ STGFUN(FMBQ_entry)
        QP_Event1("GR", CurrentTSO);
     }
 
-    if(do_gr_profile) {
+    if (RTSflags.ParFlags.granSimStats) {
         /* Note that CURRENT_TIME may perform an unsafe call */
        TIME now = CURRENT_TIME;
         TSO_EXECTIME(CurrentTSO) += now - TSO_BLOCKEDAT(CurrentTSO);