feat: remove addon_store singleton and add thread check for it (#1009)

Co-authored-by: Hu Yueh-Wei <[email protected]>

Author: sunxilin

core/include/ten_utils/sanitizer/thread_check.h

@@ -15,6 +15,11 @@
 
 #define TEN_SANITIZER_THREAD_CHECK_SIGNATURE 0x6204388773560E59U
 
+#define TEN_SANITIZER_THREAD_CHECK_INIT_VAL           \
+  (ten_sanitizer_thread_check_t) {                    \
+    TEN_SANITIZER_THREAD_CHECK_SIGNATURE, NULL, false \
+  }
+
 typedef struct ten_sanitizer_thread_check_t {
   ten_signature_t signature;
 

core/include_internal/ten_runtime/addon/addon_autoload.h

@@ -19,7 +19,7 @@ typedef void (*ten_addon_register_func_t)(void *register_ctx);
 
 TEN_RUNTIME_PRIVATE_API bool
 ten_addon_load_all_protocols_and_addon_loaders_from_app_base_dir(
-    const char *app_base_dir, ten_error_t *err);
+    ten_app_t *app, ten_error_t *err);
 
 TEN_RUNTIME_PRIVATE_API bool
 ten_addon_try_load_specific_addon_using_native_addon_loader(
@@ -28,7 +28,7 @@ ten_addon_try_load_specific_addon_using_native_addon_loader(
 
 TEN_RUNTIME_PRIVATE_API void
 ten_addon_try_load_specific_addon_using_all_addon_loaders(
-    TEN_ADDON_TYPE addon_type, const char *addon_name);
+    ten_env_t *ten_env, TEN_ADDON_TYPE addon_type, const char *addon_name);
 
 // Traverse the <app_base_dir>/ten_packages/extension/ directory and attempt
 // to load all extension addons using all available addon_loaders. After this
@@ -37,4 +37,4 @@ ten_addon_try_load_specific_addon_using_all_addon_loaders(
 // (phase 2). This means all register functions are added to the addon_manager's
 // registry but not executed.
 TEN_RUNTIME_PRIVATE_API bool ten_addon_load_all_extensions_from_app_base_dir(
-    const char *app_base_dir, ten_error_t *err);
+    ten_env_t *ten_env, const char *app_base_dir, ten_error_t *err);

core/include_internal/ten_runtime/addon/addon_loader/addon_loader.h

@@ -44,17 +44,12 @@ typedef struct ten_app_on_addon_loader_deinit_done_ctx_t {
   void *cb_data;
 } ten_app_on_addon_loader_deinit_done_ctx_t;
 
-TEN_RUNTIME_PRIVATE_API ten_addon_store_t *ten_addon_loader_get_global_store(
-    void);
-
 TEN_RUNTIME_API ten_addon_host_t *ten_addon_register_addon_loader(
     const char *name, const char *base_dir, ten_addon_t *addon,
     void *register_ctx);
 
-TEN_RUNTIME_API ten_addon_t *ten_addon_unregister_addon_loader(
-    const char *name);
-
-TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_addon_loader(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_addon_loader(
+    ten_env_t *ten_env);
 
 TEN_RUNTIME_PRIVATE_API bool ten_addon_create_addon_loader(
     ten_env_t *ten_env, const char *addon_name, const char *instance_name,
@@ -69,6 +64,3 @@ TEN_RUNTIME_PRIVATE_API void ten_addon_loader_destroy_all_singleton_instances(
     ten_env_t *ten_env,
     ten_addon_loader_on_all_singleton_instances_destroyed_cb_t cb,
     void *cb_data);
-
-TEN_RUNTIME_PRIVATE_API void
-ten_addon_loader_destroy_all_singleton_instances_immediately(void);

core/include_internal/ten_runtime/addon/common/common.h

@@ -11,16 +11,7 @@
 #include "ten_runtime/addon/addon.h"
 
 typedef struct ten_addon_host_t ten_addon_host_t;
+typedef struct ten_app_t ten_app_t;
 
 TEN_RUNTIME_PRIVATE_API ten_addon_host_t *ten_addon_store_find_by_type(
-    TEN_ADDON_TYPE addon_type, const char *addon_name);
-
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_lock_by_type(
-    TEN_ADDON_TYPE addon_type);
-
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_unlock_by_type(
-    TEN_ADDON_TYPE addon_type);
-
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_lock_all_type(void);
-
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_unlock_all_type(void);
+    ten_app_t *app, TEN_ADDON_TYPE addon_type, const char *addon_name);

core/include_internal/ten_runtime/addon/common/store.h

@@ -10,25 +10,36 @@
 
 #include "ten_runtime/addon/addon.h"
 #include "ten_utils/container/list.h"
-#include "ten_utils/lib/mutex.h"
+#include "ten_utils/lib/signature.h"
+#include "ten_utils/sanitizer/thread_check.h"
+
+#define TEN_ADDON_STORE_SIGNATURE 0x8A7F2C91E5D63B04U
 
 typedef struct ten_addon_host_t ten_addon_host_t;
 typedef struct ten_addon_t ten_addon_t;
 
 typedef struct ten_addon_store_t {
-  ten_mutex_t *lock;
+  ten_signature_t signature;
+  ten_sanitizer_thread_check_t thread_check;
+
   ten_list_t store;  // ten_addon_host_t
 } ten_addon_store_t;
 
-#define TEN_ADDON_STORE_INIT_VAL \
-  (ten_addon_store_t) { NULL, TEN_LIST_INIT_VAL }
+#define TEN_ADDON_STORE_INIT_VAL                                    \
+  (ten_addon_store_t) {                                             \
+    TEN_ADDON_STORE_SIGNATURE, TEN_SANITIZER_THREAD_CHECK_INIT_VAL, \
+        TEN_LIST_INIT_VAL                                           \
+  }
 
 #define TEN_ADDON_STORE_INIT(var)     \
   do {                                \
     (var) = TEN_ADDON_STORE_INIT_VAL; \
     ten_addon_store_init(&(var));     \
   } while (0)
 
+TEN_RUNTIME_PRIVATE_API bool ten_addon_store_check_integrity(
+    ten_addon_store_t *store, bool check_thread);
+
 TEN_RUNTIME_PRIVATE_API void ten_addon_store_init(ten_addon_store_t *store);
 
 TEN_RUNTIME_PRIVATE_API void ten_addon_store_deinit(ten_addon_store_t *store);
@@ -41,9 +52,5 @@ TEN_RUNTIME_PRIVATE_API ten_addon_t *ten_addon_store_del(
 
 TEN_RUNTIME_PRIVATE_API void ten_addon_store_del_all(ten_addon_store_t *store);
 
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_lock(ten_addon_store_t *store);
-
-TEN_RUNTIME_PRIVATE_API int ten_addon_store_unlock(ten_addon_store_t *store);
-
 TEN_RUNTIME_PRIVATE_API ten_addon_host_t *ten_addon_store_find(
     ten_addon_store_t *store, const char *name);

core/include_internal/ten_runtime/addon/extension/extension.h

@@ -25,9 +25,8 @@ typedef struct ten_addon_create_extension_done_ctx_t {
   ten_extension_group_create_extensions_done_ctx_t *create_extensions_done_ctx;
 } ten_addon_create_extension_done_ctx_t;
 
-TEN_RUNTIME_PRIVATE_API ten_addon_store_t *ten_extension_get_global_store(void);
-
-TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_extension(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_extension(
+    ten_env_t *ten_env);
 
 TEN_RUNTIME_PRIVATE_API ten_addon_create_extension_done_ctx_t *
 ten_addon_create_extension_done_ctx_create(
@@ -47,7 +46,5 @@ TEN_RUNTIME_PRIVATE_API bool ten_addon_destroy_extension(
     ten_env_addon_destroy_instance_done_cb_t cb, void *user_data,
     ten_error_t *err);
 
-TEN_RUNTIME_API ten_addon_t *ten_addon_unregister_extension(const char *name);
-
 TEN_RUNTIME_PRIVATE_API void ten_addon_on_create_extension_instance_ctx_destroy(
     ten_addon_on_create_extension_instance_ctx_t *self);

core/include_internal/ten_runtime/addon/extension_group/extension_group.h

@@ -18,9 +18,6 @@ typedef struct ten_addon_store_t ten_addon_store_t;
 typedef struct ten_addon_t ten_addon_t;
 typedef struct ten_addon_host_t ten_addon_host_t;
 
-TEN_RUNTIME_PRIVATE_API ten_addon_store_t *ten_extension_group_get_global_store(
-    void);
-
 TEN_RUNTIME_PRIVATE_API bool ten_addon_create_extension_group(
     ten_env_t *ten_env, const char *addon_name, const char *instance_name,
     ten_env_addon_create_instance_done_cb_t cb, void *user_data);
@@ -33,7 +30,5 @@ TEN_RUNTIME_PRIVATE_API ten_addon_host_t *ten_addon_register_extension_group(
     const char *name, const char *base_dir, ten_addon_t *addon,
     void *register_ctx);
 
-TEN_RUNTIME_PRIVATE_API ten_addon_t *ten_addon_unregister_extension_group(
-    const char *name);
-
-TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_extension_group(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_extension_group(
+    ten_env_t *ten_env);

core/include_internal/ten_runtime/addon/protocol/protocol.h

@@ -39,15 +39,12 @@ TEN_RUNTIME_PRIVATE_API bool ten_addon_create_protocol(
     TEN_PROTOCOL_ROLE role, ten_env_addon_on_create_protocol_async_cb_t cb,
     void *user_data, ten_error_t *err);
 
-TEN_RUNTIME_PRIVATE_API ten_addon_store_t *ten_protocol_get_global_store(void);
-
 TEN_RUNTIME_PRIVATE_API ten_addon_host_t *ten_addon_protocol_find(
-    const char *protocol);
+    ten_env_t *ten_env, const char *protocol);
 
 TEN_RUNTIME_API ten_addon_host_t *ten_addon_register_protocol(
     const char *name, const char *base_dir, ten_addon_t *addon,
     void *register_ctx);
 
-TEN_RUNTIME_API ten_addon_t *ten_addon_unregister_protocol(const char *name);
-
-TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_protocol(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_unregister_all_protocol(
+    ten_env_t *ten_env);

core/include_internal/ten_runtime/addon_loader/addon_loader.h

@@ -10,20 +10,34 @@
 
 #include "include_internal/ten_runtime/binding/common.h"
 #include "ten_runtime/addon/addon.h"
-#include "ten_utils/lib/mutex.h"
 #include "ten_utils/lib/signature.h"
+#include "ten_utils/sanitizer/thread_check.h"
 
 #define TEN_ADDON_LOADER_SIGNATURE 0xAE4FCDE7983727E4U
+#define TEN_ADDON_LOADER_SINGLETON_STORE_SIGNATURE 0x8B3F2A9C7D1E6054U
 
 typedef struct ten_addon_loader_t ten_addon_loader_t;
 typedef struct ten_addon_host_t ten_addon_host_t;
 
 typedef struct ten_addon_loader_singleton_store_t {
-  ten_atomic_t valid;
-  ten_mutex_t *lock;
+  ten_signature_t signature;
+  ten_sanitizer_thread_check_t thread_check;
+
   ten_list_t store;  // ten_addon_loader_t
 } ten_addon_loader_singleton_store_t;
 
+#define TEN_ADDON_LOADER_SINGLETON_STORE_INIT_VAL              \
+  (ten_addon_loader_singleton_store_t) {                       \
+    TEN_ADDON_LOADER_SINGLETON_STORE_SIGNATURE,                \
+        TEN_SANITIZER_THREAD_CHECK_INIT_VAL, TEN_LIST_INIT_VAL \
+  }
+
+#define TEN_ADDON_LOADER_SINGLETON_STORE_INIT(var)     \
+  do {                                                 \
+    (var) = TEN_ADDON_LOADER_SINGLETON_STORE_INIT_VAL; \
+    ten_addon_loader_singleton_store_init(&(var));     \
+  } while (0)
+
 typedef void (*ten_addon_loader_on_init_func_t)(
     ten_addon_loader_t *addon_loader, ten_env_t *ten_env);
 
@@ -67,11 +81,14 @@ TEN_RUNTIME_API bool ten_addon_loader_check_integrity(ten_addon_loader_t *self,
 TEN_RUNTIME_API ten_env_t *ten_addon_loader_get_ten_env(
     ten_addon_loader_t *self);
 
-TEN_RUNTIME_PRIVATE_API int ten_addon_loader_singleton_store_lock(void);
+TEN_RUNTIME_PRIVATE_API bool ten_addon_loader_singleton_store_check_integrity(
+    ten_addon_loader_singleton_store_t *store, bool check_thread);
 
-TEN_RUNTIME_PRIVATE_API int ten_addon_loader_singleton_store_unlock(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_loader_singleton_store_init(
+    ten_addon_loader_singleton_store_t *store);
 
-TEN_RUNTIME_PRIVATE_API ten_list_t *ten_addon_loader_singleton_get_all(void);
+TEN_RUNTIME_PRIVATE_API void ten_addon_loader_singleton_store_deinit(
+    ten_addon_loader_singleton_store_t *store);
 
 TEN_RUNTIME_API ten_addon_loader_t *ten_addon_loader_create(
     ten_addon_loader_on_init_func_t on_init,

core/include_internal/ten_runtime/app/app.h

@@ -11,6 +11,7 @@
 #include <stdbool.h>
 
 #include "include_internal/ten_runtime/addon/common/store.h"
+#include "include_internal/ten_runtime/addon_loader/addon_loader.h"
 #include "include_internal/ten_runtime/binding/common.h"
 #include "include_internal/ten_runtime/metadata/metadata.h"
 #include "include_internal/ten_runtime/schema_store/store.h"
@@ -134,6 +135,8 @@ typedef struct ten_app_t {
   ten_addon_store_t protocol_store;
   ten_addon_store_t addon_loader_store;
 
+  ten_addon_loader_singleton_store_t addon_loader_singleton_store;
+
   // Default value is false, meaning addons are loaded on-demand - if not used,
   // they won't be loaded.
   // If set to true, all addons will be preloaded during app startup by