X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2659419ab673729eb0af805fff60051764b30b04..1a0b456abcc5188a31ba979c6ddafb20fc38163d:/src/mc/VisitedState.hpp

diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp
index 4e0c4fb9ba..b2f2694c56 100644
--- a/src/mc/VisitedState.hpp
+++ b/src/mc/VisitedState.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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,30 +6,36 @@
 #ifndef SIMGRID_MC_VISITED_STATE_HPP
 #define SIMGRID_MC_VISITED_STATE_HPP
 
-#include <cstddef>
+#include "src/mc/api/State.hpp"
+#include "src/mc/sosp/Snapshot.hpp"
 
+#include <cstddef>
 #include <memory>
 
-#include "src/mc/mc_snapshot.h"
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
-struct XBT_PRIVATE VisitedState {
-  std::shared_ptr<simgrid::mc::Snapshot> system_state = nullptr;
-  std::size_t heap_bytes_used = 0;
-  int nb_processes = 0;
-  int num = 0;
-  int other_num = 0; // dot_output for
+class XBT_PRIVATE VisitedState {
+public:
+  std::shared_ptr<simgrid::mc::Snapshot> system_state_ = nullptr;
+  std::size_t heap_bytes_used_                         = 0;
+  int actor_count_;
+  long num_;               // unique id of that state in the storage of all stored IDs
+  long original_num_ = -1; // num field of the VisitedState to which I was declared equal to (used for dot_output)
 
-  VisitedState();
-  ~VisitedState();
+  explicit VisitedState(unsigned long state_number, unsigned int actor_count, RemoteApp& remote_app);
 };
 
-extern XBT_PRIVATE std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
-XBT_PRIVATE std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State* graph_state, bool compare_snpashots);
+class XBT_PRIVATE VisitedStates {
+  std::vector<std::unique_ptr<simgrid::mc::VisitedState>> states_;
+public:
+  void clear() { states_.clear(); }
+  std::unique_ptr<simgrid::mc::VisitedState> addVisitedState(unsigned long state_number,
+                                                             simgrid::mc::State* graph_state, RemoteApp& remote_app);
+
+private:
+  void prune();
+};
 
-}
-}
+} // namespace simgrid::mc
 
 #endif