1 files changed, 185 insertions, 71 deletions

diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp
index d6ef2e0..b6fb188 100644
--- a/unit_tests/lane_tests.cpp
+++ b/unit_tests/lane_tests.cpp
@@ -1,5 +1,7 @@
 #include "_pch.hpp"
+
 #include "shared.h"
+#include "lanes/src/threading.hpp"
 
 // #################################################################################################
 // #################################################################################################
@@ -33,7 +35,77 @@ TEST_CASE("lanes.nameof")
 // #################################################################################################
 // #################################################################################################
 
-TEST_CASE("lanes.sleep.argument validation")
+TEST_CASE("lanes.thread_priority_range")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+
+    S.requireSuccess("a, b = lanes.thread_priority_range(); print(a, b)");
+    S.requireSuccess("assert(type(a) == 'number' and type(b) == 'number' and b > a)");
+    S.requireSuccess("c, d = lanes.thread_priority_range('native'); print(c, d)");
+    S.requireSuccess("assert(type(c) == 'number' and type(d) == 'number' and d > c)");
+
+    // can't really test the range of values from pthread as they are platform-dependent
+    if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+        // windows constants THREAD_PRIORITY_IDLE and THREAD_PRIORITY_TIME_CRITICAL
+        S.requireSuccess("assert(c == -15 and d == 15)");
+    }
+}
+
+// #################################################################################################
+// #################################################################################################
+
+TEST_CASE("lanes.set_thread_priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+
+    SECTION("mapped priorities")
+    {
+        std::string_view const _script{
+            " min_prio, max_prio = lanes.thread_priority_range()"
+            " for prio = min_prio, max_prio do"
+            "     lanes.set_thread_priority(prio)"
+            " end"
+        };
+        S.requireSuccess(_script);
+
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+
+    SECTION("native priorities")
+    {
+        S.requireSuccess("min_prio, max_prio = lanes.thread_priority_range('native')");
+        if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+            // Win32 range is -15 to 15, but only some values are accepted
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_IDLE
+            S.requireFailure("lanes.set_thread_priority(-3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-2, 'native')"); // THREAD_PRIORITY_LOWEST
+            S.requireSuccess("lanes.set_thread_priority(-1, 'native')"); // THREAD_PRIORITY_BELOW_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(0, 'native')"); // THREAD_PRIORITY_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(1, 'native')"); // THREAD_PRIORITY_ABOVE_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(2, 'native')"); // THREAD_PRIORITY_HIGHEST
+            S.requireFailure("lanes.set_thread_priority(3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_TIME_CRITICAL
+        } else {
+            // until proven otherwise, the full set of values is supported by pthread
+            std::string_view const _script{
+                " for prio = min_prio, max_prio do"
+                "     lanes.set_thread_priority(prio, 'native')"
+                " end"
+            };
+            S.requireSuccess(_script);
+        }
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+}
+
+// #################################################################################################
+// #################################################################################################
+
+TEST_CASE("lanes.sleep.argument_validation/not_numbers")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
     S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -44,6 +116,14 @@ TEST_CASE("lanes.sleep.argument validation")
     S.requireFailure("lanes.sleep('a string')");
     S.requireFailure("lanes.sleep(lanes.null)");
     S.requireFailure("lanes.sleep(print)");
+}
+
+// #################################################################################################
+
+TEST_CASE("lanes.sleep.argument_validation/numbers")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
 
     // negative durations are not supported
     S.requireFailure("lanes.sleep(-1)");
@@ -97,88 +177,109 @@ TEST_CASE("lanes.sleep.interactions with timers")
 // #################################################################################################
 // #################################################################################################
 
-TEST_CASE("lanes.gen")
+TEST_CASE("lanes.gen.argument_checks")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
     S.requireSuccess("lanes = require 'lanes'.configure()");
 
     // ---------------------------------------------------------------------------------------------
 
-    SECTION("argument checks")
-    {
-        // no parameter is bad
-        S.requireFailure("lanes.gen()");
-
-        // minimal generator needs a function
-        S.requireSuccess("lanes.gen(function() end)");
-
-        // acceptable parameters for the generator are strings, tables, nil, followed by the function body
-        S.requireSuccess("lanes.gen(nil, function() end)");
-        S.requireSuccess("lanes.gen('', function() end)");
-        S.requireSuccess("lanes.gen({}, function() end)");
-        S.requireSuccess("lanes.gen('', {}, function() end)");
-        S.requireSuccess("lanes.gen({}, '', function() end)");
-        S.requireSuccess("lanes.gen('', '', function() end)");
-        S.requireSuccess("lanes.gen({}, {}, function() end)");
-
-        // anything different should fail: booleans, numbers, any userdata
-        S.requireFailure("lanes.gen(false, function() end)");
-        S.requireFailure("lanes.gen(true, function() end)");
-        S.requireFailure("lanes.gen(42, function() end)");
-        S.requireFailure("lanes.gen(io.stdin, function() end)");
-        S.requireFailure("lanes.gen(lanes.linda(), function() end)");
-        S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
-
-        // even if parameter types are correct, the function must come last
-        S.requireFailure("lanes.gen(function() end, '')");
-
-        // the strings should only list "known base libraries", in any order, or "*"
-        // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
-        S.requireSuccess("lanes.gen('base', function() end)");
-
-        // bit, ffi, jit are LuaJIT-specific
+    // no argument is bad
+    S.requireFailure("lanes.gen()");
+
+    // minimal generator needs a function
+    S.requireSuccess("lanes.gen(function() end)");
+
+    // acceptable arguments for the generator are strings, tables, nil, followed by the function body
+    S.requireSuccess("lanes.gen(nil, function() end)");
+    S.requireSuccess("lanes.gen('', function() end)");
+    S.requireSuccess("lanes.gen({}, function() end)");
+    S.requireSuccess("lanes.gen('', {}, function() end)");
+    S.requireSuccess("lanes.gen({}, '', function() end)");
+    S.requireSuccess("lanes.gen('', '', function() end)");
+    S.requireSuccess("lanes.gen({}, {}, function() end)");
+
+    // anything different should fail: booleans, numbers, any userdata
+    S.requireFailure("lanes.gen(false, function() end)");
+    S.requireFailure("lanes.gen(true, function() end)");
+    S.requireFailure("lanes.gen(42, function() end)");
+    S.requireFailure("lanes.gen(io.stdin, function() end)");
+    S.requireFailure("lanes.gen(lanes.linda(), function() end)");
+    S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
+
+    // even if argument types are correct, the function must come last
+    S.requireFailure("lanes.gen(function() end, '')");
+
+    // the strings should only list "known base libraries", in any order, or "*"
+    // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
+    S.requireSuccess("lanes.gen('base', function() end)");
+
+    // bit, ffi, jit are LuaJIT-specific
 #if LUAJIT_FLAVOR() == 0
-        S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
-        S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
+    S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
+    S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
 #endif // LUAJIT_FLAVOR()
 
-        // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
+    // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
 #if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireSuccess("lanes.gen('bit32', function() end)");
+    S.requireSuccess("lanes.gen('bit32', function() end)");
 #else // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireFailure("lanes.gen('bit32', function() end)");
-        S.requireSuccess("lanes.gen('bit32?', function() end)");
+    S.requireFailure("lanes.gen('bit32', function() end)");
+    S.requireSuccess("lanes.gen('bit32?', function() end)");
 #endif // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
 
-        // coroutine library appeared with Lua 5.2
+    // coroutine library appeared with Lua 5.2
 #if LUA_VERSION_NUM == 501
-        S.requireFailure("lanes.gen('coroutine', function() end)");
-        S.requireSuccess("lanes.gen('coroutine?', function() end)");
+    S.requireFailure("lanes.gen('coroutine', function() end)");
+    S.requireSuccess("lanes.gen('coroutine?', function() end)");
 #endif // LUA_VERSION_NUM == 501
 
-        S.requireSuccess("lanes.gen('debug', function() end)");
-        S.requireSuccess("lanes.gen('io', function() end)");
-        S.requireSuccess("lanes.gen('math', function() end)");
-        S.requireSuccess("lanes.gen('os', function() end)");
-        S.requireSuccess("lanes.gen('package', function() end)");
-        S.requireSuccess("lanes.gen('string', function() end)");
-        S.requireSuccess("lanes.gen('table', function() end)");
+    S.requireSuccess("lanes.gen('debug', function() end)");
+    S.requireSuccess("lanes.gen('io', function() end)");
+    S.requireSuccess("lanes.gen('math', function() end)");
+    S.requireSuccess("lanes.gen('os', function() end)");
+    S.requireSuccess("lanes.gen('package', function() end)");
+    S.requireSuccess("lanes.gen('string', function() end)");
+    S.requireSuccess("lanes.gen('table', function() end)");
 
-        // utf8 library appeared with Lua 5.3
+    // utf8 library appeared with Lua 5.3
 #if LUA_VERSION_NUM < 503
-        S.requireFailure("lanes.gen('utf8', function() end)");
-        S.requireSuccess("lanes.gen('utf8?', function() end)");
+    S.requireFailure("lanes.gen('utf8', function() end)");
+    S.requireSuccess("lanes.gen('utf8?', function() end)");
 #endif // LUA_VERSION_NUM < 503
 
-        S.requireSuccess("lanes.gen('lanes_core', function() end)");
-        // "*" repeated or combined with anything else is forbidden
-        S.requireFailure("lanes.gen('*', '*', function() end)");
-        S.requireFailure("lanes.gen('base', '*', function() end)");
-        // unknown names are forbidden
-        S.requireFailure("lanes.gen('Base', function() end)");
-        // repeating the same library more than once is forbidden
-        S.requireFailure("lanes.gen('base,base', function() end)");
-    }
+    S.requireSuccess("lanes.gen('lanes_core', function() end)");
+    // "*" repeated or combined with anything else is forbidden
+    S.requireFailure("lanes.gen('*', '*', function() end)");
+    S.requireFailure("lanes.gen('base', '*', function() end)");
+    // unknown names are forbidden
+    S.requireFailure("lanes.gen('Base', function() end)");
+    // repeating the same library more than once is forbidden
+    S.requireFailure("lanes.gen('base,base', function() end)");
+}
+
+// #################################################################################################
+// #################################################################################################
+
+TEST_CASE("lanes.gen.priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+
+    S.requireSuccess("lanes.gen({priority=1}, function() end)");
+    // AFAICT, 1 is accepted by all pthread flavors and win32 API
+    S.requireSuccess("lanes.gen({native_priority=1}, function() end)");
+    // shouldn't be able to provide 2 priority settings
+    S.requireFailure("lanes.gen({priority=1, native_priority=1}, function() end)");
+}
+
+// #################################################################################################
+// #################################################################################################
+
+TEST_CASE("lanes.gen.thread_naming")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
 
     // ---------------------------------------------------------------------------------------------
 
