Add "when-end" command to get the number of the last event

Author: timo

src/DebuggerExtensionCommand.cc

@@ -3,6 +3,7 @@
 #include "DebuggerExtensionCommand.h"
 
 #include "ReplayTask.h"
+#include "TraceFrame.h"
 #include "log.h"
 
 using namespace std;
@@ -56,6 +57,25 @@ static SimpleDebuggerExtensionCommand when_tid(
       return string("Current tid: ") + to_string(t->tid);
     });
 
+static SimpleDebuggerExtensionCommand when_end(
+    "when-end", "Print the number of the last rr event in the recording.",
+    [](GdbServer&, Task* t, const vector<string>&) {
+      if (!t->session().is_replaying()) {
+        return DebuggerExtensionCommandHandler::cmd_end_diversion();
+      }
+
+      auto task = static_cast<ReplayTask*>(t);
+      auto seek_reader(task->session().as_replay()->trace_reader());
+      FrameTime time;
+      for (;;) {
+        auto result = seek_reader.read_task_event(&time);
+        if (result.type() == TraceTaskEvent::Type::NONE) {
+          break;
+        }
+      }
+      return string("Event at end of recording: ") + to_string(time);
+    });
+
 static std::vector<ReplayTimeline::Mark> back_stack;
 static ReplayTimeline::Mark current_history_cp;
 static std::vector<ReplayTimeline::Mark> forward_stack;

src/test/when.py

@@ -1,6 +1,11 @@
 from util import *
 import re
 
+send_custom_command('when-end')
+expect_debugger(re.compile(r'Event at end of recording: (\d+)'))
+first_when_end_result = int(last_match().group(1))
+# Check this value after running the program for a bit.
+
 send_custom_command('when')
 expect_debugger(re.compile(r'Completed event: (\d+)'))
 t = int(last_match().group(1))
@@ -43,6 +48,10 @@
 if tid2 != tid:
     failed('ERROR ... tid changed')
 
+send_custom_command('when-end')
+expect_debugger(re.compile(r'Event at end of recording: (\d+)'))
+second_when_end_result = int(last_match().group(1))
+
 # Ensure 'when' terminates a diversion
 expect_expression('(int)strlen("abcd")', 4)
 send_custom_command('when')
@@ -65,4 +74,21 @@
 if tid3 != tid2:
     failed('ERROR ... diversion changed tid')
 
+send_custom_command("c")
+send_custom_command('when-end')
+expect_debugger(re.compile(r'Event at end of recording: (\d+)'))
+final_when_end_result = int(last_match().group(1))
+
+if first_when_end_result != second_when_end_result:
+    failed("ERROR ... first when-end result differs from second when-end result")
+if second_when_end_result != final_when_end_result:
+    failed("ERROR ... second when-end result differs from final when-end result")
+
+if t >= first_when_end_result:
+    failed("ERROR ... First when result was after when-end")
+if t3 >= first_when_end_result:
+    failed("ERROR ... Second when result was after when-end")
+if t3 >= first_when_end_result:
+    failed("ERROR ... Third when result was after when-end")
+
 ok()