refactor: remove extension group name parameter and add new function to retrieve it

Author: halajohn

core/include_internal/ten_runtime/extension_context/extension_context.h

@@ -13,7 +13,6 @@
 #include "include_internal/ten_runtime/common/loc.h"
 #include "ten_runtime/msg/msg.h"
 #include "ten_utils/container/list.h"
-#include "ten_utils/lib/atomic.h"
 #include "ten_utils/lib/signature.h"
 #include "ten_utils/lib/string.h"
 #include "ten_utils/sanitizer/thread_check.h"
@@ -71,9 +70,16 @@ TEN_RUNTIME_PRIVATE_API void ten_extension_context_on_close(
     ten_extension_context_t *self);
 
 TEN_RUNTIME_PRIVATE_API ten_extension_info_t *
-ten_extension_context_get_extension_info_by_name(
-    ten_extension_context_t *self, const char *app_uri, const char *graph_id,
-    const char *extension_group_name, const char *extension_name);
+ten_extension_context_get_extension_info_by_name(ten_extension_context_t *self,
+                                                 const char *app_uri,
+                                                 const char *graph_id,
+                                                 const char *extension_name);
 
 TEN_RUNTIME_PRIVATE_API bool ten_extension_context_start_extension_group(
     ten_extension_context_t *self, ten_error_t *err);
+
+TEN_RUNTIME_PRIVATE_API const char *
+ten_extension_context_get_extension_group_name(ten_extension_context_t *self,
+                                               const char *app_uri,
+                                               const char *graph_id,
+                                               const char *extension_name);

core/src/ten_runtime/engine/internal/extension_interface.c

@@ -236,8 +236,6 @@ void ten_engine_find_extension_info_for_all_extensions_of_extension_thread_task(
         ten_extension_context_get_extension_info_by_name(
             extension_context, ten_app_get_uri(extension_context->engine->app),
             ten_engine_get_id(extension_context->engine, true),
-            ten_extension_group_get_name(extension_thread->extension_group,
-                                         false),
             ten_extension_get_name(extension, false));
   }
 

core/src/ten_runtime/engine/msg_interface/common.c

@@ -409,7 +409,7 @@ bool ten_engine_dispatch_msg(ten_engine_t *self, ten_shared_ptr_t *msg) {
       // current TEN app.
       ten_app_push_to_in_msgs_queue(app, msg);
     } else {
-      if (ten_string_is_empty(&dest_loc->extension_group_name)) {
+      if (ten_string_is_empty(&dest_loc->extension_name)) {
         // It means the destination is the current engine, so ask the current
         // engine to handle this message.
         ten_engine_handle_msg(self, msg);
@@ -419,6 +419,13 @@ bool ten_engine_dispatch_msg(ten_engine_t *self, ten_shared_ptr_t *msg) {
         if (self->extension_context) {
           bool found = false;
 
+          const char *extension_group_name =
+              ten_extension_context_get_extension_group_name(
+                  self->extension_context,
+                  ten_string_get_raw_str(&dest_loc->app_uri),
+                  ten_string_get_raw_str(&dest_loc->graph_id),
+                  ten_string_get_raw_str(&dest_loc->extension_name));
+
           ten_list_foreach (&self->extension_context->extension_threads, iter) {
             ten_extension_thread_t *extension_thread =
                 ten_ptr_listnode_get(iter.node);
@@ -439,8 +446,8 @@ bool ten_engine_dispatch_msg(ten_engine_t *self, ten_shared_ptr_t *msg) {
             ten_extension_group_t *extension_group =
                 extension_thread->extension_group;
 
-            if (ten_string_is_equal(&extension_group->name,
-                                    &dest_loc->extension_group_name)) {
+            if (ten_string_is_equal_c_str(&extension_group->name,
+                                          extension_group_name)) {
               // Find the correct extension thread, ask it to handle the
               // message.
               found = true;

core/src/ten_runtime/extension_context/extension_context.c

@@ -214,7 +214,7 @@ void ten_extension_context_set_on_closed(
 
 ten_extension_info_t *ten_extension_context_get_extension_info_by_name(
     ten_extension_context_t *self, const char *app_uri, const char *graph_id,
-    const char *extension_group_name, const char *extension_name) {
+    const char *extension_name) {
   TEN_ASSERT(self, "Invalid argument.");
 
   // TEN_NOLINTNEXTLINE(thread-check)
@@ -230,8 +230,7 @@ ten_extension_info_t *ten_extension_context_get_extension_info_by_name(
   TEN_ASSERT(ten_extension_context_check_integrity(self, false),
              "Invalid use of extension_context %p.", self);
 
-  TEN_ASSERT(app_uri && extension_group_name && extension_name,
-             "Should not happen.");
+  TEN_ASSERT(app_uri && extension_name, "Should not happen.");
 
   ten_extension_info_t *result = NULL;
 
@@ -249,12 +248,6 @@ ten_extension_info_t *ten_extension_context_get_extension_info_by_name(
       continue;
     }
 
-    if (extension_group_name &&
-        !ten_string_is_equal_c_str(&extension_info->loc.extension_group_name,
-                                   extension_group_name)) {
-      continue;
-    }
-
     if (extension_name &&
         !ten_string_is_equal_c_str(&extension_info->loc.extension_name,
                                    extension_name)) {
@@ -524,3 +517,18 @@ bool ten_extension_context_start_extension_group(ten_extension_context_t *self,
 done:
   return result;
 }
+
+const char *ten_extension_context_get_extension_group_name(
+    ten_extension_context_t *self, const char *app_uri, const char *graph_id,
+    const char *extension_name) {
+  TEN_ASSERT(self, "Invalid argument.");
+  TEN_ASSERT(ten_extension_context_check_integrity(self, true),
+             "Invalid use of extension_context %p.", self);
+
+  ten_extension_info_t *extension_info =
+      ten_extension_context_get_extension_info_by_name(self, app_uri, graph_id,
+                                                       extension_name);
+  TEN_ASSERT(extension_info, "Should not happen.");
+
+  return ten_string_get_raw_str(&extension_info->loc.extension_group_name);
+}