summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbarrucadu <>2019-03-14 14:32:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-03-14 14:32:00 (GMT)
commit466474078858be2fe8a3cc91916ed91068933c47 (patch)
treedf39e83a9223c861dc05ff27bcff5264f2cfb486
parentdf566e36201eb216bd1b1de14f5d0e6ebc7c1f4a (diff)
version 2.0.0.12.0.0.1
-rw-r--r--CHANGELOG.rst12
-rwxr-xr-xTest/DejaFu/Conc/Internal.hs2
-rwxr-xr-xdejafu.cabal4
3 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 38c6a95..a02ddc1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,18 @@ standard Haskell versioning scheme.
.. _PVP: https://pvp.haskell.org/
+2.0.0.1 (2019-03-14)
+--------------------
+
+* Git: :tag:`dejafu-2.0.0.1`
+* Hackage: :hackage:`dejafu-2.0.0.1`
+
+Fixed
+~~~~~
+
+* (:issue:`267`) Throwing an asynchronous exception to the current
+ thread interrupts the current thread even if it is masked.
+
2.0.0.0 (2019-02-12)
--------------------
diff --git a/Test/DejaFu/Conc/Internal.hs b/Test/DejaFu/Conc/Internal.hs
index d37a057..5a5d720 100755
--- a/Test/DejaFu/Conc/Internal.hs
+++ b/Test/DejaFu/Conc/Internal.hs
@@ -534,7 +534,7 @@ stepThread _ _ _ _ tid (AThrowTo t e c) = synchronised $ \ctx@Context{..} ->
blocked = block (OnMask t) tid cThreads
in case M.lookup t cThreads of
Just thread
- | interruptible thread -> stepThrow (ThrowTo t) t e ctx { cThreads = threads' }
+ | interruptible thread || t == tid -> stepThrow (ThrowTo t) t e ctx { cThreads = threads' }
| otherwise -> pure
( Succeeded ctx { cThreads = blocked }
, BlockedThrowTo t
diff --git a/dejafu.cabal b/dejafu.cabal
index 7c50575..daecd0b 100755
--- a/dejafu.cabal
+++ b/dejafu.cabal
@@ -2,7 +2,7 @@
-- documentation, see http://haskell.org/cabal/users-guide/
name: dejafu
-version: 2.0.0.0
+version: 2.0.0.1
synopsis: A library for unit-testing concurrent programs.
description:
@@ -33,7 +33,7 @@ source-repository head
source-repository this
type: git
location: https://github.com/barrucadu/dejafu.git
- tag: dejafu-2.0.0.0
+ tag: dejafu-2.0.0.1
library
exposed-modules: Test.DejaFu