indentation

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 89f93c5..f3d0a20 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -214,7 +214,7 @@ simgrid::kernel::activity::CommImpl* Api::get_comm(smx_simcall_t const r) const
 }
 
 // Does half the job
-bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const 
+bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
 {
   if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
     return false;
@@ -227,11 +227,10 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
   const kernel::activity::CommImpl* synchro2 = get_comm(r2);
 
   if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
-    auto mbox = get_mbox_remote_addr(r1);;
+    auto mbox                                                  = get_mbox_remote_addr(r1);
     RemotePtr<kernel::activity::MailboxImpl> synchro2_mbox_cpy = remote(synchro2->mbox_cpy);
 
-    if (mbox != synchro2_mbox_cpy
-        && simcall_comm_wait__get__timeout(r2) <= 0)
+    if (mbox != synchro2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
     if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
@@ -329,7 +328,7 @@ RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t
 
 RemotePtr<kernel::activity::CommImpl> Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
 {
-  auto addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl**>(request->args_[0]) + value;
+  auto addr      = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl**>(request->args_[0]) + value;
   auto comm_addr = mc_model_checker->get_remote_simulation().read(remote(addr));
   return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
 }
@@ -497,7 +496,7 @@ RemotePtr<kernel::activity::MailboxImpl> Api::get_mbox_remote_addr(smx_simcall_t
     case Simcall::COMM_ISEND:
     case Simcall::COMM_IRECV: {
       auto mbox_addr_ptr = simix::unmarshal<smx_mailbox_t>(req->args_[1]);
-      mbox_addr = remote(mbox_addr_ptr);
+      mbox_addr          = remote(mbox_addr_ptr);
       break;
     }
     default:
@@ -586,7 +585,8 @@ bool Api::simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const
   if (req1->issuer_ == req2->issuer_)
     return false;
 
-  /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent with all other transitions */
+  /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent
+   * with all other transitions */
   if ((req1->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req1) > 0) ||
       (req2->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req2) > 0))
     return true;

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index 776a12b..1331079 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -6,9 +6,9 @@
 
 #include "simgrid/forward.h"
 #include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_record.hpp"
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_state.hpp"
-#include "src/mc/mc_record.hpp"
 #include "xbt/automaton.hpp"
 #include "xbt/base.h"
 
@@ -34,8 +34,8 @@ private:
     }
   };
 
-simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) const;
-bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const;
+  simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) const;
+  bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const;
 
 public:
   // No copy:
@@ -50,7 +50,7 @@ public:
 
   void initialize(char** argv) const;
 
-  // ACTOR APIs  
+  // ACTOR APIs
   std::vector<simgrid::mc::ActorInformation>& get_actors() const;
   bool actor_is_enabled(aid_t pid) const;
   unsigned long get_maxpid() const;
@@ -95,7 +95,7 @@ public:
   // SIMCALL APIs
   std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const;
   std::string request_get_dot_output(smx_simcall_t req, int value) const;
-  const char *simcall_get_name(simgrid::simix::Simcall kind) const;
+  const char* simcall_get_name(simgrid::simix::Simcall kind) const;
   smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const;
   long simcall_get_actor_id(s_smx_simcall const* req) const;
   RemotePtr<kernel::activity::MailboxImpl> get_mbox_remote_addr(smx_simcall_t const req) const;
@@ -120,27 +120,27 @@ public:
   void s_close() const;
   void execute(Transition const& transition) const;
 
-  // AUTOMATION APIs
-  #if SIMGRID_HAVE_MC
-  void automaton_load(const char *file) const;
-  #endif
+// AUTOMATION APIs
+#if SIMGRID_HAVE_MC
+  void automaton_load(const char* file) const;
+#endif
   std::vector<int> automaton_propositional_symbol_evaluate() const;
   std::vector<xbt_automaton_state_t> get_automaton_state() const;
   int compare_automaton_exp_label(const xbt_automaton_exp_label* l) const;
   void set_property_automaton(xbt_automaton_state_t const& automaton_state) const;
-  inline DerefAndCompareByActorsCountAndUsedHeap compare_pair() const {
+  inline DerefAndCompareByActorsCountAndUsedHeap compare_pair() const
+  {
     return DerefAndCompareByActorsCountAndUsedHeap();
   }
-  inline int automaton_state_compare(const_xbt_automaton_state_t const& s1, const_xbt_automaton_state_t const& s2) const {
+  inline int automaton_state_compare(const_xbt_automaton_state_t const& s1, const_xbt_automaton_state_t const& s2) const
+  {
     return xbt_automaton_state_compare(s1, s2);
   }
   xbt_automaton_exp_label_t get_automaton_transition_label(xbt_dynar_t const& dynar, int index) const;
   xbt_automaton_state_t get_automaton_transition_dst(xbt_dynar_t const& dynar, int index) const;
 
   // DYNAR APIs
-  inline unsigned long get_dynar_length(const_xbt_dynar_t const& dynar) const {
-    return xbt_dynar_length(dynar);
-  }
+  inline unsigned long get_dynar_length(const_xbt_dynar_t const& dynar) const { return xbt_dynar_length(dynar); }
 };
 
 } // namespace mc