[commit: ghc] master: Profiling: open .prof when -hr<cc> is specified (4e0a957)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4e0a957758af94bc39ff51814bad54faf96a94b9

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

commit 4e0a957758af94bc39ff51814bad54faf96a94b9
Author: Takano Akio <aljee at hyper.cx>
Date:   Wed Aug 15 11:16:40 2012 +0900

    Profiling: open .prof when -hr<cc> is specified
    
    The code for retainer profiling is used with e.g. +RTS -hc -hrfoo -RTS,
    as well as with +RTS -hr -RTS.

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

 rts/Profiling.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/rts/Profiling.c b/rts/Profiling.c
index cc4d78e..2544e00 100644
--- a/rts/Profiling.c
+++ b/rts/Profiling.c
@@ -240,7 +240,8 @@ initProfilingLogFile(void)
 #endif
 
     if (RtsFlags.CcFlags.doCostCentres == 0 && 
-        RtsFlags.ProfFlags.doHeapProfile != HEAP_BY_RETAINER)
+        RtsFlags.ProfFlags.doHeapProfile != HEAP_BY_RETAINER &&
+        RtsFlags.ProfFlags.retainerSelector == NULL)
     {
         /* No need for the <prog>.prof file */
         prof_filename = NULL;