reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Vmmd_stats: use lwt_engine.on_timer for stats reporting instead of custom made let rec timer .. = sleep interval

Browse source
This commit is contained in:
Hannes Mehnert 2018-12-06 21:40:52 +01:00
parent 6724c44700
commit 39bc40353c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/vmmd_stats.ml
View file

@ -59,7 +59,7 @@ let handle s addr () =
Logs.warn (fun m -> m "disconnect, dropping %d vms!" (List.length vmids)) ; Logs.warn (fun m -> m "disconnect, dropping %d vms!" (List.length vmids)) ;
t := remove_vmids !t vmids t := remove_vmids !t vmids
let rec timer interval () = let timer () =
let t', outs = tick !t in let t', outs = tick !t in
t := t' ; t := t' ;
Lwt_list.iter_p (fun (s, name, stat) -> Lwt_list.iter_p (fun (s, name, stat) ->
@ -69,9 +69,7 @@ let rec timer interval () =
Logs.debug (fun m -> m "removing entry %a" Vmm_core.Name.pp name) ; Logs.debug (fun m -> m "removing entry %a" Vmm_core.Name.pp name) ;
t := remove_entry !t name ; t := remove_entry !t name ;
Vmm_lwt.safe_close s) Vmm_lwt.safe_close s)
outs >>= fun () -> outs
Lwt_unix.sleep interval >>= fun () ->
timer interval ()
let jump _ file interval = let jump _ file interval =
Sys.(set_signal sigpipe Signal_ignore) ; Sys.(set_signal sigpipe Signal_ignore) ;
@ -83,7 +81,7 @@ let jump _ file interval =
let s = Lwt_unix.(socket PF_UNIX SOCK_STREAM 0) in let s = Lwt_unix.(socket PF_UNIX SOCK_STREAM 0) in
Lwt_unix.(bind s (ADDR_UNIX file)) >>= fun () -> Lwt_unix.(bind s (ADDR_UNIX file)) >>= fun () ->
Lwt_unix.listen s 1 ; Lwt_unix.listen s 1 ;
Lwt.async (timer interval) ; let _ev = Lwt_engine.on_timer interval true (fun _e -> Lwt.async timer) in
let rec loop () = let rec loop () =
Lwt_unix.accept s >>= fun (cs, addr) -> Lwt_unix.accept s >>= fun (cs, addr) ->
Lwt.async (handle cs addr) ; Lwt.async (handle cs addr) ;