-/* Copyright (c) 2007-2013. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
{
smx_context_t self_context = SIMIX_context_self();
- return self_context ? SIMIX_context_get_data(self_context) : NULL;
+ return self_context ? SIMIX_context_get_process(self_context) : NULL;
}
/**
int argc, char **argv,
xbt_dict_t properties,
int auto_restart){
- return SIMIX_process_create(process, name, code, data, hostname,
- kill_time, argc, argv, properties, auto_restart);
+ SIMIX_process_create_with_parent(process, name, code, data, hostname,
+ kill_time, argc, argv, properties, auto_restart,
+ simcall->issuer);
}
/**
* \brief Internal function to create a process.
int argc, char **argv,
xbt_dict_t properties,
int auto_restart) {
-
+ SIMIX_process_create_with_parent(process, name, code, data, hostname,
+ kill_time, argc, argv, properties, auto_restart, NULL);
+}
+
+void SIMIX_process_create_with_parent(smx_process_t *process,
+ const char *name,
+ xbt_main_func_t code,
+ void *data,
+ const char *hostname,
+ double kill_time,
+ int argc, char **argv,
+ xbt_dict_t properties,
+ int auto_restart,
+ smx_process_t parent_process) {
*process = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
(*process)->comms = xbt_fifo_new();
(*process)->simcall.issuer = *process;
- if (SIMIX_process_self()) {
- (*process)->ppid = SIMIX_process_get_PID(SIMIX_process_self());
+ if (parent_process) {
+ (*process)->ppid = SIMIX_process_get_PID(parent_process);
} else {
(*process)->ppid = -1;
}
return NULL;
}
} else {
- return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
+ /* FIXME: computation size is zero. Is it okay that bound is zero ? */
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0, 0);
}
}
{
smx_simcall_t simcall;
e_smx_state_t state;
+ smx_process_t issuer;
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
while ((simcall = xbt_fifo_shift(action->simcalls))) {
simcall_process_sleep__set__result(simcall, state);
simcall->issuer->waiting_action = NULL;
SIMIX_simcall_answer(simcall);
+ issuer = simcall->issuer;
}
+
SIMIX_process_sleep_destroy(action);
+ if (issuer->suspended)
+ simcall_process_suspend(issuer);
}
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+
if (action->sleep.surf_sleep)
surf_action_unref(action->sleep.surf_sleep);
xbt_mallocator_release(simix_global->action_mallocator, action);
void SIMIX_process_sleep_suspend(smx_action_t action)
{
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
surf_action_suspend(action->sleep.surf_sleep);
}
void SIMIX_process_sleep_resume(smx_action_t action)
{
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
surf_action_resume(action->sleep.surf_sleep);
}