[commit: ghc] ghc-8.0: Move stat_startGCSync (efcd302)

git at git.haskell.org git at git.haskell.org
Thu Aug 25 16:37:17 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/efcd302bbdbc6aa3e531c306c23a0ab25c6f6968/ghc

>---------------------------------------------------------------

commit efcd302bbdbc6aa3e531c306c23a0ab25c6f6968
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Wed Jul 27 08:25:59 2016 -0700

    Move stat_startGCSync
    
    @simonmar told me that it makes more sense this way.
    
    Test Plan: it still builds
    
    Reviewers: bgamari, austin, simonmar, erikd
    
    Reviewed By: simonmar, erikd
    
    Subscribers: thomie, simonmar
    
    Differential Revision: https://phabricator.haskell.org/D2428
    
    (cherry picked from commit e98edbd1b8947dcb4a47d20fc854c0a9a6954bea)


>---------------------------------------------------------------

efcd302bbdbc6aa3e531c306c23a0ab25c6f6968
 rts/Schedule.c | 2 ++
 rts/sm/GC.c    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Schedule.c b/rts/Schedule.c
index d0ab715..ff0a3d0 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1641,6 +1641,8 @@ scheduleDoGC (Capability **pcap, Task *task USED_IF_THREADS,
         } while (was_syncing);
     }
 
+    stat_startGCSync(gc_threads[cap->no]);
+
 #ifdef DEBUG
     unsigned int old_n_capabilities = n_capabilities;
 #endif
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 1072d0e..0405c80 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -1068,8 +1068,6 @@ waitForGcThreads (Capability *cap USED_IF_THREADS)
     nat i, j;
     rtsBool retry = rtsTrue;
 
-    stat_startGCSync(gc_threads[cap->no]);
-
     while(retry) {
         for (i=0; i < n_threads; i++) {
             if (i == me || gc_threads[i]->idle) continue;



More information about the ghc-commits mailing list