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
Kill function declarations without definitions.
[simgrid.git]
/
src
/
simix
/
smx_host.cpp
diff --git
a/src/simix/smx_host.cpp
b/src/simix/smx_host.cpp
index
393256f
..
1dea2c9
100644
(file)
--- a/
src/simix/smx_host.cpp
+++ b/
src/simix/smx_host.cpp
@@
-22,19
+22,15
@@
namespace simgrid {
{
if (not Host::EXTENSION_ID.valid())
Host::EXTENSION_ID = s4u::Host::extension_create<simix::Host>();
-
- simgrid::simix::ActorImpl act;
- process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
}
Host::~Host()
{
/* All processes should be gone when the host is turned off (by the end of the simulation). */
- if (
xbt_swag_size(process_list) != 0
) {
+ if (
not process_list.empty()
) {
std::string msg = std::string("Shutting down host, but it's not empty:");
- smx_actor_t process = nullptr;
-
- xbt_swag_foreach(process, process_list) msg = msg + "\n\t" + process->name.c_str();
+ for (auto const& process : process_list)
+ msg += "\n\t" + std::string(process.getName());
SIMIX_display_process_status();
THROWF(arg_error, 0, "%s", msg.c_str());
@@
-45,7
+41,6
@@
namespace simgrid {
for (auto const& arg : boot_processes)
delete arg;
boot_processes.clear();
- xbt_swag_free(process_list);
}
/** Re-starts all the actors that are marked as restartable.
@@
-78,12
+73,11
@@
void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
h->pimpl_cpu->turnOff();
/* Clean Simulator data */
- if (xbt_swag_size(host->process_list) != 0) {
- smx_actor_t process = nullptr;
- xbt_swag_foreach(process, host->process_list) {
- SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process->getCname(),
- process->host->getCname(), issuer->getCname());
+ if (not host->process_list.empty()) {
+ for (auto& process : host->process_list) {
+ SIMIX_process_kill(&process, issuer);
+ XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.getCname(),
+ process.host->getCname(), issuer->getCname());
}
}
} else {
@@
-118,21
+112,18
@@
void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::
double kill_time, std::map<std::string, std::string>* properties,
int auto_restart)
{
- smx_process_arg_t arg = new simgrid::simix::ProcessArg();
- arg->name = name;
- arg->code = std::move(code);
- arg->data = data;
- arg->host = host;
- arg->kill_time = kill_time;
+ simgrid::simix::ProcessArg* arg =
+ new simgrid::simix::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart);
arg->properties.reset(properties, [](decltype(properties)) {});
- arg->auto_restart = auto_restart;
if (host->isOff() && watched_hosts.find(host->getCname()) == watched_hosts.end()) {
watched_hosts.insert(host->getCname());
XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->getCname());
}
+ XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->getCname());
host->extension<simgrid::simix::Host>()->auto_restart_processes.push_back(arg);
}
+
/** @brief Restart the list of processes that have been registered to the host */
void SIMIX_host_autorestart(sg_host_t host)
{
@@
-151,34
+142,26
@@
void SIMIX_host_autorestart(sg_host_t host)
process_list.clear();
}
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> simcall_HANDLER_execution_start(smx_simcall_t simcall,
- const char* name,
- double flops_amount,
- double priority, double bound)
-{
- return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound);
-}
-
boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-SIMIX_execution_start(
smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound
)
+SIMIX_execution_start(
const char* name, double flops_amount, double priority, double bound, sg_host_t host
)
{
-
/* alloc structures and initialize */
simgrid::kernel::activity::ExecImplPtr exec =
- simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name,
issuer->
host));
+ simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, host));
/* set surf's action */
if (not MC_is_active() && not MC_record_replay_is_active()) {
- exec->surf
_exec = issuer->
host->pimpl_cpu->execution_start(flops_amount);
- exec->surf
_exec
->setData(exec.get());
- exec->surf
_exec
->setSharingWeight(priority);
+ exec->surf
Action_ =
host->pimpl_cpu->execution_start(flops_amount);
+ exec->surf
Action_
->setData(exec.get());
+ exec->surf
Action_
->setSharingWeight(priority);
if (bound > 0)
- static_cast<simgrid::surf::CpuAction*>(exec->surf
_exec
)->setBound(bound);
+ static_cast<simgrid::surf::CpuAction*>(exec->surf
Action_
)->setBound(bound);
}
XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str());
+ simgrid::kernel::activity::ExecImpl::onCreation(exec);
return exec;
}
@@
-204,8
+187,8
@@
SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li
/* set surf's synchro */
sg_host_t* host_list_cpy = new sg_host_t[host_nb];
std::copy_n(host_list, host_nb, host_list_cpy);
- exec->surf
_exec
= surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
- exec->surf
_exec
->setData(exec.get());
+ exec->surf
Action_
= surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+ exec->surf
Action_
->setData(exec.get());
if (timeout > 0) {
exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
exec->timeoutDetector->setData(exec.get());
@@
-218,8
+201,6
@@
SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
{
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state);
/* Associate this simcall to the synchro */
@@
-229,18
+210,37
@@
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchr
/* set surf's synchro */
if (MC_is_active() || MC_record_replay_is_active()) {
synchro->state = SIMIX_DONE;
- SIMIX_execution_finish(
exec
);
+ SIMIX_execution_finish(
synchro
);
return;
}
/* If the synchro is already finished then perform the error handling */
if (synchro->state != SIMIX_RUNNING)
- SIMIX_execution_finish(exec);
+ SIMIX_execution_finish(synchro);
+}
+
+void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro)
+{
+ simcall_execution_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING));
+ if (simcall_execution_test__get__result(simcall)) {
+ synchro->simcalls.push_back(simcall);
+ SIMIX_execution_finish(synchro);
+ } else {
+ SIMIX_simcall_answer(simcall);
+ }
+ /* If the synchro is already finished then perform the error handling */
+ if (synchro->state != SIMIX_RUNNING)
+ SIMIX_execution_finish(synchro);
}
-void SIMIX_execution_finish(s
imgrid::kernel::activity::ExecImplPtr exec
)
+void SIMIX_execution_finish(s
mx_activity_t synchro
)
{
- for (smx_simcall_t const& simcall : exec->simcalls) {
+ simgrid::kernel::activity::ExecImplPtr exec =
+ boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
+
+ while (not synchro->simcalls.empty()) {
+ smx_simcall_t simcall = synchro->simcalls.front();
+ synchro->simcalls.pop_front();
switch (exec->state) {
case SIMIX_DONE:
@@
-286,13
+286,13
@@
void SIMIX_set_category(smx_activity_t synchro, const char *category)
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
if (exec != nullptr) {
- exec->surf
_exec
->setCategory(category);
+ exec->surf
Action_
->setCategory(category);
return;
}
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
if (comm != nullptr) {
- comm->surf
_comm
->setCategory(category);
+ comm->surf
Action_
->setCategory(category);
}
}