buffer pool for lwt server

This commit is contained in:
Simon Cruanes 2025-07-16 22:58:21 -04:00
parent 76cefc0991
commit 5caef14945
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4

View file

@ -111,6 +111,14 @@ let io_backend ?addr ?port ?unix_sock ?max_connections ?max_buf_pool_size
let running = Atomic.make true in let running = Atomic.make true in
let active_conns = Atomic.make 0 in let active_conns = Atomic.make 0 in
(* a pool of buffers, to reduce allocations *)
let buf_pool =
Pool.create ~max_size:pool_size
~clear:(fun buf -> Bytes.fill buf 0 (Bytes.length buf) '\x00')
~mk_item:(fun () -> Bytes.create buf_size)
()
in
(* Eio.Switch.on_release sw (fun () -> Atomic.set running false); *) (* Eio.Switch.on_release sw (fun () -> Atomic.set running false); *)
let port = ref port in let port = ref port in
@ -139,33 +147,31 @@ let io_backend ?addr ?port ?unix_sock ?max_connections ?max_buf_pool_size
let handle_client client_addr fd : unit = let handle_client client_addr fd : unit =
Atomic.incr active_conns; Atomic.incr active_conns;
Lwt_direct.run_in_the_background @@ fun () -> Lwt_direct.run_in_the_background @@ fun () ->
let buf_ic = Bytes.create buf_size in
let buf_oc = Bytes.create buf_size in
(*
let@ buf_ic = Pool.with_resource buf_pool in let@ buf_ic = Pool.with_resource buf_pool in
let@ buf_oc = Pool.with_resource buf_pool in let@ buf_oc = Pool.with_resource buf_pool in
*)
(* close FD when both ends are closed *) (* close FD when both ends are closed *)
let num_open = ref 2 in let num_open = ref 2 in
let ic = ic_of_fd ~num_open ~bytes:buf_ic fd in let ic = ic_of_fd ~num_open ~bytes:buf_ic fd in
let oc = oc_of_fd ~num_open ~bytes:buf_oc fd in let oc = oc_of_fd ~num_open ~bytes:buf_oc fd in
let cleanup () = let cleanup ~shutdown () =
Log.debug (fun k -> Log.debug (fun k ->
k "Tiny_httpd_lwt: client handler returned"); k "Tiny_httpd_lwt: client handler returned");
Atomic.decr active_conns; Atomic.decr active_conns;
(try Lwt_unix.shutdown fd SHUTDOWN_ALL with _ -> ()); if shutdown then (
try Lwt_unix.shutdown fd SHUTDOWN_ALL with _ -> ()
);
ic#close (); ic#close ();
oc#close () oc#close ()
in in
try try
handle.handle ~client_addr ic oc; handle.handle ~client_addr ic oc;
cleanup () cleanup ~shutdown:true ()
with exn -> with exn ->
let bt = Printexc.get_raw_backtrace () in let bt = Printexc.get_raw_backtrace () in
cleanup (); cleanup ~shutdown:false ();
Log.error (fun k -> Log.error (fun k ->
k "Client handler for %s failed with %s\n%s" k "Client handler for %s failed with %s\n%s"
(show_sockaddr client_addr) (show_sockaddr client_addr)