Increase general coverage

attach/frida_uprobe_attach_impl/test/test_attach_with_unified_interface.cpp

@@ -1,3 +1,4 @@
+#include "attach_private_data.hpp"
 #include "base_attach_impl.hpp"
 #include "catch2/catch_test_macros.hpp"
 #include "frida_attach_private_data.hpp"
@@ -7,7 +8,6 @@
 #include <frida_uprobe.hpp>
 #include <memory>
 #include <string>
-
 using namespace bpftime::attach;
 
 extern "C" uint64_t
@@ -16,6 +16,12 @@ __bpftime_test_attach_with_unified_interface_func(uint64_t a, uint64_t b)
 	return a + b;
 }
 
+TEST_CASE("Test base attach private data") {
+	attach_private_data data;
+	REQUIRE_THROWS(data.initialize_from_string("test"));
+
+}
+
 TEST_CASE("Test with unified interface")
 {
 	std::unique_ptr<base_attach_impl> man =

runtime/src/bpf_helper.cpp

@@ -121,7 +121,8 @@ uint64_t bpf_get_current_uid_gid(uint64_t, uint64_t, uint64_t, uint64_t,
 				 uint64_t)
 {
 	static int gid = getgid();
-	return (((uint64_t)gid) << 32) | gid;
+	static int uid = getuid();
+	return (((uint64_t)gid) << 32) | uid;
 }
 
 uint64_t bpftime_ktime_get_ns(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t)

runtime/src/bpf_map/shared/percpu_array_map_kernel_user.cpp

@@ -48,6 +48,7 @@
 						    const void *value,
 						    uint64_t flags)
 {
+	SPDLOG_DEBUG("Updating percpu array shared");
 	return bpf_map_update_elem(kernel_map_fd, key, value, flags);
 }
 

runtime/src/bpftime_shm_internal.cpp

@@ -396,8 +396,10 @@ bool bpftime_shm::is_map_fd(int fd) const
 }
 bool bpftime_shm::is_ringbuf_map_fd(int fd) const
 {
-	if (!is_map_fd(fd))
+	if (!is_map_fd(fd)) {
+		SPDLOG_ERROR("Expected fd {} to be a map fd", fd);
 		return false;
+	}
 	auto &map_impl = std::get<bpf_map_handler>(manager->get_handler(fd));
 	return map_impl.type == bpf_map_type::BPF_MAP_TYPE_RINGBUF;
 }
@@ -703,7 +705,10 @@ const handler_manager *bpftime_shm::get_manager() const
 {
 	return manager;
 }
-
+handler_manager &bpftime_shm::get_manager_mut()
+{
+	return *manager;
+}
 bool bpftime_shm::is_perf_event_handler_fd(int fd) const
 {
 	if (manager == nullptr || fd < 0 ||

runtime/src/bpftime_shm_internal.hpp

@@ -55,6 +55,10 @@ class bpftime_shm {
 #endif
 
     public:
+	boost::interprocess::managed_shared_memory &get_segment_manager()
+	{
+		return segment;
+	}
 	// Get the configuration object
 	const struct agent_config &get_agent_config();
 	// Set the configuration object
@@ -176,7 +180,7 @@ class bpftime_shm {
 	bpftime_shm(const char *shm_name, shm_open_type type);
 
 	const handler_manager *get_manager() const;
-
+	handler_manager &get_manager_mut();
 	std::optional<void *>
 	get_software_perf_event_raw_buffer(int fd, size_t buffer_sz) const;
 

runtime/src/handler/map_handler.cpp

@@ -593,6 +593,9 @@ void bpf_map_handler::map_free(managed_shared_memory &memory)
 		memory.destroy<prog_array_map_impl>(container_name.c_str());
 		break;
 #endif
+	case bpf_map_type::BPF_MAP_TYPE_ARRAY_OF_MAPS:
+		memory.destroy<array_map_of_maps_impl>(container_name.c_str());
+		break;
 	default:
 		auto func_ptr = global_map_ops_table[(int)type].map_free;
 		if (func_ptr) {

runtime/unit-test/CMakeLists.txt

@@ -20,7 +20,8 @@ set(TEST_SOURCES
     maps/test_external_map_ops.cpp
     maps/test_bpftime_hash_map.cpp
     maps/kernel_unit_tests.cpp
-
+    maps/test_map_handler.cpp
+
     test_bpftime_shm_json.cpp
     attach_with_ebpf/test_attach_filter_with_ebpf.cpp
     attach_with_ebpf/test_attach_uprobe_with_ebpf.cpp
@@ -30,6 +31,8 @@ set(TEST_SOURCES
     attach_with_ebpf/test_attach_replace.cpp
 
     tailcall/test_user_to_kernel_tailcall.cpp
+
+    runtime/test_helpers.cpp
 )
 
 option(TEST_LCOV "option for lcov" OFF)