lanes.linda("auto")

4 files changed, 26 insertions, 5 deletions

diff --git a/docs/index.html b/docs/index.html
index 1b24422..e17c7db 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1217,6 +1217,11 @@
 </pre></td></tr></table>
 
 <p>
+        Converting the Linda to a string will yield the provided name prefixed by <tt>"Linda: "</tt>.<br/>
+        If <tt>opt_name</tt> is omitted, it will evaluate to an hexadecimal number uniquely representing that linda.<br/>
+        If <tt>opt_name</tt> is <tt>"auto"</tt>, Lanes will try to construct a name from the source location that called <tt>lanes.linda()</tt>. If that fails, the linda name will be <tt>"&lt;unresolved&gt;"</tt>.
+</p>
+<p>
         Timeouts are given in seconds (&gt= 0, millisecond accuracy) or <tt>nil</tt>. Timeout can be omitted only if the first key is not a number (then it's equivalent to an infinite duration).
 </p>
 
diff --git a/src/linda.cpp b/src/linda.cpp
index 33d9f0b..8b6df8e 100644
--- a/src/linda.cpp
+++ b/src/linda.cpp
@@ -88,7 +88,8 @@ template <bool OPT>
         if (!_lindaName.empty()) {
             std::ignore = luaG_pushstringview(L_, _lindaName);
         } else {
-            lua_pushfstring(L_, "%p", _linda);
+            // obfuscate the pointer so that we can't read the value with our eyes out of a script
+            std::ignore = luaG_pushstringview(L_, "%p", std::bit_cast<uintptr_t>(_linda) ^ kConfigRegKey.storage);
         }
         lua_concat(L_, 2);
         return 1;
diff --git a/src/lindafactory.cpp b/src/lindafactory.cpp
index d99d546..3f4b9b0 100644
--- a/src/lindafactory.cpp
+++ b/src/lindafactory.cpp
@@ -101,7 +101,7 @@ std::string_view LindaFactory::moduleName() const
 
 // #################################################################################################
 
-DeepPrelude* LindaFactory::newDeepObjectInternal(lua_State* L_) const
+DeepPrelude* LindaFactory::newDeepObjectInternal(lua_State* const L_) const
 {
     std::string_view _linda_name{};
     LindaGroup _linda_group{ 0 };
@@ -124,6 +124,20 @@ DeepPrelude* LindaFactory::newDeepObjectInternal(lua_State* L_) const
         break;
     }
 
+    // store in the linda the location of the script that created it
+    if (_linda_name == "auto") {
+        lua_Debug _ar;
+        if (lua_getstack(L_, 1, &_ar) == 1) { // 1 because we want the name of the function that called lanes.linda (where we currently are)
+            lua_getinfo(L_, "Sln", &_ar);
+            _linda_name = luaG_pushstringview(L_, "%s:%d", _ar.short_src, _ar.currentline);
+        } else {
+            _linda_name = luaG_pushstringview(L_, "<unresolved>");
+        }
+        // since the name is not empty, it is at slot 1, and we can replace "auto" with the result, just in case
+        LUA_ASSERT(L_, luaG_tostringview(L_, 1) == "auto");
+        lua_replace(L_, 1);
+    }
+
     // The deep data is allocated separately of Lua stack; we might no longer be around when last reference to it is being released.
     // One can use any memory allocation scheme. Just don't use L's allocF because we don't know which state will get the honor of GCing the linda
     Universe* const _U{ Universe::Get(L_) };
diff --git a/tests/basic.lua b/tests/basic.lua
index 8522895..59b5940 100644
--- a/tests/basic.lua
+++ b/tests/basic.lua
@@ -15,7 +15,7 @@ local require_assert_result_1, require_assert_result_2 = require "assert"    --
 print("require_assert_result:", require_assert_result_1, require_assert_result_2)
 
 local lanes_gen=    assert(lanes.gen)
-local lanes_linda=  assert(lanes.linda)
+local lanes_linda = assert(lanes.linda)
 
 local tostring=     assert(tostring)
 
@@ -160,7 +160,7 @@ PRINT(" "..st)
 assert(st == "cancelled", "st is '" .. st .. "' instead of 'cancelled'")
 
 -- cancellation of lanes waiting on a linda
-local limited = lanes.linda("limited")
+local limited = lanes_linda("limited")
 assert.fails(function() limited:limit("key", -1) end)
 assert.failsnot(function() limited:limit("key", 1) end)
 -- [[################################################
@@ -422,6 +422,7 @@ local function chunk2(linda)
     --
     local info= debug.getinfo(1)    -- 1 = us
     --
+    PRINT("linda named-> '" ..tostring(linda).."'")
     PRINT "debug.getinfo->"
     for k,v in pairs(info) do PRINT(k,v) end
 
@@ -448,7 +449,7 @@ local function chunk2(linda)
     linda:send("up", function() return ":)" end, "ok2")
 end
 
-local linda= lanes.linda("linda")
+local linda = lanes_linda("auto")
 local t2= lanes_gen("debug,string,io", {gc_cb = gc_cb}, chunk2)(linda)     -- prepare & launch
 linda:send("down", function(linda) linda:send("up", "ready!") end,
                     "ok")