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
rename log category from simix_process to ker_actor
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.cpp
diff --git
a/src/kernel/activity/ExecImpl.cpp
b/src/kernel/activity/ExecImpl.cpp
index 3b55aff1ca2504024b15e66e6ff15b29ed241d65..08c6717b2086cf7ad5422046413b946d71aef63a 100644
(file)
--- a/
src/kernel/activity/ExecImpl.cpp
+++ b/
src/kernel/activity/ExecImpl.cpp
@@
-3,21
+3,19
@@
/* 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/kernel/routing/NetPoint.hpp>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Engine.hpp>
+
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/modelchecker.h"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Exec.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-
-#include "simgrid/s4u/Host.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
simix_process
);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(
ker_actor
);
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-117,6
+115,13
@@
ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
return *this;
}
return *this;
}
+ExecImpl& ExecImpl::update_sharing_penalty(double sharing_penalty)
+{
+ sharing_penalty_ = sharing_penalty;
+ surf_action_->set_sharing_penalty(sharing_penalty);
+ return *this;
+}
+
void ExecImpl::post()
{
xbt_assert(surf_action_ != nullptr);
void ExecImpl::post()
{
xbt_assert(surf_action_ != nullptr);
@@
-146,6
+151,8
@@
void ExecImpl::post()
actor_->activities_.remove(this);
actor_ = nullptr;
}
actor_->activities_.remove(this);
actor_ = nullptr;
}
+ if (state_ != State::FAILED && cb_id_ >= 0)
+ s4u::Host::on_state_change.disconnect(cb_id_);
/* Answer all simcalls associated with the synchro */
finish();
}
/* Answer all simcalls associated with the synchro */
finish();
}
@@
-157,23
+164,22
@@
void ExecImpl::finish()
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
+ if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
+ continue; // if process handling comm is killed
+
/* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
* simcall */
/* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
* simcall */
+ if (auto* observer = dynamic_cast<actor::ExecutionWaitanySimcall*>(simcall->observer_)) {
- if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
- continue; // if process handling comm is killed
- if (auto* observer =
- dynamic_cast<kernel::actor::ExecutionWaitanySimcall*>(simcall->observer_)) { // simcall is a wait_any?
const auto& execs = observer->get_execs();
const auto& execs = observer->get_execs();
- for (auto* exec : execs)
{
+ for (auto* exec : execs)
exec->unregister_simcall(simcall);
exec->unregister_simcall(simcall);
- if (simcall->timeout_cb_) {
- simcall->timeout_cb_->remove();
- simcall->timeout_cb_ = nullptr;
- }
+ if (simcall->timeout_cb_) {
+ simcall->timeout_cb_->remove();
+ simcall->timeout_cb_ = nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
@@
-182,6
+188,7
@@
void ExecImpl::finish()
observer->set_result(rank);
}
}
observer->set_result(rank);
}
}
+
switch (state_) {
case State::FAILED:
piface_->complete(s4u::Activity::State::FAILED);
switch (state_) {
case State::FAILED:
piface_->complete(s4u::Activity::State::FAILED);