[commit: ghc] ghc-lwc2: Minor changes to chameneos to remove the debugging messages. Pulling in newer libraries. (bd9f907)

[git at git.haskell.org]

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

On branch  : ghc-lwc2
Link       : http://ghc.haskell.org/trac/ghc/changeset/bd9f9074eb9be2a805d376b93aa68f2801316fb3/ghc

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

commit bd9f9074eb9be2a805d376b93aa68f2801316fb3
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Fri Sep 27 11:58:10 2013 -0400

    Minor changes to chameneos to remove the debugging messages. Pulling in
    newer libraries.


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

bd9f9074eb9be2a805d376b93aa68f2801316fb3
 libraries/Cabal                                        |    2 +-
 libraries/primitive                                    |    2 +-
 libraries/vector                                       |    2 +-
 tests/Benchmarks/ChameneosRedux/Makefile               |    2 +-
 tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs |    2 +-
 tests/Benchmarks/Sieve/ConcurrentList.hs               |    2 --
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 902bbad..b4d0c0f 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 902bbad99f1724161c1a3c2eede633751c94a57d
+Subproject commit b4d0c0f2846542dc2e2df189fe145a56ac9b30b6
diff --git a/libraries/primitive b/libraries/primitive
index 33071fe..75c3379 160000
--- a/libraries/primitive
+++ b/libraries/primitive
@@ -1 +1 @@
-Subproject commit 33071fee2a1ba4bd099fe04bb55c2d657476c16d
+Subproject commit 75c3379b6d76e914cc3c7ffd290b6b1cad7ea3e6
diff --git a/libraries/vector b/libraries/vector
index 996e5ef..f271569 160000
--- a/libraries/vector
+++ b/libraries/vector
@@ -1 +1 @@
-Subproject commit 996e5efd51555e8ee2c1a21492eb506a38be90ae
+Subproject commit f27156970d9480806a5defcfea5367187c2a6997
diff --git a/tests/Benchmarks/ChameneosRedux/Makefile b/tests/Benchmarks/ChameneosRedux/Makefile
index 1d80edf..8cef8a9 100644
--- a/tests/Benchmarks/ChameneosRedux/Makefile
+++ b/tests/Benchmarks/ChameneosRedux/Makefile
@@ -9,6 +9,6 @@ GHC_OPTS_EXTRA=-XDeriveDataTypeable -XBangPatterns -XCPP -XGeneralizedNewtypeDer
 PROFILE_FLAGS := -DPROFILE_ENABLED -prof -fprof-auto -auto -auto-all -caf-all
 
 #Uncomment the following line to enable profiled compilation
-GHC_OPTS_EXTRA += $(PROFILE_FLAGS)
+#GHC_OPTS_EXTRA += $(PROFILE_FLAGS)
 
 all: $(TARGET)
diff --git a/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs b/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs
index d301c51..da5e758 100644
--- a/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs
+++ b/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs
@@ -9,7 +9,7 @@
 	 -N<number of cores>. Disable thread migration <+RTS -qm> for predictable
 	 performance.
 
-	 XXX KC: The user of withArrayLen is unsafe. We obtain pointers to addresses
+	 XXX KC: The use of withArrayLen is unsafe. We obtain pointers to addresses
 	 inside the array but not the byte array itself. This is a recipe for
 	 disaster. See http://hackage.haskell.org/trac/ghc/ticket/7012. Solution?
 -}
diff --git a/tests/Benchmarks/Sieve/ConcurrentList.hs b/tests/Benchmarks/Sieve/ConcurrentList.hs
index fcab221..d882218 100644
--- a/tests/Benchmarks/Sieve/ConcurrentList.hs
+++ b/tests/Benchmarks/Sieve/ConcurrentList.hs
@@ -46,7 +46,6 @@ _INL_(yieldControlAction)
 yieldControlAction :: Sched -> SCont -> PTM ()
 yieldControlAction !(Sched pa) !sc = do
   stat <- getSContStatus sc
-  unsafeIOToPTM $ debugPrint $ "yca: " ++ show sc ++ " " ++ show stat
   -- Fetch current capability's scheduler
   cc <- getCurrentCapability
   let !(frontRef, backRef)= pa ! cc
@@ -68,7 +67,6 @@ _INL_(scheduleSContAction)
 scheduleSContAction :: Sched -> SCont -> PTM ()
 scheduleSContAction !(Sched pa) !sc = do
   stat <- getSContStatus sc
-  unsafeIOToPTM $ debugPrint $ "ssa: " ++ show sc ++ " " ++ show stat
   -- Since we are making the given scont runnable, update its status to Yielded.
   setSContSwitchReason sc Yielded
   -- Fetch the given SCont's scheduler.