Git-Mirrors/qubes-mirage-firewall
1
0
Fork 0
mirror of https://github.com/mirage/qubes-mirage-firewall.git synced 2025-03-07 23:07:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from talex5/fix-restart-delay

Browse Source 
Don't wait for GUI before attaching client VMs
This commit is contained in:
Thomas Leonard 2019-01-10 13:11:44 +00:00 committed by GitHub
commit 791342d508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unikernel.ml
View File

@ -34,11 +34,15 @@ module Main (Clock : Mirage_clock_lwt.MCLOCK) = struct
] ]
(* We don't use the GUI, but it's interesting to keep an eye on it. (* We don't use the GUI, but it's interesting to keep an eye on it.
If the other end dies, don't let it take us with it (can happen on log out). *) If the other end dies, don't let it take us with it (can happen on logout). *)
let watch_gui gui = let watch_gui gui =
Lwt.async (fun () -> Lwt.async (fun () ->
Lwt.try_bind Lwt.try_bind
(fun () -> GUI.listen gui) (fun () ->
gui >>= fun gui ->
Log.info (fun f -> f "GUI agent connected");
GUI.listen gui
)
(fun `Cant_happen -> assert false) (fun `Cant_happen -> assert false)
(fun ex -> (fun ex ->
Log.warn (fun f -> f "GUI thread failed: %s" (Printexc.to_string ex)); Log.warn (fun f -> f "GUI thread failed: %s" (Printexc.to_string ex));
@ -51,21 +55,18 @@ module Main (Clock : Mirage_clock_lwt.MCLOCK) = struct
let start_time = Clock.elapsed_ns clock in let start_time = Clock.elapsed_ns clock in
(* Start qrexec agent, GUI agent and QubesDB agent in parallel *) (* Start qrexec agent, GUI agent and QubesDB agent in parallel *)
let qrexec = RExec.connect ~domid:0 () in let qrexec = RExec.connect ~domid:0 () in
let gui = GUI.connect ~domid:0 () in GUI.connect ~domid:0 () |> watch_gui;
let qubesDB = DB.connect ~domid:0 () in let qubesDB = DB.connect ~domid:0 () in
(* Wait for clients to connect *) (* Wait for clients to connect *)
qrexec >>= fun qrexec -> qrexec >>= fun qrexec ->
let agent_listener = RExec.listen qrexec Command.handler in let agent_listener = RExec.listen qrexec Command.handler in
gui >>= fun gui ->
watch_gui gui;
qubesDB >>= fun qubesDB -> qubesDB >>= fun qubesDB ->
let startup_time = let startup_time =
let (-) = Int64.sub in let (-) = Int64.sub in
let time_in_ns = Clock.elapsed_ns clock - start_time in let time_in_ns = Clock.elapsed_ns clock - start_time in
Int64.to_float time_in_ns /. 1e9 Int64.to_float time_in_ns /. 1e9
in in
Log.info (fun f -> f "Qubes agents connected in %.3f s (CPU time used since boot: %.3f s)" Log.info (fun f -> f "QubesDB and qrexec agents connected in %.3f s" startup_time);
startup_time (Sys.time ()));
(* Watch for shutdown requests from Qubes *) (* Watch for shutdown requests from Qubes *)
let shutdown_rq = let shutdown_rq =
OS.Lifecycle.await_shutdown_request () >>= fun (`Poweroff | `Reboot) -> OS.Lifecycle.await_shutdown_request () >>= fun (`Poweroff | `Reboot) ->