10000 Merge pull request #5 from mpickering/wip/fix-mvar · haskell-debugger/dap@243e585 · GitHub
[go: up one dir, main page]
Skip to content

Commit 243e585

Browse files
dmjiodmjio
authored
Merge pull request #5 from mpickering/wip/fix-mvar
Fix race conditions due to MVar usage
2 parents 56d44d2 + 88f3586 commit 243e585

File tree

10 files changed

+231
-185
lines changed

10 files changed

+231
-185
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Revision history for dap
22

3+
## Unreleased -- YYYY-mm-dd
4+
5+
* `Adaptor` has an additional type parameter denoting the type of the request
6+
we are responding to. Crucially, this will be `Request` when responding to a
7+
DAP request (e.g. in `send***` functions).
8+
On the other hand, this will be `()` for the `withAdaptor` continuation
9+
argument of `registerNewDebugSession` which unlifts `Adaptor` to `IO`
10+
because, when unlifting, we are not replying to any request.
11+
312
## 0.1.0.0 -- YYYY-mm-dd
413

514
* First version. Released on an unsuspecting world.

‎dap.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ library
2727
DAP.Types
2828
DAP.Utils
2929
build-depends:
30-
aeson >= 2.0.3 && < 2.1,
30+
aeson >= 2.0.3 && < 2.3,
3131
aeson-pretty >= 0.8.9 && < 0.9,
3232
base < 5,
33-
bytestring >= 0.11.4 && < 0.12,
33+
bytestring >= 0.11.4 && < 0.13,
3434
containers >= 0.6.5 && < 0.7,
3535
lifted-base >= 0.2.3 && < 0.3,
3636
monad-control >= 1.0.3 && < 1.1,
37-
mtl >= 2.2.2 && < 2.3,
37+
mtl >= 2.2.2 && < 2.4,
3838
network >= 3.1.2 && < 3.2,
3939
network-simple >= 0.4.5 && < 0.5,
40-
text >= 1.2.5 && < 1.3,
40+
text >= 1.2.5 && < 2.2,
4141
time >= 1.11.1 && < 1.12,
4242
unordered-containers >= 0.2.19 && < 0.3,
4343
stm >= 2.5.0 && < 2.6,

‎default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ pkgs ? import <nixpkgs> {} }:
22
let
3-
dap = pkgs.haskell.packages.ghc927.callCabal2nix "dap" ./. {};
3+
dap = pkgs.haskell.packages.ghc966.callCabal2nix "dap" ./. {};
44
in
55
{
66
inherit dap pkgs;

‎src/DAP.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
----------------------------------------------------------------------------
12
module DAP
23
( module DAP.Adaptor
34
, module DAP.Event
@@ -6,10 +7,11 @@ module DAP
67
, module DAP.Server
78
, module DAP.Types
89
) where
9-
10+
----------------------------------------------------------------------------
1011
import DAP.Adaptor
1112
import DAP.Event
1213
import DAP.Internal
1314
import DAP.Response
1415
import DAP.Server
1516
import DAP.Types
17+
----------------------------------------------------------------------------

0 commit comments

Comments
 (0)
0