cosmetics

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 1055693..abb50b9 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -233,26 +233,26 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
     return false;
 
   // Those are internal requests, we do not need indirection because those objects are copies:
-  const kernel::activity::CommImpl* activity1 = get_comm(r1);
-  const kernel::activity::CommImpl* activity2 = get_comm(r2);
+  const kernel::activity::CommImpl* acti1 = get_comm(r1);
+  const kernel::activity::CommImpl* acti2 = 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);
-    RemotePtr<kernel::activity::MailboxImpl> activity2_mbox_cpy = remote(activity2->mbox_cpy);
+    auto mbox1 = get_mbox_remote_addr(r1);
+    auto mbox2 = remote(acti2->mbox_cpy);
 
-    if (mbox != activity2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0)
+    if (mbox1 != mbox2 && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
-    if ((r1->issuer_ != activity2->src_actor_.get()) && (r1->issuer_ != activity2->dst_actor_.get()) &&
+    if ((r1->issuer_ != acti2->src_actor_.get()) && (r1->issuer_ != acti2->dst_actor_.get()) &&
         simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
-    if ((r1->call_ == Simcall::COMM_ISEND) && (activity2->type_ == kernel::activity::CommImpl::Type::SEND) &&
-        (activity2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
+    if ((r1->call_ == Simcall::COMM_ISEND) && (acti2->type_ == kernel::activity::CommImpl::Type::SEND) &&
+        (acti2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
-    if ((r1->call_ == Simcall::COMM_IRECV) && (activity2->type_ == kernel::activity::CommImpl::Type::RECEIVE) &&
-        (activity2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
+    if ((r1->call_ == Simcall::COMM_IRECV) && (acti2->type_ == kernel::activity::CommImpl::Type::RECEIVE) &&
+        (acti2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
   }
 
@@ -265,21 +265,21 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
 #endif
 
   if (r1->call_ == Simcall::COMM_WAIT && (r2->call_ == Simcall::COMM_WAIT || r2->call_ == Simcall::COMM_TEST) &&
-      (activity1->src_actor_.get() == nullptr || activity1->dst_actor_.get() == nullptr))
+      (acti1->src_actor_.get() == nullptr || acti1->dst_actor_.get() == nullptr))
     return false;
 
-  if (r1->call_ == Simcall::COMM_TEST && (simcall_comm_test__get__comm(r1) == nullptr ||
-                                          activity1->src_buff_ == nullptr || activity1->dst_buff_ == nullptr))
+  if (r1->call_ == Simcall::COMM_TEST &&
+      (simcall_comm_test__get__comm(r1) == nullptr || acti1->src_buff_ == nullptr || acti1->dst_buff_ == nullptr))
     return false;
 
-  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT &&
-      activity1->src_buff_ == activity2->src_buff_ && activity1->dst_buff_ == activity2->dst_buff_)
+  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT && acti1->src_buff_ == acti2->src_buff_ &&
+      acti1->dst_buff_ == acti2->dst_buff_)
     return false;
 
-  if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && activity1->src_buff_ != nullptr &&
-      activity1->dst_buff_ != nullptr && activity2->src_buff_ != nullptr && activity2->dst_buff_ != nullptr &&
-      activity1->dst_buff_ != activity2->src_buff_ && activity1->dst_buff_ != activity2->dst_buff_ &&
-      activity2->dst_buff_ != activity1->src_buff_)
+  if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && acti1->src_buff_ != nullptr &&
+      acti1->dst_buff_ != nullptr && acti2->src_buff_ != nullptr && acti2->dst_buff_ != nullptr &&
+      acti1->dst_buff_ != acti2->src_buff_ && acti1->dst_buff_ != acti2->dst_buff_ &&
+      acti2->dst_buff_ != acti1->src_buff_)
     return false;
 
   return true;