feat: loongcollector support windows build #2082

bilosikia · 2025-02-10T11:59:24Z

windows 64位不兼容函数调用均使用#if defined(linux)或者#if defined(_MSC_VER)进行区分
部分暂未实现或者暂未修复的ut均使用// TODO: windows进行标识
CI已添加windows编译+运行UT的workflow，代码合入之后，后续所有代码均会运行windows编译的CI

…to feat/windows

linrunqi08 · 2025-03-11T11:28:54Z

core/file_server/event_handler/LogInput.cpp

-
-        if (mIdleFlag)
+        // check exiting
+        if (mIdleFlag && !Application::GetInstance()->IsExiting())


这里为啥加了一个条件？

henryzhx8 · 2025-03-13T07:56:44Z

core/collection_pipeline/batch/FlushStrategy.cpp

这个文件直接删了吧

henryzhx8 · 2025-03-13T08:08:49Z

core/collection_pipeline/serializer/SLSSerializer.h

@@ -38,10 +38,31 @@ struct CompressedLogGroup {
    CompressedLogGroup(std::string&& data, size_t rawSize) : mData(std::move(data)), mRawSize(rawSize) {}
 };

+// vc++ must implemented with declare, cant implement in cpp file.


改一下描述吧，template specialization must be implemented in h file in vc++

henryzhx8 · 2025-03-13T08:09:39Z

core/common/EncodingConverter.cpp

@@ -180,7 +180,7 @@ std::string EncodingConverter::FromACPToUTF8(const std::string& s) const {

    auto input = const_cast<char*>(s.c_str());
    auto inputLen = s.length();
-    std::vector<size_t> ignore;
+    std::vector<long> ignore;


这里为什么要改？

henryzhx8 · 2025-03-13T08:34:24Z

core/common/http/Curl.cpp

+#if defined(_MSC_VER)
+        setsockopt(fd, IPPROTO_IP, IP_TOS, (const char*)&(*socket->mTOS), sizeof(socket->mTOS));
+#else
        setsockopt(fd, IPPROTO_IP, IP_TOS, &socket->mTOS, sizeof(socket->mTOS));
+#endif


统一改成这样&socket->mTOS.value(), sizeof(uint32_t));可以吗？

henryzhx8 · 2025-03-13T08:36:09Z

core/config/common_provider/CommonConfigProvider.cpp

@@ -390,6 +390,8 @@ bool CommonConfigProvider::DumpConfigFile(const configserver::proto::v2::ConfigD
        return false;
    }
    fout << configDetail;
+    // in windows, if not close fout, rename will faield, This file is being used by other programs.
+    fout.close();


387到392行用花括号包起来吧，别加close了，其它地方也是这么改的，这里漏了

henryzhx8 · 2025-03-13T09:14:48Z

core/unittest/processor/ProcessorParseContainerLogNativeUnittest.cpp

同主文件，这些相关的类也需要条件编译

henryzhx8 · 2025-03-13T09:15:22Z

core/unittest/processor/ProcessorTagNativeUnittest.cpp

@@ -68,6 +68,11 @@ void ProcessorTagNativeUnittest::TestInit() {
    }
 }

