hikyuu 2.6.3__py3-none-win_amd64.whl → 2.6.6__py3-none-win_amd64.whl

hikyuu/include/hikyuu/utilities/mo/mo.h

@@ -26,23 +26,39 @@
 #endif
 
 namespace hku {
+namespace mo {
 
-class HKU_UTILS_API MOHelper {
-public:
-    static void init();
+/**
+ * @brief 初始化多语言支持
+ * @param path 翻译文件路径
+ */
+void HKU_UTILS_API init(const std::string &path = "i18n");
+
+/**
+ * @brief 按指定语言获取翻译
+ * @param lang
+ * @param id
+ * @return std::string
+ */
+std::string HKU_UTILS_API translate(const std::string &lang, const char *id);
+
+/**
+ * @brief 按指定语言和上下文获取翻译
+ * @param lang
+ * @param ctx
+ * @param id
+ * @return std::string
+ */
+std::string HKU_UTILS_API translate(const std::string &lang, const char *ctx, const char *id);
 
-    static std::string translate(const std::string &lang, const char *id) {
-        auto iter = ms_dict.find(lang);
-        return iter != ms_dict.end() ? ms_dict[lang].Lookup(id) : std::string(id);
-    }
+/** 获取系统语言 */
+std::string HKU_UTILS_API getSystemLanguage();
 
-    static std::string translate(const std::string &lang, const char *ctx, const char *id) {
-        auto iter = ms_dict.find(lang);
-        return iter != ms_dict.end() ? ms_dict[lang].LookupWithContext(ctx, id) : std::string(id);
-    }
+/** 按系统语言获取翻译 */
+std::string HKU_UTILS_API _tr(const char *id);
 
-private:
-    static std::unordered_map<std::string, moFileLib::moFileReader> ms_dict;
-};
+/** 按系统语言和上下文获取翻译 */
+std::string HKU_UTILS_API _ctr(const char *ctx, const char *id);
 
+}  // namespace mo
 }  // namespace hku

hikyuu/include/hikyuu/utilities/os.h

@@ -79,6 +79,12 @@ std::string HKU_UTILS_API getUserDir();
  */
 std::string HKU_UTILS_API getCurrentDir();
 
+/**
+ * 获取dll自身所在目录
+ * @note 仅支持linux/macos。windows下获取的是exe所在路径！
+ */
+std::string HKU_UTILS_API getDllSelfDir();
+
 /**
  * 输出终端是否支持彩色控制字符
  */

hikyuu/include/hikyuu/utilities/plugin/PluginLoader.h

@@ -71,6 +71,16 @@ public:
         return true;
     }
 
+    std::string getFileName(const std::string& pluginname) const noexcept {
+#if HKU_OS_WINDOWS
+        return fmt::format("{}/{}.dll", m_path, pluginname);
+#elif HKU_OS_LINUX
+        return fmt::format("{}/lib{}.so", m_path, pluginname);
+#elif HKU_OS_OSX
+        return fmt::format("{}/lib{}.dylib", m_path, pluginname);
+#endif
+    }
+
 private:
     void unload() noexcept {
         m_plugin.reset();
@@ -92,16 +102,6 @@ private:
         return func;
     }
 
-    std::string getFileName(const std::string& pluginname) const noexcept {
-#if HKU_OS_WINDOWS
-        return fmt::format("{}/{}.dll", m_path, pluginname);
-#elif HKU_OS_LINUX
-        return fmt::format("{}/lib{}.so", m_path, pluginname);
-#elif HKU_OS_OSX
-        return fmt::format("{}/lib{}.dylib", m_path, pluginname);
-#endif
-    }
-
 private:
 #if HKU_OS_WINDOWS
     HMODULE m_handle{nullptr};

hikyuu/include/hikyuu/utilities/thread/MQThreadPool.h

@@ -157,9 +157,12 @@ public:
             m_queues[i]->push(FuncWrapper());
         }
 
-        for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_threads[i].joinable()) {
-                m_threads[i].join();
+        {
+            std::lock_guard<std::mutex> lock(m_mutex_join);
+            for (size_t i = 0; i < m_worker_num; i++) {
+                if (m_threads[i].joinable()) {
+                    m_threads[i].join();
+                }
             }
         }
 
@@ -190,10 +193,12 @@ public:
             m_queues[i]->notify_all();
         }
 
-        // 等待线程结束
-        for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_threads[i].joinable()) {
-                m_threads[i].join();
+        {  // 等待线程结束
+            std::lock_guard<std::mutex> lock(m_mutex_join);
+            for (size_t i = 0; i < m_worker_num; i++) {
+                if (m_threads[i].joinable()) {
+                    m_threads[i].join();
+                }
             }
         }
 
@@ -209,6 +214,7 @@ private:
     std::vector<std::unique_ptr<ThreadSafeQueue<task_type>>> m_queues;  // 线程任务队列
     std::vector<InterruptFlag> m_thread_need_stop;                      // 线程终止标志
     std::vector<std::thread> m_threads;                                 // 工作线程
+    std::mutex m_mutex_join;                                            // 用于保护 joinable
 
     void worker_thread(int index) {
         auto *local_queue = m_queues[index].get();

hikyuu/include/hikyuu/utilities/thread/ThreadPool.h

@@ -125,9 +125,12 @@ public:
 
         m_master_work_queue.notify_all();
 
-        for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_threads[i].joinable()) {
-                m_threads[i].join();
+        {
+            std::lock_guard<std::mutex> lock(m_mutex_join);
+            for (size_t i = 0; i < m_worker_num; i++) {
+                if (m_threads[i].joinable()) {
+                    m_threads[i].join();
+                }
             }
         }
 
@@ -155,9 +158,12 @@ public:
 
         m_master_work_queue.notify_all();
 
-        for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_threads[i].joinable()) {
-                m_threads[i].join();
+        {
+            std::lock_guard<std::mutex> lock(m_mutex_join);
+            for (size_t i = 0; i < m_worker_num; i++) {
+                if (m_threads[i].joinable()) {
+                    m_threads[i].join();
+                }
             }
         }
 
@@ -173,6 +179,7 @@ private:
 
     ThreadSafeQueue<task_type> m_master_work_queue;  // 主线程任务队列
     std::vector<std::thread> m_threads;              // 工作线程
+    std::mutex m_mutex_join;                         // 用于保护 joinable
 
     void worker_thread(int index) {
         while (!m_done) {

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.3"
+#define HKU_VERSION "2.6.6"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 3
-#define HKU_VERSION_BUILD 202505252323
+#define HKU_VERSION_ALTER 6
+#define HKU_VERSION_BUILD 202507291558
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.3 release.127e122b (RELEASE)"
+#define HKU_VERSION_GIT "2.6.6 master.c4a12bf4 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */