Merge branch 'udpor-phase6' into 'master'

[simgrid.git] / src / mc / mc_record.hpp

diff --git a/src/mc/mc_record.hpp b/src/mc/mc_record.hpp
index 9bf1399..2958780 100644 (file)
--- a/src/mc/mc_record.hpp
+++ b/src/mc/mc_record.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +7,7 @@
  *
  *  This file contains the MC replay/record functionality.
  *  The recorded path is written in the log output and can be replayed with MC disabled
- *  (even with an non-MC build) using `--cfg=model-check/replay:$replayPath`.
+ *  (even with a non-MC build) using `--cfg=model-check/replay:$replayPath`.
  *
  *  The same version of Simgrid should be used and the same arguments should be
  *  passed to the application (without the MC specific arguments).
@@ -22,22 +22,28 @@
 #include <string>
 #include <vector>
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
-typedef std::vector<Transition> RecordTrace;
+class RecordTrace {
+  std::vector<Transition*> transitions_;
 
-/** Convert a string representation of the path into a array of `simgrid::mc::Transition`
- */
-XBT_PRIVATE RecordTrace parseRecordTrace(const char* data);
-XBT_PRIVATE std::string traceToString(simgrid::mc::RecordTrace const& trace);
-XBT_PRIVATE void dumpRecordPath();
+public:
+  RecordTrace() = default;
+
+  /** Build a trace that can be replayed from a string representation */
+  explicit RecordTrace(const char* data);
+  /** Make a string representation that can later be used to create a new trace */
+  std::string to_string() const;
+
+  void push_back(Transition* t) { transitions_.push_back(t); }
+
+  /** Replay all transitions of a trace */
+  void replay() const;
 
-XBT_PRIVATE void replay(RecordTrace const& trace);
-XBT_PRIVATE void replay(const std::string& trace);
-}
-}
+  /** Parse and replay a string representation */
+  static void replay(const std::string& trace);
+};
 
-// **** Data conversion
+} // namespace simgrid::mc
 
 #endif