@@ -319,19 +420,24 @@ TEST_CASE("lane.cancel")
 // unfortunately, VS Test adapter does not list individual sections,
 // so let's create a separate test case for each file with an ugly macro...
 
-#define MAKE_TEST_CASE(DIR, FILE, CONDITION)\
-TEST_CASE("scripted tests." #DIR "." #FILE) \
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION) \
+TEST_CASE("scripted_tests." #DIR "." #FILE) \
 { \
     FileRunner _runner(R"(.\unit_tests\scripts)"); \
     _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
 }
 
-MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
-#if LUA_VERSION_NUM >= 504 // // warnings are a Lua 5.4 feature
-// NOTE: when this test ends, there are resource leaks and a dangling thread
-MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertWarns)
+#if LUA_VERSION_NUM >= 504 // this makes use of to-be-closed variables, a Lua 5.4 feature
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION) MAKE_TEST_CASE(DIR, FILE, CONDITION)
+#else // LUA_VERSION_NUM
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION)
 #endif // LUA_VERSION_NUM
+
+MAKE_TEST_CASE(lane, body_is_a_c_function, AssertNoLuaError)
+MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+MAKE_TEST_CASE_54(lane, uncooperative_shutdown, AssertWarns) // NOTE: when this test ends, there are resource leaks and a dangling thread
 MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_cancelling_with_hook, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_comms_criss_cross, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_communications, AssertNoLuaError)
