Feature: Modify the key of scheduling_map to std::string to avoid acc…

…essing SeparateScheduling as nullptr during startup (#118)
trpc-group · Mar 8, 2024 · f0a78df · f0a78df
1 parent ce53eec
commit f0a78df
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/trpc/runtime/threadmodel/separate/separate_scheduling.cc b/trpc/runtime/threadmodel/separate/separate_scheduling.cc
@@ -17,15 +17,15 @@
 
 namespace trpc {
 
-static std::unordered_map<std::string_view, SeparateSchedulingCreateFunction> scheduling_create_funtion_map;
+static std::unordered_map<std::string, SeparateSchedulingCreateFunction> scheduling_create_funtion_map;
 
-bool RegisterSeparateSchedulingImpl(const std::string_view& name, SeparateSchedulingCreateFunction&& func) {
+bool RegisterSeparateSchedulingImpl(const std::string& name, SeparateSchedulingCreateFunction&& func) {
   scheduling_create_funtion_map[name] = std::move(func);
 
   return true;
 }
 
-std::unique_ptr<SeparateScheduling> CreateSeparateScheduling(const std::string_view& name) {
+std::unique_ptr<SeparateScheduling> CreateSeparateScheduling(const std::string& name) {
   auto it = scheduling_create_funtion_map.find(name);
   if (it != scheduling_create_funtion_map.end()) {
     return (it->second)();

diff --git a/trpc/runtime/threadmodel/separate/separate_scheduling.h b/trpc/runtime/threadmodel/separate/separate_scheduling.h
@@ -88,8 +88,8 @@ constexpr std::string_view kNonStealScheduling = "non_steal";
 
 constexpr std::string_view kStealScheduling = "steal";
 
-bool RegisterSeparateSchedulingImpl(const std::string_view& name, SeparateSchedulingCreateFunction&& func);
+bool RegisterSeparateSchedulingImpl(const std::string& name, SeparateSchedulingCreateFunction&& func);
 
-std::unique_ptr<SeparateScheduling> CreateSeparateScheduling(const std::string_view& name);
+std::unique_ptr<SeparateScheduling> CreateSeparateScheduling(const std::string& name);
 
 }  // namespace trpc
diff --git a/trpc/runtime/threadmodel/separate/separate_thread_model_test.cc b/trpc/runtime/threadmodel/separate/separate_thread_model_test.cc
@@ -59,7 +59,7 @@ class TestSeparateThreadModel : public ::testing::Test {
           std::make_unique<separate::NonStealScheduling>(std::move(option));
       return sep_sche;
     };
-    RegisterSeparateSchedulingImpl(kNonStealScheduling, std::move(sche_create_func));
+    RegisterSeparateSchedulingImpl(std::string(kNonStealScheduling), std::move(sche_create_func));
 
     // Register the taskflow scheduler creation function
     sche_create_func = []() {
@@ -70,7 +70,7 @@ class TestSeparateThreadModel : public ::testing::Test {
       std::unique_ptr<SeparateScheduling> sep_sche = std::make_unique<separate::StealScheduling>(std::move(option));
       return sep_sche;
     };
-    RegisterSeparateSchedulingImpl(kStealScheduling, std::move(sche_create_func));
+    RegisterSeparateSchedulingImpl(std::string(kStealScheduling), std::move(sche_create_func));
   }
 
   static SeparateThreadModel* CreateSeparateThreadModel(ScheduleType type) {