simon/ocaml-trace
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-trace.git synced 2026-03-08 03:47:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: block signals in background threads

Browse source
This commit is contained in:
Simon Cruanes 2025-03-13 15:55:09 -04:00
parent 357db5c5bb
commit c5e813170d
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/tef/trace_tef.ml
View file

@ -204,10 +204,28 @@ module Writer = struct
Buffer.output_buffer self.oc self.buf Buffer.output_buffer self.oc self.buf
end end
let block_signals () =
try
ignore
(Unix.sigprocmask SIG_BLOCK
[
Sys.sigterm;
Sys.sigpipe;
Sys.sigint;
Sys.sigchld;
Sys.sigalrm;
Sys.sigusr1;
Sys.sigusr2;
]
: _ list)
with _ -> ()
(** Background thread, takes events from the queue, puts them (** Background thread, takes events from the queue, puts them
in context using local state, and writes fully resolved in context using local state, and writes fully resolved
TEF events to [out]. *) TEF events to [out]. *)
let bg_thread ~mode ~out (events : Event.t B_queue.t) : unit = let bg_thread ~mode ~out (events : Event.t B_queue.t) : unit =
block_signals ();
(* open a writer to [out] *) (* open a writer to [out] *)
Writer.with_ ~mode ~out @@ fun writer -> Writer.with_ ~mode ~out @@ fun writer ->
(* local state, to keep track of span information and implicit stack context *) (* local state, to keep track of span information and implicit stack context *)
@ -278,6 +296,7 @@ let bg_thread ~mode ~out (events : Event.t B_queue.t) : unit =
(** Thread that simply regularly "ticks", sending events to (** Thread that simply regularly "ticks", sending events to
the background thread so it has a chance to write to the file *) the background thread so it has a chance to write to the file *)
let tick_thread events : unit = let tick_thread events : unit =
block_signals ();
try try
while true do while true do
Thread.delay 0.5; Thread.delay 0.5;