X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f7ddbf61f574a934f191ef2d8358d9f8be1f96..c1b3e440de2150420b08c0bc55a125a0c9eb86bc:/src/kernel/activity/SynchroRaw.cpp diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp index 509c41d5cd..3287a0070e 100644 --- a/src/kernel/activity/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.cpp @@ -1,17 +1,18 @@ -/* Copyright (c) 2007-2016. 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/SynchroRaw.hpp" +#include "simgrid/kernel/resource/Action.hpp" +#include "src/simix/smx_synchro_private.hpp" #include "src/surf/surf_interface.hpp" -#include "src/simix/smx_synchro_private.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro); simgrid::kernel::activity::RawImpl::~RawImpl() { - sleep->unref(); + surf_action_->unref(); } void simgrid::kernel::activity::RawImpl::suspend() { @@ -26,10 +27,10 @@ void simgrid::kernel::activity::RawImpl::resume() void simgrid::kernel::activity::RawImpl::post() { XBT_IN("(%p)",this); - if (sleep->getState() == simgrid::surf::Action::State::failed) - state = SIMIX_FAILED; - else if(sleep->getState() == simgrid::surf::Action::State::done) - state = SIMIX_SRC_TIMEOUT; + if (surf_action_->get_state() == simgrid::kernel::resource::Action::State::FAILED) + state_ = SIMIX_FAILED; + else if (surf_action_->get_state() == simgrid::kernel::resource::Action::State::FINISHED) + state_ = SIMIX_SRC_TIMEOUT; SIMIX_synchro_finish(this); XBT_OUT();