@@ -339,19 +445,27 @@ MAKE_TEST_CASE(lane, tasking_error, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_join_test, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_send_receive_code, AssertNoLuaError)
 MAKE_TEST_CASE(lane, stdlib_naming, AssertNoLuaError)
-MAKE_TEST_CASE(coro, basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, cancelling_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, collect_yielded_lane, AssertNoLuaError)
 #if LUAJIT_FLAVOR() == 0
 // TODO: for some reason, the test fails with LuaJIT. To be investigated
 MAKE_TEST_CASE(coro, error_handling, AssertNoLuaError)
 #endif // LUAJIT_FLAVOR()
+MAKE_TEST_CASE(coro, index_suspended, AssertNoLuaError)
+MAKE_TEST_CASE(coro, join_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, linda_in_close_handler, AssertNoLuaError)
+MAKE_TEST_CASE(coro, regular_function, AssertNoLuaError)
+MAKE_TEST_CASE(coro, resume_basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, yielding_in_non_coro_errors, AssertNoLuaError)
 
 /*
-TEST_CASE("lanes.scripted tests")
+TEST_CASE("lanes.scripted_tests")
 {
     auto const& _testParam = GENERATE(
         FileRunnerParam{ PUC_LUA_ONLY("lane/cooperative_shutdown"), TestType::AssertNoLuaError }, // 0
         FileRunnerParam{ "lane/uncooperative_shutdown", TestType::AssertWarns },
         FileRunnerParam{ "lane/tasking_basic", TestType::AssertNoLuaError }, // 2
+        FileRunnerParam{ "lane/tasking_cancelling_with_hook", TestType::AssertNoLuaError }, // 3
         FileRunnerParam{ "lane/tasking_cancelling", TestType::AssertNoLuaError }, // 3
         FileRunnerParam{ "lane/tasking_comms_criss_cross", TestType::AssertNoLuaError }, // 4
         FileRunnerParam{ "lane/tasking_communications", TestType::AssertNoLuaError },