#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
- simgrid::s4u::on_platform_created.connect(surf_presolve);
+ simgrid::s4u::Engine::on_platform_created.connect(surf_presolve);
simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage const& storage) {
sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_name());
for (auto const& model : all_existing_models) {
simgrid::kernel::resource::Action* action;
- XBT_DEBUG("Handling the processes whose action failed (if any)");
+ XBT_DEBUG("Handling the failed actions (if any)");
while ((action = model->extract_failed_action())) {
XBT_DEBUG(" Handling Action %p",action);
if (action->get_activity() != nullptr)
simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post();
}
- XBT_DEBUG("Handling the processes whose action terminated normally (if any)");
+ XBT_DEBUG("Handling the terminated actions (if any)");
while ((action = model->extract_done_action())) {
XBT_DEBUG(" Handling Action %p",action);
if (action->get_activity() == nullptr)
}
}
-/** Handle any pending timer */
+/** Handle any pending timer. Returns if something was actually run. */
static bool SIMIX_execute_timers()
{
bool result = false;
* - If a process is added because it's getting killed, its subsequent actions shouldn't matter
* - If a process gets added to actors_to_run because one of their blocking action constituting the meat
* of a simcall terminates, we're still good. Proof:
- * - You are added from SIMIX_simcall_answer() only. When this function is called depends on the resource
+ * - You are added from ActorImpl::simcall_answer() only. When this function is called depends on the resource
* kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an
* example.
* - For communications, this function is called from SIMIX_comm_finish().
*/
for (smx_actor_t const& process : simix_global->actors_that_ran) {
- if (process->simcall.call != SIMCALL_NONE) {
- SIMIX_simcall_handle(&process->simcall, 0);
+ if (process->simcall.call_ != SIMCALL_NONE) {
+ process->simcall_handle(0);
}
}
XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
}
SIMIX_display_process_status();
- simgrid::s4u::on_deadlock();
+ simgrid::s4u::Engine::on_deadlock();
xbt_abort();
}
- simgrid::s4u::on_simulation_end();
+ simgrid::s4u::Engine::on_simulation_end();
}
double SIMIX_timer_next()
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
for (auto const& kv : simix_global->process_list) {
- smx_actor_t process = kv.second;
+ smx_actor_t actor = kv.second;
- if (process->waiting_synchro) {
+ if (actor->waiting_synchro) {
const char* synchro_description = "unknown";
// we don't care about the Activity type to get its name, use RawImpl
const char* name =
boost::static_pointer_cast<simgrid::kernel::activity::ActivityImpl_T<simgrid::kernel::activity::RawImpl>>(
- process->waiting_synchro)
+ actor->waiting_synchro)
->get_cname();
- if (boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro) != nullptr)
synchro_description = "execution";
- if (boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro) != nullptr)
synchro_description = "communication";
- if (boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(process->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro) != nullptr)
synchro_description = "sleeping";
- if (boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(process->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro) != nullptr)
synchro_description = "synchronization";
- if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro) != nullptr)
synchro_description = "I/O";
- XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->get_pid(),
- process->get_cname(), process->get_host()->get_cname(), synchro_description,
- process->waiting_synchro.get(), name, (int)process->waiting_synchro->state_);
+ XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(),
+ actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(),
+ name, (int)actor->waiting_synchro->state_);
}
else {
- XBT_INFO("Process %ld (%s@%s)", process->get_pid(), process->get_cname(), process->get_host()->get_cname());
+ XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
}
}
}