X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..b8df87e176f27b25534f27d7e240defa32ca35bc:/src/kernel/activity/CommImpl.cpp?ds=sidebyside

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 7f19e426da..8b387602e6 100644
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -1,11 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
 
 #include "src/kernel/activity/CommImpl.hpp"
-
+#include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/modelchecker.h"
+#include "src/kernel/activity/MailboxImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/smx_network_private.hpp"
 #include "src/surf/surf_interface.hpp"
@@ -14,7 +15,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_network);
 
 simgrid::kernel::activity::CommImpl::CommImpl(e_smx_comm_type_t _type) : type(_type)
 {
-  state    = SIMIX_WAITING;
+  state_   = SIMIX_WAITING;
   src_data = nullptr;
   dst_data = nullptr;
   XBT_DEBUG("Create comm activity %p", this);
@@ -26,7 +27,7 @@ simgrid::kernel::activity::CommImpl::~CommImpl()
 
   cleanupSurf();
 
-  if (detached && state != SIMIX_DONE) {
+  if (detached && state_ != SIMIX_DONE) {
     /* the communication has failed and was detached:
      * we have to free the buffer */
     if (clean_fun)
@@ -41,16 +42,16 @@ simgrid::kernel::activity::CommImpl::~CommImpl()
 void simgrid::kernel::activity::CommImpl::suspend()
 {
   /* FIXME: shall we suspend also the timeout synchro? */
-  if (surf_comm)
-    surf_comm->suspend();
+  if (surfAction_)
+    surfAction_->suspend();
   /* in the other case, the action will be suspended on creation, in SIMIX_comm_start() */
 }
 
 void simgrid::kernel::activity::CommImpl::resume()
 {
   /*FIXME: check what happen with the timeouts */
-  if (surf_comm)
-    surf_comm->resume();
+  if (surfAction_)
+    surfAction_->resume();
   /* in the other case, the synchro were not really suspended yet, see SIMIX_comm_suspend() and SIMIX_comm_start() */
 }
 
@@ -58,32 +59,28 @@ void simgrid::kernel::activity::CommImpl::cancel()
 {
   /* if the synchro is a waiting state means that it is still in a mbox */
   /* so remove from it and delete it */
-  if (state == SIMIX_WAITING) {
+  if (state_ == SIMIX_WAITING) {
     mbox->remove(this);
-    state = SIMIX_CANCELED;
+    state_ = SIMIX_CANCELED;
   } else if (not MC_is_active() /* when running the MC there are no surf actions */
-             && not MC_record_replay_is_active() && (state == SIMIX_READY || state == SIMIX_RUNNING)) {
+             && not MC_record_replay_is_active() && (state_ == SIMIX_READY || state_ == SIMIX_RUNNING)) {
 
-    surf_comm->cancel();
+    surfAction_->cancel();
   }
 }
 
 /**  @brief get the amount remaining from the communication */
 double simgrid::kernel::activity::CommImpl::remains()
 {
-  if (state == SIMIX_RUNNING)
-    return surf_comm->getRemains();
-
-  /* FIXME: check what should be returned in the other cases */
-  return 0;
+  return surfAction_->get_remains();
 }
 
 /** @brief This is part of the cleanup process, probably an internal command */
 void simgrid::kernel::activity::CommImpl::cleanupSurf()
 {
-  if (surf_comm) {
-    surf_comm->unref();
-    surf_comm = nullptr;
+  if (surfAction_) {
+    surfAction_->unref();
+    surfAction_ = nullptr;
   }
 
   if (src_timeout) {
@@ -100,27 +97,27 @@ void simgrid::kernel::activity::CommImpl::cleanupSurf()
 void simgrid::kernel::activity::CommImpl::post()
 {
   /* Update synchro state */
-  if (src_timeout && src_timeout->getState() == simgrid::surf::Action::State::done)
-    state = SIMIX_SRC_TIMEOUT;
-  else if (dst_timeout && dst_timeout->getState() == simgrid::surf::Action::State::done)
-    state = SIMIX_DST_TIMEOUT;
-  else if (src_timeout && src_timeout->getState() == simgrid::surf::Action::State::failed)
-    state = SIMIX_SRC_HOST_FAILURE;
-  else if (dst_timeout && dst_timeout->getState() == simgrid::surf::Action::State::failed)
-    state = SIMIX_DST_HOST_FAILURE;
-  else if (surf_comm && surf_comm->getState() == simgrid::surf::Action::State::failed) {
-    state = SIMIX_LINK_FAILURE;
+  if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::FINISHED)
+    state_ = SIMIX_SRC_TIMEOUT;
+  else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::FINISHED)
+    state_ = SIMIX_DST_TIMEOUT;
+  else if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::FAILED)
+    state_ = SIMIX_SRC_HOST_FAILURE;
+  else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::FAILED)
+    state_ = SIMIX_DST_HOST_FAILURE;
+  else if (surfAction_ && surfAction_->get_state() == simgrid::kernel::resource::Action::State::FAILED) {
+    state_ = SIMIX_LINK_FAILURE;
   } else
-    state = SIMIX_DONE;
+    state_ = SIMIX_DONE;
 
-  XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state, src_proc,
+  XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_, src_proc,
             dst_proc, detached);
 
   /* destroy the surf actions associated with the Simix communication */
   cleanupSurf();
 
   /* if there are simcalls associated with the synchro, then answer them */
-  if (not simcalls.empty()) {
+  if (not simcalls_.empty()) {
     SIMIX_comm_finish(this);
   }
 }