fix ci

eunomia-bpf · Aug 15, 2024 · 918ceff · 918ceff
1 parent 0868332
commit 918ceff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/test-runtime.yml b/.github/workflows/test-runtime.yml
@@ -35,15 +35,9 @@ jobs:
     - name: build all release with mpk enable and llvm
       run: |
         rm -rf build
-        cmake -Bbuild -DBPFTIME_LLVM_JIT=YES  -DBPFTIME_ENABLE_UNIT_TESTING=YES -DBPFTIME_ENABLE_MPK=YES -DCMAKE_BUILD_TYPE=Release
+        cmake -Bbuild -DBPFTIME_LLVM_JIT=YES  -DBPFTIME_ENABLE_UNIT_TESTING=YES -DBPFTIME_ENABLE_MPK=YES -DCMAKE_BUILD_TYPE=Debug
         cmake --build build --config Debug --target bpftime_runtime_tests -j$(nproc)
 
-    - name: build runtime without libbpf
-      run: |
-        rm -rf build
-        cmake -Bbuild -DBPFTIME_LLVM_JIT=NO  -DBPFTIME_ENABLE_UNIT_TESTING=YES -DBPFTIME_BUILD_WITH_LIBBPF=NO
-        cmake --build build -j$(nproc)
-
     - name: build runtime using ubpf
       run: |
         rm -rf build

diff --git a/runtime/src/bpf_map/userspace/prog_array.cpp b/runtime/src/bpf_map/userspace/prog_array.cpp
@@ -4,15 +4,13 @@
  * All rights reserved.
  */
 
-#if __linux__ && BPFTIME_BUILD_WITH_LIBBPF
+#if __linux__
 #include "bpf/bpf.h"
 #include "linux/bpf.h"
 #include <bpf/libbpf.h>
 #include <gnu/lib-names.h>
 #elif __APPLE__
 #include "bpftime_epoll.h"
-else
-#include "bpftime_epoll.h"
 #endif
 #include "spdlog/spdlog.h"
 #include <bpf_map/userspace/prog_array.hpp>
@@ -31,7 +29,7 @@ else
 
 // syscall() function was hooked by syscall server, direct call to it will lead
 // to a result provided by bpftime. So if we want to get things from kernel, we
-// must manually execute `syscall` from libc
+// must manually execute `syscall` from libc。
 static void *libc_handle = dlopen(LIBC_SO, RTLD_LAZY);
 static auto libc_syscall =
 	reinterpret_cast<decltype(&::syscall)>(dlsym(libc_handle, "syscall"));

diff --git a/runtime/src/bpftime_config.cpp b/runtime/src/bpftime_config.cpp
@@ -51,8 +51,6 @@ const agent_config bpftime::get_agent_config_from_env() noexcept
 		auto helpers_sv = std::string_view(custom_helpers);
 		process_helper_sv(helpers_sv, ',', agent_config);
 	} else {
-		SPDLOG_INFO(
-			"Enabling helper groups ufunc, kernel, shm_map by default");
 		agent_config.enable_kernel_helper_group =
 			agent_config.enable_shm_maps_helper_group =
 				agent_config.enable_ufunc_helper_group = true;