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
properly split init/start for Exec activities
[simgrid.git]
/
src
/
simix
/
ActorImpl.cpp
diff --git
a/src/simix/ActorImpl.cpp
b/src/simix/ActorImpl.cpp
index
9b0f19b
..
6560ccd
100644
(file)
--- a/
src/simix/ActorImpl.cpp
+++ b/
src/simix/ActorImpl.cpp
@@
-56,12
+56,6
@@
void SIMIX_process_cleanup(smx_actor_t process)
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
process->waiting_synchro.get());
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
process->waiting_synchro.get());
- /* Unregister from the kill timer if any */
- if (process->kill_timer != nullptr) {
- SIMIX_timer_remove(process->kill_timer);
- process->kill_timer = nullptr;
- }
-
simix_global->mutex.lock();
simix_global->process_list.erase(process->pid_);
simix_global->mutex.lock();
simix_global->process_list.erase(process->pid_);
@@
-201,8
+195,8
@@
smx_activity_t ActorImpl::sleep(double duration)
simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
synchro->host = host_;
simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
synchro->host = host_;
- synchro->surf_
sleep
= host_->pimpl_cpu->sleep(duration);
- synchro->surf_
sleep
->set_data(synchro);
+ synchro->surf_
action_
= host_->pimpl_cpu->sleep(duration);
+ synchro->surf_
action_
->set_data(synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
@@
-468,8
+462,8
@@
void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
if (i != actor->waiting_synchro->simcalls_.end())
actor->waiting_synchro->simcalls_.remove(&actor->simcall);
} else if (sleep != nullptr) {
if (i != actor->waiting_synchro->simcalls_.end())
actor->waiting_synchro->simcalls_.remove(&actor->simcall);
} else if (sleep != nullptr) {
- if (sleep->surf_
sleep
)
- sleep->surf_
sleep
->cancel();
+ if (sleep->surf_
action_
)
+ sleep->surf_
action_
->cancel();
sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(actor, &actor->simcall);
sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(actor, &actor->simcall);
@@
-632,8
+626,8
@@
smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl
SIMIX_process_on_exit(process,
[](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
SIMIX_process_on_exit(process,
[](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
- if (sleep->surf_
sleep
)
- sleep->surf_
sleep
->finish(simgrid::kernel::resource::Action::State::FINISHED);
+ if (sleep->surf_
action_
)
+ sleep->surf_
action_
->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
},
res.get());
intrusive_ptr_release(sleep);
},
res.get());
@@
-659,9
+653,9
@@
void SIMIX_process_sleep_destroy(smx_activity_t synchro)
simgrid::kernel::activity::SleepImplPtr sleep =
boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
simgrid::kernel::activity::SleepImplPtr sleep =
boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
- if (sleep->surf_
sleep
) {
- sleep->surf_
sleep
->unref();
- sleep->surf_
sleep
= nullptr;
+ if (sleep->surf_
action_
) {
+ sleep->surf_
action_
->unref();
+ sleep->surf_
action_
= nullptr;
}
}
}
}