fix #32

toppers · Apr 7, 2024 · 933debf · 933debf
1 parent 10eb241
commit 933debf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/src/hako/core/rpc/hako_internal_rpc.cpp b/src/hako/core/rpc/hako_internal_rpc.cpp
@@ -1,15 +1,27 @@
 #include "core/rpc/hako_internal_rpc.hpp"
 #include "core/context/hako_context.hpp"
-#ifdef WIN32
-using hako::utils::sem::flock::asset_up;
-using hako::utils::sem::flock::asset_down;
-#else
-using hako::utils::sem::asset_up;
-using hako::utils::sem::asset_down;
-#endif
+#include "utils/hako_share/hako_sem_flock.hpp"
+#include "utils/hako_share/hako_sem.hpp"
+#include "utils/hako_config_loader.hpp"
+
+typedef struct {
+    void (*asset_up)(int32_t sem_id, int32_t asset_id);
+    void (*asset_down)(int32_t sem_id, int32_t asset_id);
+} SemType;
+static SemType my_sem;
 
 void hako::core::rpc::HakoInternalRpc::register_callback(hako::data::HakoAssetEventType event_id, void (*callback) ())
 {
+    HakoConfigType config;
+    hako_config_load(config);
+    if ((config.param == nullptr) || (config.param["shm_type"] == "shm")) {
+        my_sem.asset_up = utils::sem::asset_up;
+        my_sem.asset_down = utils::sem::asset_down;
+    }
+    else {
+        my_sem.asset_up = utils::sem::flock::asset_up;
+        my_sem.asset_down = utils::sem::flock::asset_down;
+    }
     this->map_.insert(std::make_pair(event_id, callback));
 }
 
@@ -35,7 +47,7 @@ void hako::core::rpc::HakoInternalRpc::stop()
         // nothing to do
     }
     else {
-        asset_up(this->master_data_->get_semid(), this->asset_id_);
+        my_sem.asset_up(this->master_data_->get_semid(), this->asset_id_);
         this->proxy_thread_->join();
         this->proxy_thread_ = nullptr;
     }
@@ -44,7 +56,7 @@ void hako::core::rpc::HakoInternalRpc::proxy_thread()
 {
     HAKO_LOG_INFO("HakoInternalRpc Thread: Start");
     while (true) {
-        asset_down(this->master_data_->get_semid(), this->asset_id_);
+        my_sem.asset_down(this->master_data_->get_semid(), this->asset_id_);
         auto* asset = this->master_data_->get_asset_event_nolock(this->asset_id_);
         if (asset == nullptr) {
             break;
@@ -68,7 +80,7 @@ void hako::core::rpc::notify(std::shared_ptr<data::HakoMasterData> master_data,
         return;
     }
     if (!context.is_same(asset_ev->pid)) {
-        asset_up(master_data->get_semid(), asset_id);
+        my_sem.asset_up(master_data->get_semid(), asset_id);
         return;
     }
     switch (event_id) {

diff --git a/src/hako/data/hako_master_data.hpp b/src/hako/data/hako_master_data.hpp
@@ -6,11 +6,6 @@
 #include "utils/hako_string.hpp"
 #include "utils/hako_assert.hpp"
 #include "utils/hako_clock.hpp"
-#ifdef WIN32
-#include "utils/hako_share/hako_sem_flock.hpp"
-#else
-#include "utils/hako_share/hako_sem.hpp"
-#endif
 #include "core/context/hako_context.hpp"
 #include "data/hako_pdu_data.hpp"
 #include <string.h>

diff --git a/src/hako/utils/hako_share/hako_sem_flock.hpp b/src/hako/utils/hako_share/hako_sem_flock.hpp
@@ -1,5 +1,5 @@
-#ifndef _HAKO_SEM_HPP_
-#define _HAKO_SEM_HPP_
+#ifndef _HAKO_SEM_FLOCK_HPP_
+#define _HAKO_SEM_FLOCK_HPP_
 
 #include "types/hako_types.hpp"
 
@@ -12,4 +12,4 @@ namespace hako::utils::sem::flock {
     void asset_up(int32_t sem_id, int32_t asset_id);
 }
 
-#endif /* _HAKO_SEM_HPP_ */
+#endif /* _HAKO_SEM_FLOCK_HPP_ */