1 files changed, 25 insertions, 20 deletions

diff --git a/src/lanes.c b/src/lanes.c
index 8f159a9..f3fdc76 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -1652,26 +1652,31 @@ LUAG_FUNC( thread_index)
 // Return a list of all known lanes
 LUAG_FUNC( threads)
 {
-        int const top = lua_gettop( L);
-        Universe* U = universe_get( L);
-
-        // List _all_ still running threads
-        //
-        MUTEX_LOCK( &U->tracking_cs);
-        if( U->tracking_first && U->tracking_first != TRACKING_END)
-        {
-                Lane* s = U->tracking_first;
-                lua_newtable( L);                                          // {}
-                while( s != TRACKING_END)
-                {
-                        lua_pushstring( L, s->debug_name);                       // {} "name"
-                        push_thread_status( L, s);                               // {} "name" "status"
-                        lua_rawset( L, -3);                                      // {}
-                        s = s->tracking_next;
-                }
-        }
-        MUTEX_UNLOCK( &U->tracking_cs);
-        return lua_gettop( L) - top;
+  int const top = lua_gettop( L);
+  Universe* U = universe_get( L);
+
+  // List _all_ still running threads
+  //
+  MUTEX_LOCK( &U->tracking_cs);
+  if( U->tracking_first && U->tracking_first != TRACKING_END)
+  {
+    Lane* s = U->tracking_first;
+    int index = 0;
+    lua_newtable( L);                                          // {}
+    while( s != TRACKING_END)
+    {
+      // insert a { name, status } tuple, so that several lanes with the same name can't clobber each other
+      lua_newtable( L);                                        // {} {}
+      lua_pushstring( L, s->debug_name);                       // {} {} "name"
+      lua_setfield( L, -2, "name");                            // {} {}
+      push_thread_status( L, s);                               // {} {} "status"
+      lua_setfield( L, -2, "status");                          // {} {}
+      lua_rawseti( L, -2, ++ index);                           // {}
+      s = s->tracking_next;
+    }
+  }
+  MUTEX_UNLOCK( &U->tracking_cs);
+  return lua_gettop( L) - top; // 0 or 1
 }
 #endif // HAVE_LANE_TRACKING