A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build
[simgrid.git]
/
src
/
kernel
/
activity
/
SynchroRaw.cpp
diff --git
a/src/kernel/activity/SynchroRaw.cpp
b/src/kernel/activity/SynchroRaw.cpp
index
69830b0
..
9326bd2
100644
(file)
--- a/
src/kernel/activity/SynchroRaw.cpp
+++ b/
src/kernel/activity/SynchroRaw.cpp
@@
-1,37
+1,51
@@
-/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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"
/* 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/kernel/context/Context.hpp"
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
+namespace simgrid {
+namespace kernel {
+namespace activity {
-
simgrid::kernel::activity::
RawImpl::~RawImpl()
+RawImpl::~RawImpl()
{
{
- s
leep
->unref();
+ s
urf_action_
->unref();
}
}
-void
simgrid::kernel::activity::
RawImpl::suspend()
+void RawImpl::suspend()
{
/* The suspension of raw synchros is delayed to when the process is rescheduled. */
}
{
/* The suspension of raw synchros is delayed to when the process is rescheduled. */
}
-void
simgrid::kernel::activity::
RawImpl::resume()
+void RawImpl::resume()
{
/* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
* the end of the synchro. */
}
{
/* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
* the end of the synchro. */
}
-void
simgrid::kernel::activity::
RawImpl::post()
+void RawImpl::post()
{
XBT_IN("(%p)",this);
{
XBT_IN("(%p)",this);
- if (sleep->get_state() == simgrid::kernel::resource::Action::State::failed)
+ smx_simcall_t simcall = simcalls_.front();
+ simcalls_.pop_front();
+
+ SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
+ simcall->issuer->waiting_synchro = nullptr;
+
+ if (surf_action_->get_state() == resource::Action::State::FAILED) {
state_ = SIMIX_FAILED;
state_ = SIMIX_FAILED;
- else if (sleep->get_state() == simgrid::kernel::resource::Action::State::done)
+ simcall->issuer->context_->iwannadie = true;
+ } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
state_ = SIMIX_SRC_TIMEOUT;
state_ = SIMIX_SRC_TIMEOUT;
-
- SIMIX_synchro_finish(this);
+ SIMIX_simcall_answer(simcall);
+ }
XBT_OUT();
}
XBT_OUT();
}
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid