Commit: 2696389e343469082565b0dfe9feea3d5e3a551d - flitter-nix (git)

A Nix-friendly SQLite-enhanced fork of Flitter, a speedrunning split timer for Unix-style terminals

Commit MetaInfo

• Revision: 2696389e343469082565b0dfe9feea3d5e3a551d (tree)
• Time: 2022-12-23 10:21:21
• Author: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Start factoring gettimeofday() calls.

I know that this doesn't look like progress, but I'm trying to work
incrementally.

Change Summary

• modified: src/display.ml
• modified: src/splits.ml
• modified: src/splits.mli

Incremental Difference

--- a/src/display.ml
+++ b/src/display.ml
@@ -59,12 +59,13 @@ let time_status timer split_num =
     else
       color depends on whether currently ahead and how lead/loss compares to last available lead/loss
   *)
+  let now = Core_unix.gettimeofday () in
   if Splits.is_gold timer split_num then Gold
   else
-    match Splits.ahead_by timer split_num with
+    match Splits.ahead_by timer split_num ~now with
     | None -> Ahead_gain
     | Some delta -> (
-        match Splits.ahead_by timer (split_num - 1) with
+        match Splits.ahead_by timer (split_num - 1) ~now with
         | None -> if delta < 0 then Ahead_gain else Behind_loss
         | Some prev_delta ->
             if delta < 0 then
@@ -89,13 +90,13 @@ let show_delta timer split_num =
   *)
   match timer.state with
   | Idle -> false
