Revert "Per-thread allocation counters and limits"

Problems were found on 32-bit platforms, I'll commit again when I have a fix.

This reverts the following commits:
   54b31f744848da872c7c6366dea840748e01b5cf
   b0534f78a73f972e279eed4447a5687bd6a8308e

8 files changed, 0 insertions, 82 deletions

diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index f8f583ec8a..d4e76c6b1e 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -81,12 +81,6 @@ test('tryReadMVar1', normal, compile_and_run, [''])
 
 test('T7970', normal, compile_and_run, [''])
 
-test('allocLimit1', exit_code(1), compile_and_run, [''])
-test('allocLimit2', normal, compile_and_run, [''])
-test('allocLimit3', exit_code(1), compile_and_run, [''])
-test('allocLimit4', [ extra_run_opts('+RTS -xq300k -RTS') ],
-                    compile_and_run, [''])
-
 # -----------------------------------------------------------------------------
 # These tests we only do for a full run
 
@@ -251,4 +245,3 @@ test('setnumcapabilities001',
 
 # omit ghci, which can't handle unboxed tuples:
 test('compareAndSwap', [omit_ways(['ghci','hpc']), reqlib('primitive')], compile_and_run, [''])
-
diff --git a/testsuite/tests/concurrent/should_run/allocLimit1.hs b/testsuite/tests/concurrent/should_run/allocLimit1.hs
deleted file mode 100644
index b1c8fa6035..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit1.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Main (main) where
-
-import GHC.Conc
-
-main = do
-  setAllocationCounter (10*1024)
-  enableAllocationLimit
-  print (length [1..])
-
diff --git a/testsuite/tests/concurrent/should_run/allocLimit1.stderr b/testsuite/tests/concurrent/should_run/allocLimit1.stderr
deleted file mode 100644
index 2133e14ce1..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit1.stderr
+++ /dev/null
@@ -1 +0,0 @@
-allocLimit1: allocation limit exceeded
diff --git a/testsuite/tests/concurrent/should_run/allocLimit2.hs b/testsuite/tests/concurrent/should_run/allocLimit2.hs
deleted file mode 100644
index 4fd117b615..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit2.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-module Main (main) where
-
-import GHC.Conc
-import Control.Concurrent
-import Control.Exception
-import System.Exit
-
-main = do
-  m <- newEmptyMVar
-  let action =  do setAllocationCounter (10*1024)
-                   enableAllocationLimit
-                   print (length [1..])
-  forkFinally action (putMVar m)
-  r <- takeMVar m
-  case r of
-    Left e | Just AllocationLimitExceeded <- fromException e -> return ()
-    _ -> print r >> exitFailure
diff --git a/testsuite/tests/concurrent/should_run/allocLimit3.hs b/testsuite/tests/concurrent/should_run/allocLimit3.hs
deleted file mode 100644
index 28881dc016..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit3.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-module Main (main) where
-
-import GHC.Conc
-import Control.Concurrent
-import Control.Exception
-
-main = do
-  setAllocationCounter (10*1024)
-  enableAllocationLimit
-
-  -- alloc limit overflow while masked: should successfully print the
-  -- result, and then immediately raise the exception
-  r <- mask_ $ try $ print (length [1..100000])
-
-  print (r :: Either SomeException ())
diff --git a/testsuite/tests/concurrent/should_run/allocLimit3.stderr b/testsuite/tests/concurrent/should_run/allocLimit3.stderr
deleted file mode 100644
index 27ae0a9480..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit3.stderr
+++ /dev/null
@@ -1 +0,0 @@
-allocLimit3: allocation limit exceeded
diff --git a/testsuite/tests/concurrent/should_run/allocLimit3.stdout b/testsuite/tests/concurrent/should_run/allocLimit3.stdout
deleted file mode 100644
index f7393e847d..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit3.stdout
+++ /dev/null
@@ -1 +0,0 @@
-100000
diff --git a/testsuite/tests/concurrent/should_run/allocLimit4.hs b/testsuite/tests/concurrent/should_run/allocLimit4.hs
deleted file mode 100644
index b589ffa4af..0000000000
--- a/testsuite/tests/concurrent/should_run/allocLimit4.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-module Main (main) where
-
-import GHC.Conc
-import Control.Concurrent
-import Control.Exception
-import System.Exit
-import Control.Monad
-
--- check that +RTS -xq is doing the right thing: the test requires
--- +RTS -xq300k
-
-main = do
-  m <- newEmptyMVar
-  let action = do
-         e <- try $ do
-          setAllocationCounter (10*1024)
-          enableAllocationLimit
-          print (length [1..])
-         case e of
-           Left AllocationLimitExceeded{} -> do
-             c <- getAllocationCounter
-             when (c < 250*1024 || c > 350*1024) $ fail "wrong limit grace"
-             print (length [2..])
-           Right _ ->
-             fail "didn't catch AllocationLimitExceeded"
-
-  forkFinally action (putMVar m)
-  r <- takeMVar m
-  case r of
-    Left e | Just AllocationLimitExceeded <- fromException e -> return ()
-    _ -> print r >> exitFailure