Add thread-safe global registry for shared object lifetimes

Introduce a thread-safe singleton Registry<T> for managing shared_ptr
lifetimes of Menu, MenuItem, and TrayIcon objects. Replace legacy global
maps with the new registry in C API implementations. Update example code
to use new registry logic and ensure proper object destruction.

Author: lijy91

examples/menu_c_example/main.c

@@ -150,8 +150,8 @@ int main() {
       native_menu_add_item(submenu, sub_item2);
 
       // Create submenu item and add to main menu
-      native_menu_item_t submenu_item =
-          native_menu_item_create("More Options", NATIVE_MENU_ITEM_TYPE_SUBMENU);
+      native_menu_item_t submenu_item = native_menu_item_create(
+          "More Options", NATIVE_MENU_ITEM_TYPE_SUBMENU);
       if (submenu_item) {
         native_menu_item_set_submenu(submenu_item, submenu);
         native_menu_add_item(menu, submenu_item);

examples/tray_icon_c_example/main.c

@@ -22,7 +22,7 @@ static std::shared_ptr<Window> GetWindowFromHandle(
   // We need to get the shared_ptr from WindowManager
   auto* window_ptr = static_cast<Window*>(window_handle);
   WindowID window_id = window_ptr->GetId();
-  
+
   // Retrieve the shared_ptr from WindowManager
   auto& manager = WindowManager::GetInstance();
   return manager.Get(window_id);

examples/window_c_example/main.c

@@ -11,10 +11,6 @@
 
 using namespace nativeapi;
 
-// Global registry instances for managing MenuItem and Menu object lifetimes
-static auto& g_menu_items = globalRegistry<MenuItem>();
-static auto& g_menus = globalRegistry<Menu>();
-
 // Internal structures to manage event listeners
 
 // Event listener data structures
@@ -154,7 +150,10 @@ native_menu_item_t native_menu_item_create(const char* text,
   try {
     auto item = std::make_shared<MenuItem>(text, convert_menu_item_type(type));
     void* handle = item.get();
-    g_menu_items[handle] = item;  // Store shared_ptr to keep object alive
+
+    // Store the shared_ptr in the registry to keep the object alive
+    GlobalRegistry<MenuItem>().Register(handle, item);
+
     return static_cast<native_menu_item_t>(handle);
   } catch (...) {
     return nullptr;
@@ -165,7 +164,10 @@ native_menu_item_t native_menu_item_create_separator(void) {
   try {
     auto item = std::make_shared<MenuItem>("", MenuItemType::Separator);
     void* handle = item.get();
-    g_menu_items[handle] = item;  // Store shared_ptr to keep object alive
+
+    // Store the shared_ptr in the registry to keep the object alive
+    GlobalRegistry<MenuItem>().Register(handle, item);
+
     return static_cast<native_menu_item_t>(handle);
   } catch (...) {
     return nullptr;
@@ -182,17 +184,18 @@ void native_menu_item_destroy(native_menu_item_t item) {
     g_menu_item_listeners.erase(listeners_it);
   }
 
-  // Remove from global storage - this will release the shared_ptr
-  auto item_it = g_menu_items.find(item);
-  if (item_it != g_menu_items.end()) {
-    g_menu_items.erase(item_it);
-  }
+  // Unregister from registry - this will also destroy the object
+  GlobalRegistry<MenuItem>().Unregister(item);
 }
 
 native_menu_item_id_t native_menu_item_get_id(native_menu_item_t item) {
   if (!item)
     return -1;
 
+  // Verify the item exists in the registry
+  if (!GlobalRegistry<MenuItem>().Contains(item))
+    return -1;
+
   try {
     auto menu_item = static_cast<MenuItem*>(item);
     return menu_item->id;
@@ -486,15 +489,14 @@ void native_menu_item_set_submenu(native_menu_item_t item,
 
   try {
     // Verify item exists in global storage
-    auto item_it = g_menu_items.find(item);
-    if (item_it == g_menu_items.end())
+    if (!GlobalRegistry<MenuItem>().Contains(item))
       return;
 
     auto menu_item = static_cast<MenuItem*>(item);
     // Get the shared_ptr from global storage instead of creating a new one
-    auto menu_it = g_menus.find(submenu);
-    if (menu_it != g_menus.end()) {
-      menu_item->SetSubmenu(menu_it->second);
+    auto submenu_ptr = GlobalRegistry<Menu>().Get(submenu);
+    if (submenu_ptr) {
+      menu_item->SetSubmenu(submenu_ptr);
     }
   } catch (...) {
     // Ignore exceptions
@@ -652,7 +654,10 @@ native_menu_t native_menu_create(void) {
   try {
     auto menu = std::make_shared<Menu>();
     void* handle = menu.get();
-    g_menus[handle] = menu;  // Store shared_ptr to keep object alive
+
+    // Store the shared_ptr in the registry to keep the object alive
+    GlobalRegistry<Menu>().Register(handle, menu);
+
     return static_cast<native_menu_t>(handle);
   } catch (...) {
     return nullptr;
@@ -669,17 +674,18 @@ void native_menu_destroy(native_menu_t menu) {
     g_menu_listeners.erase(listeners_it);
   }
 
-  // Remove from global storage - this will release the shared_ptr
-  auto menu_it = g_menus.find(menu);
-  if (menu_it != g_menus.end()) {
-    g_menus.erase(menu_it);
-  }
+  // Unregister from registry - this will also destroy the object
+  GlobalRegistry<Menu>().Unregister(menu);
 }
 
 native_menu_id_t native_menu_get_id(native_menu_t menu) {
   if (!menu)
     return -1;
 
+  // Verify the menu exists in the registry
+  if (!GlobalRegistry<Menu>().Contains(menu))
+    return -1;
+
   try {
     auto menu_ptr = static_cast<Menu*>(menu);
     return menu_ptr->id;
@@ -694,15 +700,14 @@ void native_menu_add_item(native_menu_t menu, native_menu_item_t item) {
 
   try {
     // Verify menu exists in global storage
-    auto menu_it = g_menus.find(menu);
-    if (menu_it == g_menus.end())
+    if (!GlobalRegistry<Menu>().Contains(menu))
       return;
 
     auto menu_ptr = static_cast<Menu*>(menu);
     // Get the shared_ptr from global storage instead of creating a new one
-    auto item_it = g_menu_items.find(item);
-    if (item_it != g_menu_items.end()) {
-      menu_ptr->AddItem(item_it->second);
+    auto item_ptr = GlobalRegistry<MenuItem>().Get(item);
+    if (item_ptr) {
+      menu_ptr->AddItem(item_ptr);
     }
   } catch (...) {
     // Ignore exceptions
@@ -717,15 +722,14 @@ void native_menu_insert_item(native_menu_t menu,
 
   try {
     // Verify menu exists in global storage
-    auto menu_it = g_menus.find(menu);
-    if (menu_it == g_menus.end())
+    if (!GlobalRegistry<Menu>().Contains(menu))
       return;
 
     auto menu_ptr = static_cast<Menu*>(menu);
     // Get the shared_ptr from global storage instead of creating a new one
-    auto item_it = g_menu_items.find(item);
-    if (item_it != g_menu_items.end()) {
-      menu_ptr->InsertItem(index, item_it->second);
+    auto item_ptr = GlobalRegistry<MenuItem>().Get(item);
+    if (item_ptr) {
+      menu_ptr->InsertItem(index, item_ptr);
     }
   } catch (...) {
     // Ignore exceptions
@@ -738,15 +742,14 @@ bool native_menu_remove_item(native_menu_t menu, native_menu_item_t item) {
 
   try {
     // Verify menu exists in global storage
-    auto menu_it = g_menus.find(menu);
-    if (menu_it == g_menus.end())
+    if (!GlobalRegistry<Menu>().Contains(menu))
       return false;
 
     auto menu_ptr = static_cast<Menu*>(menu);
     // Get the shared_ptr from global storage instead of creating a new one
-    auto item_it = g_menu_items.find(item);
-    if (item_it != g_menu_items.end()) {
-      return menu_ptr->RemoveItem(item_it->second);
+    auto item_ptr = GlobalRegistry<MenuItem>().Get(item);
+    if (item_ptr) {
+      return menu_ptr->RemoveItem(item_ptr);
     }
     return false;
   } catch (...) {

src/capi/app_runner_c.cpp

@@ -25,16 +25,16 @@ static std::map<native_tray_icon_t,
     g_tray_icon_listeners;
 static std::atomic<int> g_tray_icon_next_listener_id{1};
 
-// Global registry instance for managing TrayIcon object lifetimes
-static auto& g_tray_icons = globalRegistry<TrayIcon>();
-
 // TrayIcon C API Implementation
 
 native_tray_icon_t native_tray_icon_create(void) {
   try {
     auto tray_icon = std::make_shared<TrayIcon>();
     void* handle = tray_icon.get();
-    g_tray_icons[handle] = tray_icon;  // Store shared_ptr to keep object alive
+
+    // Store the shared_ptr in the registry to keep the object alive
+    GlobalRegistry<TrayIcon>().Register(handle, tray_icon);
+
     return static_cast<native_tray_icon_t>(handle);
   } catch (...) {
     return nullptr;
@@ -48,7 +48,10 @@ native_tray_icon_t native_tray_icon_create_from_native(void* native_tray) {
   try {
     auto tray_icon = std::make_shared<TrayIcon>(native_tray);
     void* handle = tray_icon.get();
-    g_tray_icons[handle] = tray_icon;  // Store shared_ptr to keep object alive
+
+    // Store the shared_ptr in the registry to keep the object alive
+    GlobalRegistry<TrayIcon>().Register(handle, tray_icon);
+
     return static_cast<native_tray_icon_t>(handle);
   } catch (...) {
     return nullptr;
@@ -65,17 +68,18 @@ void native_tray_icon_destroy(native_tray_icon_t tray_icon) {
     g_tray_icon_listeners.erase(listeners_it);
   }
 
-  // Remove from global storage - this will release the shared_ptr
-  auto tray_icon_it = g_tray_icons.find(tray_icon);
-  if (tray_icon_it != g_tray_icons.end()) {
-    g_tray_icons.erase(tray_icon_it);
-  }
+  // Unregister from registry - this will also destroy the object
+  GlobalRegistry<TrayIcon>().Unregister(tray_icon);
 }
 
 native_tray_icon_id_t native_tray_icon_get_id(native_tray_icon_t tray_icon) {
   if (!tray_icon)
     return -1;
 
+  // Verify the tray icon exists in the registry
+  if (!GlobalRegistry<TrayIcon>().Contains(tray_icon))
+    return -1;
+
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
     return tray_icon_ptr->GetId();
@@ -89,6 +93,10 @@ void native_tray_icon_set_icon(native_tray_icon_t tray_icon,
   if (!tray_icon)
     return;
 
+  // Verify the tray icon exists in the registry
+  if (!GlobalRegistry<TrayIcon>().Contains(tray_icon))
+    return;
+
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
     if (image) {
@@ -278,6 +286,10 @@ int native_tray_icon_add_listener(native_tray_icon_t tray_icon,
   if (!tray_icon || !callback)
     return -1;
 
+  // Verify the tray icon exists in the registry
+  if (!GlobalRegistry<TrayIcon>().Contains(tray_icon))
+    return -1;
+
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
 
@@ -350,6 +362,10 @@ bool native_tray_icon_remove_listener(native_tray_icon_t tray_icon,
   if (!tray_icon)
     return false;
 
+  // Verify the tray icon exists in the registry
+  if (!GlobalRegistry<TrayIcon>().Contains(tray_icon))
+    return false;
+
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);