Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-lwc
http://hackage.haskell.org/trac/ghc/changeset/3bf1b9d2a3ab3b10b21d1f2eb7faff31dd60f574 >--------------------------------------------------------------- commit 3bf1b9d2a3ab3b10b21d1f2eb7faff31dd60f574 Author: kc <[email protected]> Date: Sat May 12 10:52:37 2012 -0400 Removed tabs from tab-free files >--------------------------------------------------------------- rts/StgMiscClosures.cmm | 22 +++++++++++----------- tests/PChan.hs | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index 3992c91..6bbfbce 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -274,8 +274,8 @@ INFO_TABLE(stg_IND_PERM,1,0,IND_PERM,"IND_PERM","IND_PERM") INFO_TABLE(stg_BLACKHOLE,1,0,BLACKHOLE,"BLACKHOLE","BLACKHOLE") { W_ r, p, info; - W_ msg, owner, bh; - W_ trec; + W_ msg, owner, bh; + W_ trec; TICK_ENT_DYN_IND(); /* tick */ @@ -298,16 +298,16 @@ retry: info == stg_BLOCKING_QUEUE_CLEAN_info || info == stg_BLOCKING_QUEUE_DIRTY_info) { - trec = StgTSO_trec (CurrentTSO); - if (trec != NO_TREC) { - bh = R1; - (p) = foreign "C" suspendAllComputation (MyCapability() "ptr", bh "ptr") [R1]; - if (p != 0) { - goto retry; - } - foreign "C" debugBelch ("cap %d: PTM + BLACKHOLE + DIFFERENT_CAPABILIY\n", + trec = StgTSO_trec (CurrentTSO); + if (trec != NO_TREC) { + bh = R1; + (p) = foreign "C" suspendAllComputation (MyCapability() "ptr", bh "ptr") [R1]; + if (p != 0) { + goto retry; + } + foreign "C" debugBelch ("cap %d: PTM + BLACKHOLE + DIFFERENT_CAPABILIY\n", Capability_no (MyCapability ())) [R1]; - } + } ("ptr" msg) = foreign "C" allocate(MyCapability() "ptr", BYTES_TO_WDS(SIZEOF_MessageBlackHole)) [R1]; diff --git a/tests/PChan.hs b/tests/PChan.hs index e9cf25a..cfc1033 100644 --- a/tests/PChan.hs +++ b/tests/PChan.hs @@ -56,7 +56,7 @@ readPChan (PChan ref) = do st <- readPVar ref case st of (Seq.viewl -> Seq.EmptyL) -> do - readPChan (PChan ref) + readPChan (PChan ref) (Seq.viewl -> x Seq.:< tl) -> do writePVar ref $ tl return x _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
