From e8acf49088f90d8d4439c4034696bc4e5f8b4ed9 Mon Sep 17 00:00:00 2001
From: Michal Terepeta <michal.terepeta@gmail.com>
Date: Sat, 11 Jan 2020 19:09:31 +0100
Subject: Fix a corner case when printing unaccounted time

Previously `ra_prof` wouldn't actually print the unaccounted time in
some cases.

We would print, for instance, this:
```
    5ms - foo
        2ms - bar
```
instead of:
```
    5ms - foo
        2ms - bar
        3ms - ???
```

The fix is to properly handle the case when an entry has 0 children
instead of using the `last` variable.

Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
---
 crates/ra_prof/src/lib.rs | 56 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index 6dde304b1..da541005a 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -219,7 +219,11 @@ fn print(
     longer_than: Duration,
     total: Option<Duration>,
 ) {
-    let mut last = 0;
+    if msgs.is_empty() {
+        return;
+    }
+    // The index of the first element that will be included in the slice when we recurse.
+    let mut next_start = 0;
     let indent = repeat("    ").take(lvl).collect::<String>();
     // We output hierarchy for long calls, but sum up all short calls
     let mut short = Vec::new();
@@ -233,12 +237,12 @@ fn print(
             writeln!(out, "{}{:5}ms - {}", indent, duration.as_millis(), msg)
                 .expect("printing profiling info to stdout");
 
-            print(lvl + 1, &msgs[last..i], out, longer_than, Some(duration));
+            print(lvl + 1, &msgs[next_start..i], out, longer_than, Some(duration));
         } else {
             short.push((msg, duration))
         }
 
-        last = i;
+        next_start = i + 1;
     }
     short.sort_by_key(|(msg, _time)| *msg);
     for (msg, entires) in short.iter().group_by(|(msg, _time)| msg).into_iter() {
@@ -255,7 +259,7 @@ fn print(
     if let Some(total) = total {
         if let Some(unaccounted) = total.checked_sub(accounted_for) {
             let unaccounted_millis = unaccounted.as_millis();
-            if unaccounted_millis > longer_than.as_millis() && unaccounted_millis > 0 && last > 0 {
+            if unaccounted_millis > longer_than.as_millis() && unaccounted_millis > 0 {
                 writeln!(out, "{}{:5}ms - ???", indent, unaccounted_millis)
                     .expect("printing profiling info to stdout");
             }
@@ -377,4 +381,48 @@ mod tests {
             "    1ms - foo\n        0ms - bar (2 calls)\n"
         );
     }
+
+    #[test]
+    fn test_unaccounted_for_topmost() {
+        let mut result = vec![];
+        let msgs = vec![
+            Message { level: 1, duration: Duration::from_millis(2), message: "bar".to_owned() },
+            Message { level: 0, duration: Duration::from_millis(5), message: "foo".to_owned() },
+        ];
+        print(0, &msgs, &mut result, Duration::from_millis(0), Some(Duration::from_millis(1)));
+        assert_eq!(
+            std::str::from_utf8(&result).unwrap().lines().collect::<Vec<_>>(),
+            vec![
+                "    5ms - foo",
+                "        2ms - bar",
+                "        3ms - ???",
+                // Dummy comment to improve formatting
+            ]
+        );
+    }
+
+    #[test]
+    fn test_unaccounted_for_multiple_levels() {
+        let mut result = vec![];
+        let msgs = vec![
+            Message { level: 2, duration: Duration::from_millis(3), message: "baz".to_owned() },
+            Message { level: 1, duration: Duration::from_millis(5), message: "bar".to_owned() },
+            Message { level: 2, duration: Duration::from_millis(2), message: "baz".to_owned() },
+            Message { level: 1, duration: Duration::from_millis(4), message: "bar".to_owned() },
+            Message { level: 0, duration: Duration::from_millis(9), message: "foo".to_owned() },
+        ];
+        print(0, &msgs, &mut result, Duration::from_millis(0), None);
+        assert_eq!(
+            std::str::from_utf8(&result).unwrap().lines().collect::<Vec<_>>(),
+            vec![
+                "    9ms - foo",
+                "        5ms - bar",
+                "            3ms - baz",
+                "            2ms - ???",
+                "        4ms - bar",
+                "            2ms - baz",
+                "            2ms - ???",
+            ]
+        );
+    }
 }
-- 
cgit v1.2.3