From 3bfb6dec957e5e034c12157787fab9faf75c85a1 Mon Sep 17 00:00:00 2001
From: Benoit Germain <benoit.germain@ubisoft.com>
Date: Wed, 24 Apr 2024 15:06:07 +0200
Subject: C++ migration: push_thread_status converted to a Lane class method

---
 src/cancel.cpp      |  2 +-
 src/deep.h          |  3 ---
 src/lanes.cpp       | 34 ++++++++++++++++++----------------
 src/lanes_private.h |  3 +--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/cancel.cpp b/src/cancel.cpp
index a7dc0ec..5bcf79d 100644
--- a/src/cancel.cpp
+++ b/src/cancel.cpp
@@ -274,7 +274,7 @@ LUAG_FUNC(thread_cancel)
 
         case CancelResult::Cancelled:
         lua_pushboolean(L, 1);                // true
-        push_thread_status(L, lane);          // true status
+        lane->pushThreadStatus(L);            // true status
         break;
     }
     STACK_CHECK(L, 2);
diff --git a/src/deep.h b/src/deep.h
index 3256e6e..95802d1 100644
--- a/src/deep.h
+++ b/src/deep.h
@@ -82,6 +82,3 @@ class DeepFactory
     static void DeleteDeepObject(lua_State* L, DeepPrelude* o_);
     static char const* PushDeepProxy(Dest L, DeepPrelude* prelude, int nuv_, LookupMode mode_);
 };
-
-//LANES_API [[nodiscard]] int luaG_newdeepuserdata(Dest L, DeepFactory& factory_, int nuv_);
-//LANES_API [[nodiscard]] DeepPrelude* luaG_todeep(lua_State* L, DeepFactory &factory_, int index);
diff --git a/src/lanes.cpp b/src/lanes.cpp
index 1f938d4..880c150 100644
--- a/src/lanes.cpp
+++ b/src/lanes.cpp
@@ -1337,27 +1337,29 @@ LUAG_FUNC(lane_new)
 //                   / "error"     finished at an error, error value is there
 //                   / "cancelled"   execution cancelled by M (state gone)
 //
-[[nodiscard]] static char const* thread_status_string(Lane* lane_)
+[[nodiscard]] static char const* thread_status_string(Lane::Status status_)
 {
-    Lane::Status const st{ lane_->m_status }; // read just once (volatile)
-    char const* str =
-        (st == Lane::Pending) ? "pending" :
-        (st == Lane::Running) ? "running" :    // like in 'co.status()'
-        (st == Lane::Waiting) ? "waiting" :
-        (st == Lane::Done) ? "done" :
-        (st == Lane::Error) ? "error" :
-        (st == Lane::Cancelled) ? "cancelled" : nullptr;
+    char const* const str
+    {
+        (status_ == Lane::Pending) ? "pending" :
+        (status_ == Lane::Running) ? "running" :    // like in 'co.status()'
+        (status_ == Lane::Waiting) ? "waiting" :
+        (status_ == Lane::Done) ? "done" :
+        (status_ == Lane::Error) ? "error" :
+        (status_ == Lane::Cancelled) ? "cancelled" :
+        nullptr
+    };
     return str;
 }
 
 // #################################################################################################
 
-void push_thread_status(lua_State* L, Lane* lane_)
+void Lane::pushThreadStatus(lua_State* L_)
 {
-    char const* const str{ thread_status_string(lane_) };
-    LUA_ASSERT(L, str);
+    char const* const str{ thread_status_string(m_status) };
+    LUA_ASSERT(L_, str);
 
-    lua_pushstring(L, str);
+    lua_pushstring(L_, str);
 }
 
 // #################################################################################################
@@ -1495,7 +1497,7 @@ LUAG_FUNC(thread_index)
                     // this is an internal error, we probably never get here
                     lua_settop(L, 0);
                     lua_pushliteral(L, "Unexpected status: ");
-                    lua_pushstring(L, thread_status_string(lane));
+                    lua_pushstring(L, thread_status_string(lane->m_status));
                     lua_concat(L, 2);
                     raise_lua_error(L);
                     [[fallthrough]]; // fall through if we are killed, as we got nil, "killed" on the stack
@@ -1568,7 +1570,7 @@ LUAG_FUNC(thread_index)
         lua_settop(L, 2); // keep only our original arguments on the stack
         if (strcmp( keystr, "status") == 0)
         {
-            push_thread_status(L, lane); // push the string representing the status
+            lane->pushThreadStatus(L); // push the string representing the status
             return 1;
         }
         // return UD.metatable[key]
@@ -1616,7 +1618,7 @@ LUAG_FUNC(threads)
             lua_newtable(L);                                   // {} {}
             lua_pushstring(L, lane->debug_name);               // {} {} "name"
             lua_setfield(L, -2, "name");                       // {} {}
-            push_thread_status(L, lane);                       // {} {} "status"
+            lane->pushThreadStatus(L);                         // {} {} "status"
             lua_setfield(L, -2, "status");                     // {} {}
             lua_rawseti(L, -2, ++index);                       // {}
             lane = lane->tracking_next;
diff --git a/src/lanes_private.h b/src/lanes_private.h
index 807359f..c35d618 100644
--- a/src/lanes_private.h
+++ b/src/lanes_private.h
@@ -89,6 +89,7 @@ class Lane
 
     [[nodiscard]] bool waitForCompletion(lua_Duration duration_);
     void startThread(int priority_);
+    void pushThreadStatus(lua_State* L_);
 };
 
 // xxh64 of string "LANE_POINTER_REGKEY" generated at https://www.pelock.com/products/hash-calculator
@@ -102,5 +103,3 @@ static constexpr RegistryUniqueKey LANE_POINTER_REGKEY{ 0xB3022205633743BCull };
 {
     return *(static_cast<Lane**>(luaL_checkudata(L, i_, "Lane")));
 }
-
-void push_thread_status(lua_State* L, Lane* lane_);
-- 
cgit v1.2.3-55-g6feb