From cd01611efb35992dfd6de9688753c511f1d59a1f Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sun, 6 Jan 2019 03:00:16 +0100 Subject: [PATCH] vmmd_stat: use correct id to remove socket --- app/vmm_stats_pure.ml | 2 +- app/vmmd_stats.ml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/vmm_stats_pure.ml b/app/vmm_stats_pure.ml index 06a62fa..6cfd229 100644 --- a/app/vmm_stats_pure.ml +++ b/app/vmm_stats_pure.ml @@ -120,7 +120,7 @@ let tick t = | None -> Logs.err (fun m -> m "couldn't drop super %a from sub %a" Vmm_core.Name.pp id Vmm_core.Name.pp vmid) ; out | Some real_id -> let header = Vmm_commands.{ version = my_version ; sequence = 0L ; name = real_id } in - ((socket, vmid, (header, `Data (`Stats_data stats))) :: out)) + ((socket, id, (header, `Data (`Stats_data stats))) :: out)) out xs) [] (Vmm_trie.all t'.vmid_pid) in diff --git a/app/vmmd_stats.ml b/app/vmmd_stats.ml index d09ef27..f425566 100644 --- a/app/vmmd_stats.ml +++ b/app/vmmd_stats.ml @@ -62,12 +62,12 @@ let handle s addr () = let timer () = let t', outs = tick !t in t := t' ; - Lwt_list.iter_p (fun (s, name, stat) -> + Lwt_list.iter_p (fun (s, id, stat) -> Vmm_lwt.write_wire s stat >>= function | Ok () -> Lwt.return_unit | Error `Exception -> - Logs.debug (fun m -> m "removing entry %a" Vmm_core.Name.pp name) ; - t := remove_entry !t name ; + Logs.debug (fun m -> m "removing entry %a" Vmm_core.Name.pp id) ; + t := remove_entry !t id ; Vmm_lwt.safe_close s) outs