[commit: ghc] master: rts: Don't default to single capability when profiled (4bfff7a)

git at git.haskell.org git at git.haskell.org
Mon Dec 11 19:26:55 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bfff7a507b5807736e9c6ce9814a9cfa60faeff/ghc

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

commit 4bfff7a507b5807736e9c6ce9814a9cfa60faeff
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Dec 11 12:55:31 2017 -0500

    rts: Don't default to single capability when profiled
    
    This was presumably a vestige of the days when the profiled RTS couldn't
    run threaded. Fixes #14545.
    
    Test Plan: simonmar
    
    Reviewers: erikd, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie, carter
    
    GHC Trac Issues: #14545
    
    Differential Revision: https://phabricator.haskell.org/D4245


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

4bfff7a507b5807736e9c6ce9814a9cfa60faeff
 rts/RtsFlags.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 39b1273..26171cf 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -1289,11 +1289,7 @@ error = true;
                 OPTION_SAFE;
                 THREADED_BUILD_ONLY(
                 if (rts_argv[arg][2] == '\0') {
-#if defined(PROFILING)
-                    RtsFlags.ParFlags.nCapabilities = 1;
-#else
                     RtsFlags.ParFlags.nCapabilities = getNumberOfProcessors();
-#endif
                 } else {
                     int nCapabilities;
                     OPTION_SAFE; /* but see extra checks below... */



More information about the ghc-commits mailing list