simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-05 19:00:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup for lwt

Browse source
This commit is contained in:
Simon Cruanes 2025-07-16 22:53:26 -04:00
parent 3014046a8a
commit 76cefc0991
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/lwt/tiny_httpd_lwt.ml
View file

@ -129,6 +129,8 @@ let io_backend ?addr ?port ?unix_sock ?max_connections ?max_buf_pool_size
Lwt_unix.bind sock sockaddr |> Lwt_direct.await; Lwt_unix.bind sock sockaddr |> Lwt_direct.await;
Lwt_unix.listen sock backlog; Lwt_unix.listen sock backlog;
let cleanup () = Lwt_unix.close sock |> Lwt_direct.await in
(* recover real port, if any *) (* recover real port, if any *)
(match Unix.getsockname (Lwt_unix.unix_file_descr sock) with (match Unix.getsockname (Lwt_unix.unix_file_descr sock) with
| Unix.ADDR_INET (_, p) -> port := p | Unix.ADDR_INET (_, p) -> port := p
@ -137,12 +139,6 @@ 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 cleanup () =
Log.debug (fun k ->
k "Tiny_httpd_lwt: client handler returned");
Atomic.decr active_conns
in
let buf_ic = Bytes.create buf_size in let buf_ic = Bytes.create buf_size in
let buf_oc = Bytes.create buf_size in let buf_oc = Bytes.create buf_size in
(* (*
@ -154,6 +150,16 @@ let io_backend ?addr ?port ?unix_sock ?max_connections ?max_buf_pool_size
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 () =
Log.debug (fun k ->
k "Tiny_httpd_lwt: client handler returned");
Atomic.decr active_conns;
(try Lwt_unix.shutdown fd SHUTDOWN_ALL with _ -> ());
ic#close ();
oc#close ()
in
try try
handle.handle ~client_addr ic oc; handle.handle ~client_addr ic oc;
cleanup () cleanup ()
@ -167,10 +173,16 @@ let io_backend ?addr ?port ?unix_sock ?max_connections ?max_buf_pool_size
(Printexc.raw_backtrace_to_string bt)) (Printexc.raw_backtrace_to_string bt))
in in
while Atomic.get running do try
let fd, addr = Lwt_unix.accept sock |> Lwt_direct.await in while Atomic.get running do
handle_client addr fd let fd, addr = Lwt_unix.accept sock |> Lwt_direct.await in
done handle_client addr fd
done;
cleanup ()
with exn ->
let bt = Printexc.get_raw_backtrace () in
cleanup ();
Printexc.raise_with_backtrace exn bt
in in
let tcp_server : IO.TCP_server.t = let tcp_server : IO.TCP_server.t =