Rename some fields to obey our coding standard

diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 126c26a..e8fde38 100644 (file)
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -19,10 +19,10 @@ namespace simgrid::mc {
 
 /** @brief Save the current state */
 VisitedState::VisitedState(unsigned long state_number, unsigned int actor_count)
-    : actor_count_(actor_count), num(state_number)
+    : actor_count_(actor_count), num_(state_number)
 {
-  this->heap_bytes_used = mc_model_checker->get_remote_process().get_remote_heap_bytes();
-  this->system_state = std::make_shared<simgrid::mc::Snapshot>(state_number);
+  this->heap_bytes_used_ = mc_model_checker->get_remote_process().get_remote_heap_bytes();
+  this->system_state_    = std::make_shared<simgrid::mc::Snapshot>(state_number);
 }
 
 void VisitedStates::prune()
@@ -31,7 +31,7 @@ void VisitedStates::prune()
     XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
     auto min_element = boost::range::min_element(
         states_, [](const std::unique_ptr<simgrid::mc::VisitedState>& a,
-                    const std::unique_ptr<simgrid::mc::VisitedState>& b) { return a->num < b->num; });
+                    const std::unique_ptr<simgrid::mc::VisitedState>& b) { return a->num_ < b->num_; });
     xbt_assert(min_element != states_.end());
     // and drop it:
     states_.erase(min_element);
@@ -44,40 +44,40 @@ std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(unsign
                                                                           simgrid::mc::State* graph_state)
 {
   auto new_state = std::make_unique<simgrid::mc::VisitedState>(state_number, graph_state->get_actor_count());
-  graph_state->set_system_state(new_state->system_state);
-  XBT_DEBUG("Snapshot %p of visited state %ld (exploration stack state %ld)", new_state->system_state.get(),
-            new_state->num, graph_state->get_num());
+  graph_state->set_system_state(new_state->system_state_);
+  XBT_DEBUG("Snapshot %p of visited state %ld (exploration stack state %ld)", new_state->system_state_.get(),
+            new_state->num_, graph_state->get_num());
 
   auto [range_begin, range_end] = boost::range::equal_range(states_, new_state.get(), [](auto const& a, auto const& b) {
-    return std::make_pair(a->actor_count_, a->heap_bytes_used) < std::make_pair(b->actor_count_, b->heap_bytes_used);
+    return std::make_pair(a->actor_count_, a->heap_bytes_used_) < std::make_pair(b->actor_count_, b->heap_bytes_used_);
   });
 
   for (auto i = range_begin; i != range_end; ++i) {
     auto& visited_state = *i;
-    if (*visited_state->system_state.get() == *new_state->system_state.get()) {
+    if (*visited_state->system_state_.get() == *new_state->system_state_.get()) {
       // The state has been visited:
 
       std::unique_ptr<simgrid::mc::VisitedState> old_state = std::move(visited_state);
 
-      if (old_state->original_num == -1) // I'm the copy of an original process
-        new_state->original_num = old_state->num;
+      if (old_state->original_num_ == -1) // I'm the copy of an original process
+        new_state->original_num_ = old_state->num_;
       else // I'm the copy of a copy
-        new_state->original_num = old_state->original_num;
+        new_state->original_num_ = old_state->original_num_;
 
-      XBT_DEBUG("State %ld already visited ! (equal to state %ld (state %ld in dot_output))", new_state->num,
-                old_state->num, new_state->original_num);
+      XBT_DEBUG("State %ld already visited ! (equal to state %ld (state %ld in dot_output))", new_state->num_,
+                old_state->num_, new_state->original_num_);
 
       /* Replace the old state with the new one (with a bigger num)
           (when the max number of visited states is reached,  the oldest
           one is removed according to its number (= with the min number) */
-      XBT_DEBUG("Replace visited state %ld with the new visited state %ld", old_state->num, new_state->num);
+      XBT_DEBUG("Replace visited state %ld with the new visited state %ld", old_state->num_, new_state->num_);
 
       visited_state = std::move(new_state);
       return old_state;
     }
   }
 
-  XBT_DEBUG("Insert new visited state %ld (total : %lu)", new_state->num, (unsigned long)states_.size());
+  XBT_DEBUG("Insert new visited state %ld (total : %lu)", new_state->num_, (unsigned long)states_.size());
   states_.insert(range_begin, std::move(new_state));
   this->prune();
   return nullptr;

diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp
index d422e07..b9cb789 100644 (file)
--- a/src/mc/VisitedState.hpp
+++ b/src/mc/VisitedState.hpp
@@ -16,11 +16,11 @@ namespace simgrid::mc {
 
 class XBT_PRIVATE VisitedState {
 public:
-  std::shared_ptr<simgrid::mc::Snapshot> system_state = nullptr;
-  std::size_t heap_bytes_used = 0;
+  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)
+  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, unsigned int actor_count);
 };

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index 43dd7ce..d9eb85d 100644 (file)
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -118,7 +118,7 @@ void DFSExplorer::run()
     // Backtrack if we are revisiting a state we saw previously
     if (visited_state_ != nullptr) {
       XBT_DEBUG("State already visited (equal to state %ld), exploration stopped on this path.",
-                visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num);
+                visited_state_->original_num_ == -1 ? visited_state_->num_ : visited_state_->original_num_);
 
       visited_state_ = nullptr;
       this->backtrack();
@@ -195,8 +195,8 @@ void DFSExplorer::run()
                                    state->get_transition()->dot_string().c_str());
     } else
       mc_model_checker->dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(),
-                                   visited_state_->original_num == -1 ? visited_state_->num
-                                                                      : visited_state_->original_num,
+                                   visited_state_->original_num_ == -1 ? visited_state_->num_
+                                                                       : visited_state_->original_num_,
                                    state->get_transition()->dot_string().c_str());
 
     stack_.push_back(std::move(next_state));