Rename some fields to obey our coding standard

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

diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp
index 7028f4d..b9cb789 100644 (file)
--- 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,37 +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"
-#include "src/mc/mc_state.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 actors_count            = 0;
-  int num          = 0; // unique id of that state in the storage of all stored IDs
-  int original_num = 0; // num field of the VisitedState to which I was declared equal to (used for dot_output)
+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)
 
-  explicit VisitedState(unsigned long state_number);
-  ~VisitedState() = default;
+  explicit VisitedState(unsigned long state_number, unsigned int actor_count);
 };
 
 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, bool compare_snpashots);
+  std::unique_ptr<simgrid::mc::VisitedState> addVisitedState(unsigned long state_number,
+                                                             simgrid::mc::State* graph_state);
+
 private:
   void prune();
 };
 
-}
-}
+} // namespace simgrid::mc
 
 #endif