Merge pull request #4 from fermat-prime/main

Fixes bofObjectRunAsyncThread() crash on older GLIBC
The-Z-Labs · May 16, 2024 · b6f92df · b6f92df
2 parents 4412fc5 + a06214d
commit b6f92df
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/bof-launcher/src/bof_launcher.zig b/bof-launcher/src/bof_launcher.zig
@@ -1720,6 +1720,7 @@ const gstate = struct {
     var func_lookup: std.StringHashMap(usize) = undefined;
 
     var libc: if (@import("builtin").os.tag == .linux) ?std.DynLib else void = null;
+    var libpthread: if (@import("builtin").os.tag == .linux) ?std.DynLib else void = null;
     var pthread_create: *const fn (
         noalias newthread: *pthread_t,
         noalias attr: ?*anyopaque,
@@ -1878,10 +1879,10 @@ fn initLauncher() !void {
     }
 
     if (@import("builtin").os.tag == .linux) {
-        gstate.libc = try std.DynLib.open("libc.so.6");
+        gstate.libpthread = try std.DynLib.open("libpthread.so.0");
 
-        gstate.pthread_create = gstate.libc.?.lookup(@TypeOf(gstate.pthread_create), "pthread_create").?;
-        gstate.pthread_detach = gstate.libc.?.lookup(@TypeOf(gstate.pthread_detach), "pthread_detach").?;
+        gstate.pthread_create = gstate.libpthread.?.lookup(@TypeOf(gstate.pthread_create), "pthread_create").?;
+        gstate.pthread_detach = gstate.libpthread.?.lookup(@TypeOf(gstate.pthread_detach), "pthread_detach").?;
     }
 
     gstate.is_valid = true;
@@ -1909,6 +1910,10 @@ export fn bofLauncherRelease() callconv(.C) void {
             gstate.libc.?.close();
             gstate.libc = null;
         }
+        if (gstate.libpthread != null) {
+            gstate.libpthread.?.close();
+            gstate.libpthread = null;
+        }
     }
 
     gstate.bof_pool.deinit(gstate.allocator.?);