diff options
| author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-15 12:23:59 +0200 |
|---|---|---|
| committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-15 12:23:59 +0200 |
| commit | e55e2a5ab1b1c411efd4d0d2f64626671a9079b4 (patch) | |
| tree | 7669f1eda666832dc8b8c9675593aa334270f892 | |
| parent | 111790701a45e074de2e8e5d8d4831ac285e22b0 (diff) | |
| parent | e79953ff093c0518975111c69d16e97ccf966e20 (diff) | |
| download | lanes-e55e2a5ab1b1c411efd4d0d2f64626671a9079b4.tar.gz lanes-e55e2a5ab1b1c411efd4d0d2f64626671a9079b4.tar.bz2 lanes-e55e2a5ab1b1c411efd4d0d2f64626671a9079b4.zip | |
Merge branch 'C-Implementation'
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | tests/deadlock.lua | 2 |
2 files changed, 2 insertions, 1 deletions
| @@ -77,6 +77,7 @@ test: | |||
| 77 | $(MAKE) basic | 77 | $(MAKE) basic |
| 78 | $(MAKE) cancel | 78 | $(MAKE) cancel |
| 79 | $(MAKE) cyclic | 79 | $(MAKE) cyclic |
| 80 | $(MAKE) deadlock | ||
| 80 | $(MAKE) errhangtest | 81 | $(MAKE) errhangtest |
| 81 | $(MAKE) fibonacci | 82 | $(MAKE) fibonacci |
| 82 | $(MAKE) fifo | 83 | $(MAKE) fifo |
diff --git a/tests/deadlock.lua b/tests/deadlock.lua index 73d7ccb..c85d99f 100644 --- a/tests/deadlock.lua +++ b/tests/deadlock.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | -- this script tests the fix of a bug that could cause the mutex of a keeper state to remain locked | 1 | -- this script tests the fix of a bug that could cause the mutex of a keeper state to remain locked |
| 2 | -- see https://github.com/LuaLanes/lanes/commit/0cc1c9c9dcea5955f7dab921d9a2fff78c4e1729 | 2 | -- see https://github.com/LuaLanes/lanes/commit/0cc1c9c9dcea5955f7dab921d9a2fff78c4e1729 |
| 3 | 3 | ||
| 4 | local lanes = require('lanes').configure() | 4 | local lanes = require('lanes').configure{with_timers=false} |
| 5 | local linda = lanes.linda "deadlock_linda" | 5 | local linda = lanes.linda "deadlock_linda" |
| 6 | 6 | ||
| 7 | print "let's begin" | 7 | print "let's begin" |