undo use Fun.protect, closes objects too early

koonwen · koonwen · commit fe815ce03784 · 2024-06-20T19:24:47.000+01:00
diff --git a/src/ocaml_libbpf.ml b/src/ocaml_libbpf.ml
@@ -81,9 +81,10 @@ let with_bpf_object_open_load_link ~obj_path ~program_names
     failwith_f "Failed to find %s programs" (String.concat "," not_found));
 
   (* Run before_link user initialization code *)
-  Fun.protect
-    ~finally:(fun () -> bpf_object_close obj)
-    (fun () -> before_link obj);
+  (try before_link obj
+   with e ->
+     bpf_object_close obj;
+     raise e);
 
   (* Get list of links *)
   let links, not_attached =
@@ -98,9 +99,13 @@ let with_bpf_object_open_load_link ~obj_path ~program_names
     (* Detached successfully attached before shutdown *)
     cleanup ~links obj;
     failwith_f "Failed to link %s programs" (String.concat "," not_attached));
+  Printf.printf "IM HERE\n%!";
 
   (* Run user program *)
-  Fun.protect ~finally:(fun () -> cleanup ~links obj) (fun () -> fn obj links);
+  (try fn obj links
+   with e ->
+     cleanup ~links obj;
+     raise e);
 
   (* Ensure proper shutdown *)
   cleanup ~links obj
