diff options
author | Alexey Melnichuk <alexeymelnichuck@gmail.com> | 2018-07-01 11:20:35 +0300 |
---|---|---|
committer | Alexey Melnichuk <alexeymelnichuck@gmail.com> | 2018-07-01 11:28:52 +0300 |
commit | e33999a890c8bfdb0c1f753820e4261dabb67faa (patch) | |
tree | e484f012612ad1bef0287a08665f5cd5cf7b2568 | |
parent | 91b24571b3e00324460fc45a9a80cda02b59e485 (diff) | |
download | lua-llthreads2-e33999a890c8bfdb0c1f753820e4261dabb67faa.tar.gz lua-llthreads2-e33999a890c8bfdb0c1f753820e4261dabb67faa.tar.bz2 lua-llthreads2-e33999a890c8bfdb0c1f753820e4261dabb67faa.zip |
Release 0.1.5v0.1.5
-rw-r--r-- | .travis.yml | 29 | ||||
-rw-r--r-- | rockspecs/lua-llthreads2-0.1.5-1.rockspec | 45 | ||||
-rw-r--r-- | rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec | 45 | ||||
-rw-r--r-- | src/llthread.c | 2 |
4 files changed, 103 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index c4f54b4..d629f05 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -1,24 +1,20 @@ | |||
1 | language: c | ||
2 | |||
1 | sudo: false | 3 | sudo: false |
2 | 4 | ||
3 | matrix: | 5 | matrix: |
4 | include: | 6 | include: |
5 | - compiler: ": Lua51-osx" | 7 | - env: LUA="lua 5.1" |
6 | env: LUA="lua 5.1" | ||
7 | os: osx | 8 | os: osx |
8 | - compiler: ": Lua51" | 9 | - env: LUA="lua 5.1" |
9 | env: LUA="lua 5.1" | ||
10 | os: linux | 10 | os: linux |
11 | - compiler: ": Lua52" | 11 | - env: LUA="lua 5.2" |
12 | env: LUA="lua 5.2" | ||
13 | os: linux | 12 | os: linux |
14 | - compiler: ": Lua53" | 13 | - env: LUA="lua 5.3" |
15 | env: LUA="lua 5.3" | ||
16 | os: linux | 14 | os: linux |
17 | - compiler: ": LuaJIT20" | 15 | - env: LUA="luajit 2.0" |
18 | env: LUA="luajit 2.0" | ||
19 | os: linux | 16 | os: linux |
20 | - compiler: ": LuaJIT21" | 17 | - env: LUA="luajit 2.1" |
21 | env: LUA="luajit 2.1" | ||
22 | os: linux | 18 | os: linux |
23 | 19 | ||
24 | cache: | 20 | cache: |
@@ -29,14 +25,13 @@ cache: | |||
29 | branches: | 25 | branches: |
30 | only: | 26 | only: |
31 | - master | 27 | - master |
28 | - curl_mime | ||
32 | 29 | ||
33 | before_install: | 30 | before_install: |
34 | - export CC=gcc | ||
35 | - gcc --version | ||
36 | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python/2.7/bin/; fi | 31 | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python/2.7/bin/; fi |
37 | - pip install --user hererocks | 32 | - pip2 install --user hererocks |
38 | - hererocks here -r^ --$LUA; | 33 | - hererocks here -r^ --$LUA |
39 | - export PATH=$PATH:$PWD/here/bin | 34 | - source here/bin/activate |
40 | 35 | ||
41 | install: | 36 | install: |
42 | - luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec | 37 | - luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec |
diff --git a/rockspecs/lua-llthreads2-0.1.5-1.rockspec b/rockspecs/lua-llthreads2-0.1.5-1.rockspec new file mode 100644 index 0000000..ebe843c --- /dev/null +++ b/rockspecs/lua-llthreads2-0.1.5-1.rockspec | |||
@@ -0,0 +1,45 @@ | |||
1 | package = "lua-llthreads2" | ||
2 | version = "0.1.5-1" | ||
3 | source = { | ||
4 | url = "https://github.com/moteus/lua-llthreads2/archive/v0.1.5.zip", | ||
5 | dir = "lua-llthreads2-0.1.5", | ||
6 | } | ||
7 | description = { | ||
8 | summary = "Low-Level threads for Lua", | ||
9 | homepage = "http://github.com/moteus/lua-llthreads2", | ||
10 | license = "MIT/X11", | ||
11 | detailed = [[ | ||
12 | This is drop-in replacement for `lua-llthread` module but the module called `llthreads2`. | ||
13 | In additional module supports: thread join with zero timeout; logging thread errors with | ||
14 | custom logger; run detached joinable threads; pass cfunctions as argument to child thread. | ||
15 | ]], | ||
16 | } | ||
17 | dependencies = { | ||
18 | "lua >= 5.1, < 5.4", | ||
19 | } | ||
20 | build = { | ||
21 | type = "builtin", | ||
22 | platforms = { | ||
23 | unix = { | ||
24 | modules = { | ||
25 | llthreads2 = { | ||
26 | libraries = {"pthread"}, | ||
27 | } | ||
28 | } | ||
29 | }, | ||
30 | windows = { | ||
31 | modules = { | ||
32 | llthreads2 = { | ||
33 | libraries = {"kernel32"}, | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | }, | ||
38 | modules = { | ||
39 | llthreads2 = { | ||
40 | sources = { "src/l52util.c", "src/llthread.c" }, | ||
41 | defines = { "LLTHREAD_MODULE_NAME=llthreads2" }, | ||
42 | }, | ||
43 | ["llthreads2.ex"] = "src/lua/llthreads2/ex.lua", | ||
44 | } | ||
45 | } \ No newline at end of file | ||
diff --git a/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec b/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec new file mode 100644 index 0000000..9fd4bf4 --- /dev/null +++ b/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec | |||
@@ -0,0 +1,45 @@ | |||
1 | package = "lua-llthreads2-compat" | ||
2 | version = "0.1.5-1" | ||
3 | source = { | ||
4 | url = "https://github.com/moteus/lua-llthreads2/archive/v0.1.5.zip", | ||
5 | dir = "lua-llthreads2-0.1.5", | ||
6 | } | ||
7 | description = { | ||
8 | summary = "Low-Level threads for Lua", | ||
9 | homepage = "http://github.com/moteus/lua-llthreads2", | ||
10 | license = "MIT/X11", | ||
11 | detailed = [[ | ||
12 | This is drop-in replacement for `lua-llthread` module. | ||
13 | In additional module supports: thread join with zero timeout; logging thread errors with | ||
14 | custom logger; run detached joinable threads; pass cfunctions as argument to child thread. | ||
15 | ]], | ||
16 | } | ||
17 | dependencies = { | ||
18 | "lua >= 5.1, < 5.4", | ||
19 | } | ||
20 | build = { | ||
21 | type = "builtin", | ||
22 | platforms = { | ||
23 | unix = { | ||
24 | modules = { | ||
25 | llthreads = { | ||
26 | libraries = {"pthread"}, | ||
27 | } | ||
28 | } | ||
29 | }, | ||
30 | windows = { | ||
31 | modules = { | ||
32 | llthreads = { | ||
33 | libraries = {"kernel32"}, | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | }, | ||
38 | modules = { | ||
39 | llthreads = { | ||
40 | sources = { "src/l52util.c", "src/llthread.c" }, | ||
41 | defines = { "LLTHREAD_MODULE_NAME=llthreads" }, | ||
42 | }, | ||
43 | ["llthreads.ex"] = "src/lua/llthreads2/ex.lua", | ||
44 | } | ||
45 | } \ No newline at end of file | ||
diff --git a/src/llthread.c b/src/llthread.c index eb0c861..3155113 100644 --- a/src/llthread.c +++ b/src/llthread.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #define LLTHREAD_VERSION_MAJOR 0 | 5 | #define LLTHREAD_VERSION_MAJOR 0 |
6 | #define LLTHREAD_VERSION_MINOR 1 | 6 | #define LLTHREAD_VERSION_MINOR 1 |
7 | #define LLTHREAD_VERSION_PATCH 5 | 7 | #define LLTHREAD_VERSION_PATCH 5 |
8 | #define LLTHREAD_VERSION_COMMENT "dev" | 8 | // #define LLTHREAD_VERSION_COMMENT "dev" |
9 | 9 | ||
10 | #ifndef USE_PTHREAD | 10 | #ifndef USE_PTHREAD |
11 | # include <windows.h> | 11 | # include <windows.h> |