+// TODO: windows
+#if defined(_MSC_VER)
+void ProcessorTagNativeUnittest::TestProcess() {


这里是什么原因不过？

henryzhx8 · 2025-03-13T10:00:17Z

core/common/WindowsDaemonUtil.cpp

放到内部去

henryzhx8 · 2025-03-13T10:02:14Z

core/common/common.cmake

@@ -39,6 +39,8 @@ if(MSVC)
    if (ENABLE_ENTERPRISE)
        list(REMOVE_ITEM THIS_SOURCE_FILES_LIST ${CMAKE_SOURCE_DIR}/common/LinuxDaemonUtil.h ${CMAKE_SOURCE_DIR}/common/LinuxDaemonUtil.cpp)
    endif()
+elseif(UNIX)


这里也要加上enterprise

henryzhx8 · 2025-03-13T10:02:41Z

core/application/Application.cpp

@@ -61,6 +61,10 @@
 #endif
 #else
 #include "provider/Provider.h"
+#if defined(_MSC_VER)


应该不需要了

messixukejia · 2025-03-11T14:12:37Z

core/file_server/MultilineOptions.cpp

@@ -222,15 +222,18 @@ bool MultilineOptions::ParseRegex(const string& pattern, shared_ptr<boost::regex

 const string& UnmatchedContentTreatmentToString(MultilineOptions::UnmatchedContentTreatment unmatchedContentTreatment) {
    switch (unmatchedContentTreatment) {
-        case MultilineOptions::UnmatchedContentTreatment::DISCARD:
+        case MultilineOptions::UnmatchedContentTreatment::DISCARD: {


不加{}，windows编译有问题？

bilosikia · 2025-02-17T13:15:53Z

core/app_config/AppConfig.cpp

@@ -1878,6 +1878,81 @@ void AppConfig::RegisterCallback(const std::string& key, std::function<bool()>*
    mCallbacks[key] = callback;
 }

+#if defined(_MSC_VER)


有单测覆盖

bilosikia · 2025-02-17T13:19:50Z

core/checkpoint/AdhocCheckpointManager.cpp

+#else
+        // TODO: windows
+        // need fopen with "rb"?
+        std::FILE* file = std::fopen(filePath.c_str(), "r");


有单测覆盖

bilosikia · 2025-02-17T14:46:13Z

core/config/common_provider/CommonConfigProvider.cpp

@@ -141,7 +141,7 @@ void CommonConfigProvider::LoadConfigFile() {
        Json::Value detail;
        if (LoadConfigDetailFromFile(entry, detail)) {
            ConfigInfo info;
-            info.name = entry.path().stem();
+            info.name = entry.path().stem().string();


https://stackoverflow.com/questions/57377349/implicit-conversion-between-stdfilesystempath-and-stdstring-should-it-hap
linux 有隐式转换，windows 多字节编码

bilosikia · 2025-02-17T14:57:35Z

core/file_server/event_handler/LogInput.cpp

-
-        if (mIdleFlag)
+        // check exiting
+        if (mIdleFlag && !Application::GetInstance()->IsExiting())


这个地方可能会一直 continue，无法退出。

bilosikia · 2025-02-17T15:03:14Z

core/plugin/processor/inner/ProcessorParseContainerLogNative.cpp

+// TODO: windows
+// windows can't instantiation with char32_t, unsigend maybe not ok.
+#if defined(_MSC_VER)
+std::wstring_convert<std::codecvt_utf8<unsigned long>, unsigned long> convert;


目前只有 parse docker log 用了，有单测覆盖。

bilosikia · 2025-03-18T07:37:13Z

scripts/windows64_build.bat

+mkdir output
+xcopy /Y %LOONCOLLECTOR_CORE_BUILD_PATH%\go_pipeline\Release\GoPluginAdapter.dll %LOONGCOLLECTOR_SRC_PATH%\pkg\logtail\
+set LDFLAGS="-X "github.com/alibaba/ilogtail/pluginmanager.BaseVersion=%LOONCOLLECTOR_VERSION%""
+%GO_BIN% build -mod=mod -buildmode=c-shared -ldflags=%LDFLAGS% -o output\PluginBase.dll %LOONGCOLLECTOR_SRC_UNIX_PATH%\plugin_main


这个命名不对，需改下

bilosikia force-pushed the feat/windows branch 26 times, most recently from c56cd6c to 065ff03 Compare February 12, 2025 14:58

bilosikia changed the title ~~feat: windows build bat~~ feat: windows build Feb 12, 2025

bilosikia force-pushed the feat/windows branch 3 times, most recently from 4a3174b to e9ea349 Compare February 16, 2025 07:18

linrunqi08 added 25 commits March 7, 2025 14:34

add workflows

50c7628

add workflows

70cd826

fix build

2c592bc

fix build script

c20f46e

fix build script

972e50a

fix build script

cb8cbeb

add ut

fe6fba4

add ut

fc179ba

fix ut build

b7de924

fix ut build

ce8c658

tmp comment some ut

a16065e

tmp comment some ut

84a0298

fix run ut bat

a0bb6c6

fix run ut bat

be05491

tmp comment some ut

bb90460

fix ut

57a266d

Merge branch 'feat/windows' of github.com:bilosikia/loongcollector in…

ed36e04

…to feat/windows

tmp rm ut

7efc5f4

fix ut

2fc1676

reset workflow

332d582

fix lint

decce03

fix ut

10bb435

fix ut

f9f30c2

fix ut

c8a84b2

fix metric event ut

f879567

linrunqi08 changed the title ~~feat: windows build~~ feat: loongcollector support windows build Mar 11, 2025

linrunqi08 reviewed Mar 11, 2025

View reviewed changes

henryzhx8 requested changes Mar 13, 2025

View reviewed changes

messixukejia reviewed Mar 13, 2025

View reviewed changes

bilosikia commented Mar 18, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: loongcollector support windows build #2082

feat: loongcollector support windows build #2082

bilosikia commented Feb 10, 2025 •

edited by linrunqi08

Loading

linrunqi08 Mar 11, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

henryzhx8 Mar 13, 2025

messixukejia Mar 11, 2025

bilosikia Feb 17, 2025

bilosikia Feb 17, 2025

bilosikia Feb 17, 2025

bilosikia Feb 17, 2025

bilosikia Feb 17, 2025

bilosikia Mar 18, 2025

feat: loongcollector support windows build #2082

Are you sure you want to change the base?

feat: loongcollector support windows build #2082

Conversation

bilosikia commented Feb 10, 2025 • edited by linrunqi08 Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bilosikia commented Feb 10, 2025 •

edited by linrunqi08

Loading