Merge branch 'fixprofwaits' into 'master'

Fix Profiler Waits See merge request StanfordLegion/legion!1339
StanfordLegion · Jun 22, 2024 · dbd7448 · dbd7448
2 parents 1790d57 + 678aefd
commit dbd7448
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/tools/legion_prof.py b/tools/legion_prof.py
@@ -1190,6 +1190,8 @@ def add_wait_interval(self,
                           end: int
     ) -> None:
         self.wait_intervals.append(WaitInterval(start, ready, end))
+        # Keep these sorted
+        self.wait_intervals.sort(key=lambda w: w.start)
 
     @typecheck
     def active_time(self) -> int:

diff --git a/tools/legion_prof_rs/src/state.rs b/tools/legion_prof_rs/src/state.rs
@@ -762,6 +762,8 @@ impl Proc {
                             *call_stop,
                             *call_stop,
                         ));
+                        // Keep the wait intervals sorted by starting time
+                        next_entry.waiters.wait_intervals.sort_by_key(|w| w.start);
                         found = true;
                         break;
                     } else {
@@ -775,6 +777,8 @@ impl Proc {
                         *call_stop,
                         *call_stop,
                     ));
+                    // Keep the wait intervals sorted by starting time
+                    task_entry.waiters.wait_intervals.sort_by_key(|w| w.start);
                 }
                 // Update the operation info for the calls
                 let call_entry = self.entries.get_mut(&call_uid).unwrap();