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
add capacity to set priorities on I/Os + example
[simgrid.git]
/
src
/
kernel
/
activity
/
SynchroRaw.cpp
diff --git
a/src/kernel/activity/SynchroRaw.cpp
b/src/kernel/activity/SynchroRaw.cpp
index
5b8950c
..
c01df2b
100644
(file)
--- a/
src/kernel/activity/SynchroRaw.cpp
+++ b/
src/kernel/activity/SynchroRaw.cpp
@@
-3,16
+3,14
@@
/* 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. */
/* 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 <simgrid/Exception.hpp>
+#include <simgrid/s4u/Host.hpp>
+
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/resource/Action.hpp"
-#include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/kernel/activity/SemaphoreImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/kernel/context/Context.hpp"
+#include "src/simix/popping_private.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include <simgrid/s4u/Host.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
@@
-33,19
+31,19
@@
RawImpl& RawImpl::set_timeout(double timeout)
RawImpl* RawImpl::start()
{
RawImpl* RawImpl::start()
{
- surf_action_ = host_->
pimpl_cpu
->sleep(timeout_);
+ surf_action_ = host_->
get_cpu()
->sleep(timeout_);
surf_action_->set_activity(this);
return this;
}
void RawImpl::suspend()
{
surf_action_->set_activity(this);
return this;
}
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
actor
is rescheduled. */
}
void RawImpl::resume()
{
}
void RawImpl::resume()
{
- /* I cannot resume raw synchros directly. This is delayed to when the
process
is rescheduled at
+ /* I cannot resume raw synchros directly. This is delayed to when the
actor
is rescheduled at
* the end of the synchro. */
}
* the end of the synchro. */
}
@@
-69,16
+67,17
@@
void RawImpl::post()
void RawImpl::finish()
{
void RawImpl::finish()
{
+ XBT_DEBUG("RawImpl::finish() in state %s", to_c_str(state_));
+ xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
if (state_ == State::FAILED) {
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
if (state_ == State::FAILED) {
- XBT_DEBUG("RawImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname());
simcall->issuer_->context_->set_wannadie();
simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
} else {
simcall->issuer_->context_->set_wannadie();
simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
} else {
- xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %
d
",
-
static_cast<int>
(state_));
+ xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %
s
",
+
to_c_str
(state_));
}
finish_callback_();
}
finish_callback_();