-  | Timing (splits, _, _) | Paused (splits, _, _, _) | Done (splits, _, _) -> (
+  | Timing (splits, _, now) | Paused (splits, _, _, now) | Done (splits, _, now) -> (
       if split_num < Array.length splits then true
       else
         match time_status timer split_num with
         | Behind_gain | Behind_loss -> true
         | Ahead_gain | Ahead_loss | Gold -> (
-            let sgmt = Splits.segment_time timer split_num in
+            let sgmt = Splits.segment_time timer split_num ~now in
             let gold = timer.golds.(split_num).duration in
             match (sgmt, gold) with Some s, Some g -> s > g | _ -> false))
 
@@ -123,7 +124,8 @@ let split_row timer width i =
   let delta_image =
     if show_comparison then I.string uncolored_attr "-"
     else
-      match Splits.ahead_by timer i with
+  let now = Core_unix.gettimeofday () in
+      match Splits.ahead_by timer i ~now with
       | None -> I.string uncolored_attr "-"
       | Some delta ->
           if not (show_delta timer i) then I.string uncolored_attr ""
@@ -135,9 +137,10 @@ let split_row timer width i =
 
   (* Compute the image of the split's segment time *)
   let sgmt_image =
+  let now = Core_unix.gettimeofday () in
     let seg_time =
       if show_comparison then Splits.archived_segment_time timer i
-      else Splits.segment_time timer i
+      else Splits.segment_time timer i ~now
     in
 
     match seg_time with
@@ -147,8 +150,9 @@ let split_row timer width i =
 
   (* Compute the image of the split's absolute time *)
   let time =
+  let now = Core_unix.gettimeofday () in
     if show_comparison then Splits.archived_split_time timer i
-    else Splits.split_time timer i
+    else Splits.split_time timer i ~now
   in
   let time_str =
     match time with Some t -> Duration.to_string t 1 | None -> "-"
@@ -243,11 +247,11 @@ let previous_segment timer width =
   let time_img =
     match timer.state with
     | Idle -> empty_time_img
-    | Timing (splits, _, _) | Paused (splits, _, _, _) | Done (splits, _, _)
+    | Timing (splits, _, now) | Paused (splits, _, _, now) | Done (splits, _, now)
       -> (
         let curr_split = Array.length splits in
-        let prev_delta = Splits.ahead_by timer (curr_split - 1) in
-        let prev_prev_delta = Splits.ahead_by timer (curr_split - 2) in
+        let prev_delta = Splits.ahead_by timer (curr_split - 1) ~now in
+        let prev_prev_delta = Splits.ahead_by timer (curr_split - 2) ~now in
         match (prev_delta, prev_prev_delta) with
         | Some pd, Some ppd ->
             let diff = pd - ppd in
@@ -265,7 +269,7 @@ let best_possible_time timer width =
   let t =
     match timer.state with
     | Idle -> Splits.gold_sum timer 0 (Array.length timer.split_names)
-    | Timing (splits, _, _) | Paused (splits, _, _, _) -> (
+    | Timing (splits, _, now) | Paused (splits, _, _, now) -> (
         let curr_split = Array.length splits in
         let total_splits = Array.length timer.split_names in
 
@@ -274,7 +278,7 @@ let best_possible_time timer width =
         let last_split_time =
           if curr_split = 0 then Some 0 else splits.(curr_split - 1)
         in
-        let curr_seg = Splits.segment_time timer curr_split in
+        let curr_seg = Splits.segment_time timer curr_split ~now in
 
         match (future_sob, curr_gold, last_split_time, curr_seg) with
         | ( Some future_sob',

--- a/src/splits.ml
+++ b/src/splits.ml
@@ -1,13 +1,9 @@
 open Core
 open Timer_types
 
-let split_time timer ?now split_num =
+let split_time timer ~now split_num =
   if split_num < 0 then Some 0
   else
-    let curr_time =
-      match now with Some t -> t | None -> Core_unix.gettimeofday ()
-    in
-
     match timer.state with
     | Idle -> None
     | Paused (splits, start_time, pause_time, _) ->
@@ -18,21 +14,21 @@ let split_time timer ?now split_num =
     | Timing (splits, start_time, _) | Done (splits, start_time, _) ->
         if split_num > Array.length splits then None
         else if split_num = Array.length splits then
-          Some (Duration.between start_time curr_time)
+          Some (Duration.between start_time now)
         else splits.(split_num)
 
 let duration timer =
   match timer.state with
   | Idle -> 0
-  | Timing (splits, _, _) | Paused (splits, _, _, _) | Done (splits, _, _) -> (
-      match split_time timer (Array.length splits) with
+  | Timing (splits, _, now) | Paused (splits, _, _, now) | Done (splits, _, now) -> (
+      match split_time ~now timer (Array.length splits) with
       | Some t -> t
       | None -> assert false)
 
-let ahead_by timer ?now split_num =
+let ahead_by timer ~now split_num =
   if split_num < 0 then None
   else
-    let split_time = split_time timer ?now split_num in
+    let split_time = split_time timer ~now split_num in
     let comp_time =
       match timer.comparison with
       | None -> None
@@ -43,9 +39,9 @@ let ahead_by timer ?now split_num =
     | Some st, Some ct -> Some (st - ct)
     | _ -> None
 
-let segment_time timer ?now split_num =
-  let t0 = split_time timer ?now (split_num - 1) in
-  let t1 = split_time timer ?now split_num in
+let segment_time timer ~now split_num =
+  let t0 = split_time timer ~now (split_num - 1) in
+  let t1 = split_time timer ~now split_num in
 
   match (t0, t1) with Some t0', Some t1' -> Some (t1' - t0') | _ -> None
 
@@ -56,7 +52,8 @@ let current_split timer =
       Some (Array.length splits)
 
 let is_gold timer split_num =
-  match (current_split timer, segment_time timer split_num) with
+  let now = Core_unix.gettimeofday () in
+  match (current_split timer, segment_time ~now timer split_num) with
   | Some n, Some seg_time -> (
       if split_num >= n then false
       else
@@ -68,9 +65,9 @@ let is_gold timer split_num =
 let updated_golds timer =
   match timer.state with
   | Idle -> timer.golds
-  | Timing (splits, _, _) | Paused (splits, _, _, _) | Done (splits, _, _) ->
+  | Timing (splits, _, now) | Paused (splits, _, _, now) | Done (splits, _, now) ->
       let seg_durations =
-        Array.mapi splits ~f:(fun i _ -> segment_time timer i)
+        Array.mapi splits ~f:(fun i _ -> segment_time ~now timer i)
       in
       let old_durations = Array.map timer.golds ~f:(fun g -> g.duration) in
 

--- a/src/splits.mli
+++ b/src/splits.mli
@@ -1,13 +1,13 @@
 val is_gold : Timer_types.timer -> int -> bool
-val ahead_by : Timer_types.timer -> ?now:float -> int -> int option
-val segment_time : Timer_types.timer -> ?now:float -> int -> int option
+val ahead_by : Timer_types.timer -> now:float -> int -> int option
+val segment_time : Timer_types.timer -> now:float -> int -> int option
 val archived_split_time : Timer_types.timer -> int -> int option
 val archived_segment_time : Timer_types.timer -> int -> int option
 
 val archive_done_run :
   Timer_types.timer -> Duration.t option array -> Timer_types.archived_run
 
-val split_time : Timer_types.timer -> ?now:float -> int -> int option
+val split_time : Timer_types.timer -> now:float -> int -> int option
 val gold_sum : Timer_types.timer -> int -> int -> int option
 val updated_golds : Timer_types.timer -> Timer_types.gold array
 val updated_pb : Timer_types.timer -> Timer_types.archived_run option