-/* Copyright (c) 2007-2012. 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;
}
/**
xbt_dynar_free(&process->on_exit);
- free(process->name);
- free(process);
+ xbt_free(process->name);
+ xbt_free(process);
}
}
/* Create maestro process and intilialize it */
maestro = xbt_new0(s_smx_process_t, 1);
maestro->pid = simix_process_maxpid++;
+ maestro->ppid = -1;
maestro->name = (char *) "";
maestro->running_ctx = xbt_new(xbt_running_ctx_t, 1);
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro);
maestro->simcall.issuer = maestro;
-
- if (SIMIX_process_self()) {
- maestro->ppid = SIMIX_process_get_PID(SIMIX_process_self());
- } else {
- maestro->ppid = -1;
- }
-
simix_global->maestro_process = maestro;
return;
}
smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
smx_process_t process;
- simix_global->create_process_function(
- &process,
- args->name,
- args->code,
- args->data,
- args->hostname,
- args->kill_time,
- args->argc,
- args->argv,
- args->properties,
- args->auto_restart);
+ simix_global->create_process_function(&process,
+ args->name,
+ args->code,
+ args->data,
+ args->hostname,
+ args->kill_time,
+ args->argc,
+ args->argv,
+ args->properties,
+ args->auto_restart,
+ NULL);
xbt_free(args);
return process;
}
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(process, name, code, data, hostname,
+ kill_time, argc, argv, properties, auto_restart,
+ simcall->issuer);
}
/**
* \brief Internal function to create a process.
double kill_time,
int argc, char **argv,
xbt_dict_t properties,
- int auto_restart) {
-
+ int auto_restart,
+ smx_process_t parent_process)
+{
*process = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
if (!SIMIX_host_get_state(host)) {
+ int i;
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
hostname);
+ for (i = 0; i < argc; i++)
+ xbt_free(argv[i]);
+ xbt_free(argv);
}
else {
*process = xbt_new0(s_smx_process_t, 1);
(*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;
}
(*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
+ if(MC_is_active()){
+ MC_ignore_heap((*process)->running_ctx, sizeof(*(*process)->running_ctx));
+ }
+
/* Add properties */
(*process)->properties = properties;
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_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
action->sleep.host = host;
action->sleep.surf_sleep =
- surf_workstation_model->extension.workstation.sleep(host, duration);
+ surf_workstation_sleep(host, duration);
- surf_workstation_model->action_data_set(action->sleep.surf_sleep, action);
+ surf_action_set_data(action->sleep.surf_sleep, action);
XBT_DEBUG("Create sleep action %p", action);
return action;
{
smx_simcall_t simcall;
e_smx_state_t state;
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
while ((simcall = xbt_fifo_shift(action->simcalls))) {
- switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){
+ switch(surf_action_get_state(action->sleep.surf_sleep)){
case SURF_ACTION_FAILED:
simcall->issuer->context->iwannadie = 1;
//SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
THROW_IMPOSSIBLE;
break;
}
- if (surf_workstation_model->extension.
- workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall_process_sleep__set__result(simcall, state);
simcall->issuer->waiting_action = NULL;
- SIMIX_simcall_answer(simcall);
-
+ if (simcall->issuer->suspended) {
+ XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
+ simcall->issuer->suspended = 0;
+ SIMIX_pre_process_suspend(simcall, simcall->issuer);
+ } else {
+ SIMIX_simcall_answer(simcall);
+ }
}
+
SIMIX_process_sleep_destroy(action);
}
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)
- action->sleep.surf_sleep->model_type->action_unref(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)
{
- surf_workstation_model->suspend(action->sleep.surf_sleep);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+ surf_action_suspend(action->sleep.surf_sleep);
}
void SIMIX_process_sleep_resume(smx_action_t action)
{
- surf_workstation_model->resume(action->sleep.surf_sleep);
+ XBT_DEBUG("Action state is %d on process_sleep_resume.", action->state);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+ surf_action_resume(action->sleep.surf_sleep);
}
/**
SIMIX_process_stop(self);
}
- if(self->suspended) {
+ if (self->suspended) {
+ XBT_DEBUG("Hey! I'm suspended.");
xbt_assert(!self->doexception, "Gloups! This exception may be lost by subsequent calls.");
self->suspended = 0;
- SIMIX_process_suspend(self,self);
+ SIMIX_process_suspend(self, self);
}
if (self->doexception) {
arg.argc,
arg.argv,
arg.properties,
- arg.auto_restart);
- }
- else {
+ arg.auto_restart,
+ NULL);
+ } else {
simcall_process_create(&new_process,
- arg.argv[0],
- arg.code,
- arg.data,
- arg.hostname,
- arg.kill_time,
- arg.argc,
- arg.argv,
- arg.properties,
- arg.auto_restart);
+ arg.argv[0],
+ arg.code,
+ arg.data,
+ arg.hostname,
+ arg.kill_time,
+ arg.argc,
+ arg.argv,
+ arg.properties,
+ arg.auto_restart);
}
return new_process;
