support event pool (#1817)

alibaba · Oct 29, 2024 · a4f84b3 · a4f84b3
1 parent ae0f53f
commit a4f84b3
Show file tree

Hide file tree

Showing 55 changed files with 1,306 additions and 401 deletions.
diff --git a/core/app_config/AppConfig.h b/core/app_config/AppConfig.h
@@ -23,9 +23,9 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
+#include <functional>
 
 #include "InstanceConfig.h"
-#include "common/Lock.h"
 #include "protobuf/sls/sls_logs.pb.h"
 
 namespace logtail {
@@ -94,7 +94,7 @@ class AppConfig {
 
     Json::Value mFileTagsJson;
 
-    mutable SpinLock mAppConfigLock;
+    mutable std::mutex mAppConfigLock;
 
     // loongcollector_config.json content for rebuild
     std::string mIlogtailConfigJson;
@@ -267,7 +267,7 @@ class AppConfig {
     void LoadOtherConf(const Json::Value& confJson);
     // void LoadGlobalFuseConf(const Json::Value& confJson);
     void SetIlogtailConfigJson(const std::string& configJson) {
-        ScopedSpinLock lock(mAppConfigLock);
+        std::lock_guard<std::mutex> lock(mAppConfigLock);
         mIlogtailConfigJson = configJson;
     }
     // LoadEnvTags loads env tags from environment.
@@ -395,7 +395,7 @@ class AppConfig {
     // bool GetOpenStreamLog() const { return mOpenStreamLog; }
 
     std::string GetIlogtailConfigJson() {
-        ScopedSpinLock lock(mAppConfigLock);
+        std::lock_guard<std::mutex> lock(mAppConfigLock);
         return mIlogtailConfigJson;
     }
 

diff --git a/core/common/LogstoreFeedbackQueue.h b/core/common/LogstoreFeedbackQueue.h
diff --git a/core/config/InstanceConfig.h b/core/config/InstanceConfig.h
@@ -17,13 +17,8 @@
 #pragma once
 
 #include <json/json.h>
-#include <re2/re2.h>
 
-#include <cstdint>
-#include <filesystem>
-#include <memory>
 #include <string>
-#include <vector>
 
 namespace logtail {