Unit tests for thread name

2 files changed, 62 insertions, 11 deletions

diff --git a/src/lane.cpp b/src/lane.cpp
index 63efdb6..7664dd6 100644
--- a/src/lane.cpp
+++ b/src/lane.cpp
@@ -88,12 +88,12 @@ static LUAG_FUNC(lane_threadname)
     Lane* const _lane{ luaG_tolightuserdata<Lane>(L_, StackIndex{ lua_upvalueindex(1) }) };
     LUA_ASSERT(L_, L_ == _lane->L); // this function is exported in a lane's state, therefore it is callable only from inside the Lane's state
     if (lua_gettop(L_) == 1) {
-    lua_settop(L_, 1);
-    STACK_CHECK_START_REL(L_, 0);
-    _lane->storeDebugName(luaG_tostring(L_, kIdxTop));
-    _lane->applyDebugName();
-    STACK_CHECK(L_, 0);
-    return 0;
+        lua_settop(L_, 1);
+        STACK_CHECK_START_REL(L_, 0);
+        _lane->storeDebugName(luaG_tostring(L_, kIdxTop));
+        _lane->applyDebugName();
+        STACK_CHECK(L_, 0);
+        return 0;
     } else if (lua_gettop(L_) == 0) {
         luaG_pushstring(L_, _lane->getDebugName());
         return 1;
diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp
index 14a327f..8b22fcd 100644
--- a/unit_tests/lane_tests.cpp
+++ b/unit_tests/lane_tests.cpp
@@ -104,17 +104,16 @@ TEST_F(LaneTests, UncooperativeShutdown)
     lua_pushcfunction(S, _finallyCB);
     lua_setglobal(S, "finallyCB");
     // start a lane that lasts a long time
-    std::string_view const script{
+    std::string_view const _script{
         " lanes.finally(finallyCB)"
-        " print ('in Master')"
-        " f = lanes.gen('*',"
+        " g = lanes.gen('*',"
         "     {name = 'auto'},"
         "     function()"
         "         for i = 1,1e37 do end" // no cooperative cancellation checks here!
         "     end)"
-        " f()"
+        " g()"
     };
-    ASSERT_EQ(S.doString(script), LuaError::OK) << S;
+    ASSERT_EQ(S.doString(_script), LuaError::OK) << S;
     // close the state before the lane ends.
     // since we don't wait at all, it is possible that the OS thread for the lane hasn't even started at that point
     S.close();
@@ -124,6 +123,58 @@ TEST_F(LaneTests, UncooperativeShutdown)
 }
 
 // #################################################################################################
+
+TEST_F(LaneTests, DefaultThreadNameIsUnnamed)
+{
+    std::string_view const _script{
+        " g = lanes.gen('*',"
+        "     function()"
+        "         return lane_threadname()"
+        "     end)"
+        " h = g()"
+        " local tn = h[1]"
+        " assert(tn == h:get_threadname())"
+        " return tn"
+    };
+    ASSERT_EQ(S.doStringAndRet(_script), "<unnamed>") << S;
+}
+
+// #################################################################################################
+
+TEST_F(LaneTests, UserThreadNameFromGenerator)
+{
+    std::string_view const _script{
+        " g = lanes.gen('*',"
+        "     { name = 'user name'},"
+        "     function()"
+        "         return lane_threadname()"
+        "     end)"
+        " h = g()"
+        " local tn = h[1]"
+        " assert(tn == h:get_threadname())"
+        " return tn"
+    };
+    ASSERT_EQ(S.doStringAndRet(_script), "user name") << S;
+}
+
+// #################################################################################################
+
+TEST_F(LaneTests, UserThreadNameFromInside)
+{
+    std::string_view const _script{
+        " g = lanes.gen('*',"
+        "     function()"
+        "         lane_threadname('user name')"
+        "         return true"
+        "     end)"
+        " h = g()"
+        " h:join()"
+        " return h:get_threadname()"
+    };
+    ASSERT_EQ(S.doStringAndRet(_script), "user name") << S;
+}
+
+// #################################################################################################
 // #################################################################################################
 
 class LaneCancel : public ::testing::Test