Press F5 to reload

Author: talex5

README.md

@@ -59,6 +59,8 @@ dune build && eio-trace run -- ./_build/default/examples/net/main.exe
 
 Scrolling with the mouse or touchpad will zoom in or out of the diagram.
 
+If the program is still running when the window appears, you can press F5 to update to the latest events.
+
 To record a trace:
 
 ```

gtk/gtk_ui.ml

@@ -3,7 +3,7 @@ open Eio_trace
 let ( ==> ) signal callback =
   ignore (signal ~callback : GtkSignal.id)
 
-let create ~title layout =
+let create ~title tracefile =
   let window = GWindow.window () in
   window#set_title title;
   window#event#connect#delete ==> (fun _ -> GMain.quit (); true);
@@ -13,7 +13,10 @@ let create ~title layout =
   let area = GMisc.drawing_area ~packing:(table#attach ~left:0 ~top:0 ~expand:`BOTH ~fill:`BOTH) () in
   let _hscroll = GRange.scrollbar `HORIZONTAL ~adjustment:hadjustment ~packing:(table#attach ~left:0 ~top:1 ~expand:`X ~fill:`BOTH) () in
   let _vscroll = GRange.scrollbar `VERTICAL ~adjustment:vadjustment ~packing:(table#attach ~left:1 ~top:0 ~expand:`Y ~fill:`BOTH) () in
-  let v = View.of_layout layout ~width:1000. ~height:1000. in
+  let v =
+    let layout = Layout.load tracefile in
+    View.of_layout layout ~width:1000. ~height:1000.
+  in
   let set_scollbars () =
     let (xlo, xhi, xsize, xvalue), (ylo, yhi, ysize, yvalue) = View.scroll_bounds v in
     hadjustment#set_bounds ~lower:xlo ~upper:xhi ~page_size:xsize ();
@@ -45,6 +48,18 @@ let create ~title layout =
       true
     );
   area#misc#set_app_paintable true;
+
+  window#event#connect#key_press ==> (fun ev ->
+      let keyval = GdkEvent.Key.keyval ev in
+      if keyval = GdkKeysyms._F5 then (
+        let layout = Layout.load tracefile in
+        View.set_layout v layout;
+        set_scollbars ();
+        redraw ();
+        true
+      ) else false
+    );
+
   area#event#add [`SMOOTH_SCROLL; `BUTTON1_MOTION; `BUTTON_PRESS];
   area#event#connect#scroll ==> (fun ev ->
       let x = GdkEvent.Scroll.x ev in

gtk/main.ml

@@ -7,14 +7,6 @@ let format_of_string = function
   | ".png" -> `Png
   | x -> Fmt.failwith "Unknown format %S (should be .svg or .png)" x
 
-let load tracefile =
-  let ch = open_in_bin tracefile in
-  let len = in_channel_length ch in
-  let data = really_input_string ch len in
-  close_in ch;
-  let trace = Trace.create data in
-  Layout.of_trace trace
-
 let show ?args tracefile =
   let title =
     match args with
@@ -25,7 +17,7 @@ let show ?args tracefile =
     | Some args ->
       String.concat " " args
   in
-  Gtk_ui.create ~title (load tracefile)
+  Gtk_ui.create ~title tracefile
 
 let render ?output ~start_time ?duration ~format tracefile =
   let output =
@@ -34,7 +26,7 @@ let render ?output ~start_time ?duration ~format tracefile =
     | None -> Filename.remove_extension tracefile ^ format
   in
   let format = format_of_string format in
-  let l = load (tracefile) in
+  let l = Layout.load (tracefile) in
   let v =
     View.of_layout l
       ~width:1280.

lib/layout.ml

@@ -242,3 +242,11 @@ let of_trace (trace : Trace.t) =
 let start_time t = t.start_time
 
 let ring t id = Trace.Rings.find id t.rings
+
+let load tracefile =
+  let ch = open_in_bin tracefile in
+  let len = in_channel_length ch in
+  let data = really_input_string ch len in
+  close_in ch;
+  let trace = Trace.create data in
+  of_trace trace

lib/view.ml

@@ -1,5 +1,5 @@
 type t = {
-  layout : Layout.t;
+  mutable layout : Layout.t;
   mutable width : float;                (* Canvas width in pixels *)
   mutable height : float;
   mutable start_time : float;           (* Time after layout start (ns) *)
@@ -78,3 +78,6 @@ let of_layout layout ~width ~height =
   let t = { layout; width; height; start_time = 0.; scroll_y = -. v_margin; pixels_per_ns = 0.0; zoom = -3.0 } in
   zoom t 0.0;
   t
+
+let set_layout t layout =
+  t.layout <- layout