-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_client.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
"Logging specific to SIMIX (process)");
return xbt_fifo_size(process->comms) > 0;
}
-void SIMIX_pre_process_cleanup(smx_simcall_t simcall, smx_process_t process) {
- SIMIX_process_cleanup(process);
-}
/**
* \brief Moves a process to the list of processes to destroy.
*/
void SIMIX_process_cleanup(smx_process_t process)
{
- XBT_DEBUG("Cleanup process %s (%p), waiting action %p",
- process->name, process, process->waiting_action);
+ XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p",
+ process->name, process, process->waiting_synchro);
SIMIX_process_on_exit_runall(process);
+ /* Unregister from the kill timer if any */
+ if (process->kill_timer != NULL)
+ SIMIX_timer_remove(process->kill_timer);
+
+ xbt_os_mutex_acquire(simix_global->mutex);
+
/* cancel non-blocking communications */
- smx_action_t action;
- while ((action = xbt_fifo_pop(process->comms))) {
+ smx_synchro_t synchro;
+ while ((synchro = xbt_fifo_pop(process->comms))) {
/* make sure no one will finish the comm after this process is destroyed,
* because src_proc or dst_proc would be an invalid pointer */
- SIMIX_comm_cancel(action);
+ SIMIX_comm_cancel(synchro);
- if (action->comm.src_proc == process) {
+ if (synchro->comm.src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
- action, action->comm.detached, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
- action->comm.src_proc = NULL;
+ synchro, synchro->comm.detached, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
+ synchro->comm.src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
- if (!action->comm.detached)
- SIMIX_comm_destroy(action);
+ if (!synchro->comm.detached)
+ SIMIX_comm_destroy(synchro);
else
XBT_DEBUG("Don't destroy it since it's a detached comm");
}
- else if (action->comm.dst_proc == process){
+ else if (synchro->comm.dst_proc == process){
XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
- action, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
- action->comm.dst_proc = NULL;
+ synchro, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
+ synchro->comm.dst_proc = NULL;
- if (action->comm.detached && action->comm.refcount == 1
- && action->comm.src_proc != NULL) {
+ if (synchro->comm.detached && synchro->comm.refcount == 1
+ && synchro->comm.src_proc != NULL) {
/* the comm will be freed right now, remove it from the sender */
- xbt_fifo_remove(action->comm.src_proc->comms, action);
+ xbt_fifo_remove(synchro->comm.src_proc->comms, synchro);
}
- SIMIX_comm_destroy(action);
+ SIMIX_comm_destroy(synchro);
}
else {
- xbt_die("Communication action %p is in my list but I'm not the sender "
- "or the receiver", action);
+ xbt_die("Communication synchro %p is in my list but I'm not the sender "
+ "or the receiver", synchro);
}
}
+ XBT_DEBUG("%p should not be run anymore",process);
xbt_swag_remove(process, simix_global->process_list);
- xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list);
+ xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
process->context->iwannadie = 0;
+
+ xbt_os_mutex_release(simix_global->mutex);
}
/**
smx_process_t process = NULL;
while ((process = xbt_swag_extract(simix_global->process_to_destroy))) {
+ XBT_DEBUG("Getting rid of %p",process);
+
SIMIX_context_free(process->context);
/* Free the exception allocated at creation time */
/* Add the process to the list of process to restart, only if
* the host is down
*/
- if (arg->auto_restart && !SIMIX_host_get_state(arg->smx_host)) {
- SIMIX_host_add_auto_restart_process(arg->smx_host,arg->name,arg->code, arg->data,
- sg_host_name(arg->smx_host),
- arg->kill_time,
+ if (arg->auto_restart && !SIMIX_host_get_state(arg->host)) {
+ SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
+ sg_host_name(arg->host),
+ SIMIX_timer_get_date(arg->kill_timer),
arg->argc,arg->argv,arg->properties,
arg->auto_restart);
}
- XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_name(arg->smx_host));
+ XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_name(arg->host));
/* stop the context */
SIMIX_context_stop(arg->context);
}
*/
smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
- smx_process_t process;
- simix_global->create_process_function(&process,
+ smx_process_t process = simix_global->create_process_function(
args->name,
args->code,
args->data,
}
-void SIMIX_pre_process_create(smx_simcall_t simcall,
- smx_process_t *process,
+void* simcall_HANDLER_process_create(smx_simcall_t simcall,
const char *name,
xbt_main_func_t code,
void *data,
int argc, char **argv,
xbt_dict_t properties,
int auto_restart){
- SIMIX_process_create(process, name, code, data, hostname,
+ return (void*)SIMIX_process_create(name, code, data, hostname,
kill_time, argc, argv, properties, auto_restart,
simcall->issuer);
}
*
* \return the process created
*/
-void SIMIX_process_create(smx_process_t *process,
+smx_process_t SIMIX_process_create(
const char *name,
xbt_main_func_t code,
void *data,
int auto_restart,
smx_process_t parent_process)
{
- *process = NULL;
- smx_host_t host = SIMIX_host_get_by_name(hostname);
+ smx_process_t process = NULL;
+ sg_host_t host = sg_host_by_name(hostname);
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
xbt_free(argv);
}
else {
- *process = xbt_new0(s_smx_process_t, 1);
+ process = xbt_new0(s_smx_process_t, 1);
xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Process data */
- (*process)->pid = simix_process_maxpid++;
- (*process)->name = xbt_strdup(name);
- (*process)->smx_host = host;
- (*process)->data = data;
- (*process)->comms = xbt_fifo_new();
- (*process)->simcall.issuer = *process;
+ process->pid = simix_process_maxpid++;
+ process->name = xbt_strdup(name);
+ process->host = host;
+ process->data = data;
+ process->comms = xbt_fifo_new();
+ process->simcall.issuer = process;
if (parent_process) {
- (*process)->ppid = SIMIX_process_get_PID(parent_process);
+ process->ppid = SIMIX_process_get_PID(parent_process);
} else {
- (*process)->ppid = -1;
+ process->ppid = -1;
}
/* Process data for auto-restart */
- (*process)->auto_restart = auto_restart;
- (*process)->code = code;
- (*process)->argc = argc;
- (*process)->argv = argv;
- (*process)->kill_time = kill_time;
+ process->auto_restart = auto_restart;
+ process->code = code;
+ process->argc = argc;
+ process->argv = argv;
- XBT_VERB("Create context %s", (*process)->name);
- (*process)->context = SIMIX_context_new(code, argc, argv,
- simix_global->cleanup_process_function, *process);
+ XBT_VERB("Create context %s", process->name);
+ process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
- (*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
- XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
+ 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));
+ MC_ignore_heap(process->running_ctx, sizeof(*process->running_ctx));
}
/* Add properties */
- (*process)->properties = properties;
+ process->properties = properties;
/* Add the process to it's host process list */
- xbt_swag_insert(*process, SIMIX_host_priv(host)->process_list);
+ xbt_swag_insert(process, sg_host_simix(host)->process_list);
- XBT_DEBUG("Start context '%s'", (*process)->name);
+ XBT_DEBUG("Start context '%s'", process->name);
/* Now insert it in the global process list and in the process to run list */
- xbt_swag_insert(*process, simix_global->process_list);
- XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, sg_host_name(host));
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process);
+ xbt_swag_insert(process, simix_global->process_list);
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->name, sg_host_name(host));
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) {
- XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
- sg_host_name((*process)->smx_host), kill_time);
- SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
+ XBT_DEBUG("Process %s(%s) will be kill at time %f", process->name,
+ sg_host_name(process->host), kill_time);
+ process->kill_timer = SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
}
}
+ return process;
}
/**
xbt_dynar_reset(simix_global->process_to_run);
}
-void SIMIX_pre_process_kill(smx_simcall_t simcall, smx_process_t process) {
+void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process) {
SIMIX_process_kill(process, simcall->issuer);
}
/**
*/
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Killing process %s on %s", process->name, sg_host_name(process->smx_host));
+ XBT_DEBUG("Killing process %s on %s", process->name, sg_host_name(process->host));
process->context->iwannadie = 1;
process->blocked = 0;
process->suspended = 0;
process->doexception = 0;
- /* destroy the blocking action if any */
- if (process->waiting_action) {
+ /* destroy the blocking synchro if any */
+ if (process->waiting_synchro) {
- switch (process->waiting_action->type) {
+ switch (process->waiting_synchro->type) {
- case SIMIX_ACTION_EXECUTE:
- case SIMIX_ACTION_PARALLEL_EXECUTE:
- SIMIX_host_execution_destroy(process->waiting_action);
+ case SIMIX_SYNC_EXECUTE:
+ case SIMIX_SYNC_PARALLEL_EXECUTE:
+ SIMIX_process_execution_destroy(process->waiting_synchro);
break;
- case SIMIX_ACTION_COMMUNICATE:
- xbt_fifo_remove(process->comms, process->waiting_action);
- SIMIX_comm_cancel(process->waiting_action);
- SIMIX_comm_destroy(process->waiting_action);
+ case SIMIX_SYNC_COMMUNICATE:
+ xbt_fifo_remove(process->comms, process->waiting_synchro);
+ SIMIX_comm_cancel(process->waiting_synchro);
+ xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
+ SIMIX_comm_destroy(process->waiting_synchro);
break;
- case SIMIX_ACTION_SLEEP:
- SIMIX_process_sleep_destroy(process->waiting_action);
+ case SIMIX_SYNC_SLEEP:
+ SIMIX_process_sleep_destroy(process->waiting_synchro);
break;
- case SIMIX_ACTION_JOIN:
- SIMIX_process_sleep_destroy(process->waiting_action);
+ case SIMIX_SYNC_JOIN:
+ SIMIX_process_sleep_destroy(process->waiting_synchro);
break;
- case SIMIX_ACTION_SYNCHRO:
+ case SIMIX_SYNC_SYNCHRO:
SIMIX_synchro_stop_waiting(process, &process->simcall);
- SIMIX_synchro_destroy(process->waiting_action);
- break;
-
- case SIMIX_ACTION_IO:
- SIMIX_io_destroy(process->waiting_action);
+ SIMIX_synchro_destroy(process->waiting_synchro);
break;
- /* **************************************/
- /* TUTORIAL: New API */
- case SIMIX_ACTION_NEW_API:
- SIMIX_new_api_destroy(process->waiting_action);
+ case SIMIX_SYNC_IO:
+ SIMIX_io_destroy(process->waiting_synchro);
break;
- /* **************************************/
}
+
+ process->waiting_synchro = NULL;
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
+ XBT_DEBUG("Inserting %s in the to_run list", process->name);
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
if (process->suspended)
SIMIX_process_resume(process,SIMIX_process_self());
- /* cancel the blocking action if any */
- if (process->waiting_action) {
+ /* cancel the blocking synchro if any */
+ if (process->waiting_synchro) {
- switch (process->waiting_action->type) {
+ switch (process->waiting_synchro->type) {
- case SIMIX_ACTION_EXECUTE:
- case SIMIX_ACTION_PARALLEL_EXECUTE:
- SIMIX_host_execution_cancel(process->waiting_action);
+ case SIMIX_SYNC_EXECUTE:
+ case SIMIX_SYNC_PARALLEL_EXECUTE:
+ SIMIX_process_execution_cancel(process->waiting_synchro);
break;
- case SIMIX_ACTION_COMMUNICATE:
- xbt_fifo_remove(process->comms, process->waiting_action);
- SIMIX_comm_cancel(process->waiting_action);
+ case SIMIX_SYNC_COMMUNICATE:
+ xbt_fifo_remove(process->comms, process->waiting_synchro);
+ SIMIX_comm_cancel(process->waiting_synchro);
break;
- case SIMIX_ACTION_SLEEP:
- SIMIX_process_sleep_destroy(process->waiting_action);
- break;
-
- case SIMIX_ACTION_JOIN:
- SIMIX_process_sleep_destroy(process->waiting_action);
+ case SIMIX_SYNC_SLEEP:
+ case SIMIX_SYNC_JOIN:
+ SIMIX_process_sleep_destroy(process->waiting_synchro);
+ if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) {
+ XBT_DEBUG("Inserting %s in the to_run list", process->name);
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ }
break;
- case SIMIX_ACTION_SYNCHRO:
+ case SIMIX_SYNC_SYNCHRO:
SIMIX_synchro_stop_waiting(process, &process->simcall);
break;
- case SIMIX_ACTION_IO:
- SIMIX_io_destroy(process->waiting_action);
+ case SIMIX_SYNC_IO:
+ SIMIX_io_destroy(process->waiting_synchro);
break;
- /* **************************************/
- /* TUTORIAL: New API */
- case SIMIX_ACTION_NEW_API:
- SIMIX_new_api_destroy(process->waiting_action);
- break;
- /* **************************************/
-
}
}
- process->waiting_action = NULL;
+ process->waiting_synchro = NULL;
- if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self())
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
-void SIMIX_pre_process_killall(smx_simcall_t simcall, int reset_pid) {
+void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) {
SIMIX_process_killall(simcall->issuer, reset_pid);
}
/**
SIMIX_process_empty_trash();
}
-void SIMIX_pre_process_change_host(smx_simcall_t simcall, smx_process_t process,
- smx_host_t dest)
+void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t process, sg_host_t dest)
{
process->new_host = dest;
}
void SIMIX_process_change_host(smx_process_t process,
- smx_host_t dest)
+ sg_host_t dest)
{
xbt_assert((process != NULL), "Invalid parameters");
- xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list);
- process->smx_host = dest;
- xbt_swag_insert(process, SIMIX_host_priv(dest)->process_list);
+ xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+ process->host = dest;
+ xbt_swag_insert(process, sg_host_simix(dest)->process_list);
}
-void SIMIX_pre_process_suspend(smx_simcall_t simcall, smx_process_t process)
+void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
{
- smx_action_t action_suspend =
+ smx_synchro_t sync_suspend =
SIMIX_process_suspend(process, simcall->issuer);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
- xbt_fifo_push(action_suspend->simcalls, simcall);
- process->waiting_action = action_suspend;
- SIMIX_host_execution_suspend(process->waiting_action);
+ xbt_fifo_push(sync_suspend->simcalls, simcall);
+ process->waiting_synchro = sync_suspend;
+ SIMIX_host_execution_suspend(process->waiting_synchro);
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
{
xbt_assert((process != NULL), "Invalid parameters");
process->suspended = 1;
- /* If we are suspending another process, and it is waiting on an action,
- suspend its action. */
+ /* If we are suspending another process, and it is waiting on a sync,
+ suspend its synchronization. */
if (process != issuer) {
- if (process->waiting_action) {
+ if (process->waiting_synchro) {
- switch (process->waiting_action->type) {
+ switch (process->waiting_synchro->type) {
- case SIMIX_ACTION_EXECUTE:
- case SIMIX_ACTION_PARALLEL_EXECUTE:
- SIMIX_host_execution_suspend(process->waiting_action);
+ case SIMIX_SYNC_EXECUTE:
+ case SIMIX_SYNC_PARALLEL_EXECUTE:
+ SIMIX_host_execution_suspend(process->waiting_synchro);
break;
- case SIMIX_ACTION_COMMUNICATE:
- SIMIX_comm_suspend(process->waiting_action);
+ case SIMIX_SYNC_COMMUNICATE:
+ SIMIX_comm_suspend(process->waiting_synchro);
break;
- case SIMIX_ACTION_SLEEP:
- SIMIX_process_sleep_suspend(process->waiting_action);
+ case SIMIX_SYNC_SLEEP:
+ SIMIX_process_sleep_suspend(process->waiting_synchro);
break;
- case SIMIX_ACTION_SYNCHRO:
+ case SIMIX_SYNC_SYNCHRO:
/* Suspension is delayed to when the process is rescheduled. */
break;
default:
- xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
- (int)process->waiting_action->type);
+ xbt_die("Internal error in SIMIX_process_suspend: unexpected synchronization type %d",
+ (int)process->waiting_synchro->type);
}
return NULL;
} else {
}
} else {
/* 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);
+ return SIMIX_process_execute(process, "suspend", 0.0, 1.0, 0.0, 0);
}
}
-void SIMIX_pre_process_resume(smx_simcall_t simcall, smx_process_t process){
+void simcall_HANDLER_process_resume(smx_simcall_t simcall, smx_process_t process){
SIMIX_process_resume(process, simcall->issuer);
}
if(!process->suspended) return;
process->suspended = 0;
- /* If we are resuming another process, resume the action it was waiting for
+ /* If we are resuming another process, resume the synchronization it was waiting for
if any. Otherwise add it to the list of process to run in the next round. */
if (process != issuer) {
- if (process->waiting_action) {
+ if (process->waiting_synchro) {
- switch (process->waiting_action->type) {
+ switch (process->waiting_synchro->type) {
- case SIMIX_ACTION_EXECUTE:
- case SIMIX_ACTION_PARALLEL_EXECUTE:
- SIMIX_host_execution_resume(process->waiting_action);
+ case SIMIX_SYNC_EXECUTE:
+ case SIMIX_SYNC_PARALLEL_EXECUTE:
+ SIMIX_host_execution_resume(process->waiting_synchro);
break;
- case SIMIX_ACTION_COMMUNICATE:
- SIMIX_comm_resume(process->waiting_action);
+ case SIMIX_SYNC_COMMUNICATE:
+ SIMIX_comm_resume(process->waiting_synchro);
break;
- case SIMIX_ACTION_SLEEP:
- SIMIX_process_sleep_resume(process->waiting_action);
+ case SIMIX_SYNC_SLEEP:
+ SIMIX_process_sleep_resume(process->waiting_synchro);
break;
- case SIMIX_ACTION_SYNCHRO:
+ case SIMIX_SYNC_SYNCHRO:
/* I cannot resume it now. This is delayed to when the process is rescheduled at
* the end of the synchro. */
break;
default:
- xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d",
- (int)process->waiting_action->type);
+ xbt_die("Internal error in SIMIX_process_resume: unexpected synchronization type %d",
+ (int)process->waiting_synchro->type);
}
}
} else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
return simix_process_maxpid;
}
-int SIMIX_pre_process_count(smx_simcall_t simcall){
- return SIMIX_process_count();
-}
int SIMIX_process_count(void)
{
return xbt_swag_size(simix_global->process_list);
}
-int SIMIX_pre_process_get_PID(smx_simcall_t simcall, smx_process_t self){
- return SIMIX_process_get_PID(self);
-}
-
int SIMIX_process_get_PID(smx_process_t self){
if (self == NULL)
return 0;
return self->pid;
}
-int SIMIX_pre_process_get_PPID(smx_simcall_t simcall, smx_process_t self){
- return SIMIX_process_get_PPID(self);
-}
-
int SIMIX_process_get_PPID(smx_process_t self){
if (self == NULL)
return 0;
return self->ppid;
}
-void* SIMIX_pre_process_self_get_data(smx_simcall_t simcall, smx_process_t self){
- return SIMIX_process_self_get_data(self);
-}
-
void* SIMIX_process_self_get_data(smx_process_t self)
{
xbt_assert(self == SIMIX_process_self(), "This is not the current process");
return SIMIX_process_get_data(self);
}
-void SIMIX_pre_process_set_data(smx_simcall_t simcall, smx_process_t process,
- void *data){
- SIMIX_process_set_data(process, data);
-}
void SIMIX_process_self_set_data(smx_process_t self, void *data)
{
xbt_assert(self == SIMIX_process_self(), "This is not the current process");
SIMIX_process_set_data(self, data);
}
-void* SIMIX_pre_process_get_data(smx_simcall_t simcall, smx_process_t process){
- return SIMIX_process_get_data(process);
-}
void* SIMIX_process_get_data(smx_process_t process)
{
return process->data;
process->data = data;
}
-smx_host_t SIMIX_pre_process_get_host(smx_simcall_t simcall, smx_process_t process){
- return SIMIX_process_get_host(process);
-}
-smx_host_t SIMIX_process_get_host(smx_process_t process)
+sg_host_t SIMIX_process_get_host(smx_process_t process)
{
- return process->smx_host;
+ return process->host;
}
/* needs to be public and without simcall because it is called
return SIMIX_process_get_name(process);
}
-const char* SIMIX_pre_process_get_name(smx_simcall_t simcall, smx_process_t process) {
- return SIMIX_process_get_name(process);
-}
const char* SIMIX_process_get_name(smx_process_t process)
{
return process->name;
return NULL;
}
-int SIMIX_pre_process_is_suspended(smx_simcall_t simcall, smx_process_t process){
- return SIMIX_process_is_suspended(process);
-}
int SIMIX_process_is_suspended(smx_process_t process)
{
return process->suspended;
}
-xbt_dict_t SIMIX_pre_process_get_properties(smx_simcall_t simcall, smx_process_t process){
- return SIMIX_process_get_properties(process);
-}
xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
{
return process->properties;
}
-void SIMIX_pre_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
+void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
{
- smx_action_t action = SIMIX_process_join(simcall->issuer, process, timeout);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
+ xbt_fifo_push(sync->simcalls, simcall);
+ simcall->issuer->waiting_synchro = sync;
}
-static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_action_t action){
- if (action->sleep.surf_sleep) {
- surf_action_cancel(action->sleep.surf_sleep);
+static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t sync){
+ if (sync->sleep.surf_sleep) {
+ surf_action_cancel(sync->sleep.surf_sleep);
smx_simcall_t simcall;
- while ((simcall = xbt_fifo_shift(action->simcalls))) {
+ while ((simcall = xbt_fifo_shift(sync->simcalls))) {
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- simcall->issuer->waiting_action = NULL;
+ simcall->issuer->waiting_synchro = NULL;
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);
+ simcall_HANDLER_process_suspend(simcall, simcall->issuer);
} else {
SIMIX_simcall_answer(simcall);
}
}
- surf_action_unref(action->sleep.surf_sleep);
- action->sleep.surf_sleep = NULL;
+ surf_action_unref(sync->sleep.surf_sleep);
+ sync->sleep.surf_sleep = NULL;
}
- xbt_mallocator_release(simix_global->action_mallocator, action);
+ xbt_mallocator_release(simix_global->synchro_mallocator, sync);
return 0;
}
-smx_action_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
+smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
{
- smx_action_t res = SIMIX_process_sleep(issuer, timeout);
- res->type = SIMIX_ACTION_JOIN;
+ smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
+ res->type = SIMIX_SYNC_JOIN;
SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
return res;
}
-void SIMIX_pre_process_sleep(smx_simcall_t simcall, double duration)
+void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
{
- if (MC_is_active()) {
+ if (MC_is_active() || MC_record_replay_is_active()) {
MC_process_clock_add(simcall->issuer, duration);
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
SIMIX_simcall_answer(simcall);
return;
}
- smx_action_t action = SIMIX_process_sleep(simcall->issuer, duration);
- xbt_fifo_push(action->simcalls, simcall);
- simcall->issuer->waiting_action = action;
+ smx_synchro_t sync = SIMIX_process_sleep(simcall->issuer, duration);
+ xbt_fifo_push(sync->simcalls, simcall);
+ simcall->issuer->waiting_synchro = sync;
}
-smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
+smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
{
- smx_action_t action;
- smx_host_t host = process->smx_host;
+ smx_synchro_t synchro;
+ sg_host_t host = process->host;
/* check if the host is active */
- if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_SLEEP;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_SLEEP;
+ synchro->name = NULL;
+ synchro->category = NULL;
- action->sleep.host = host;
- action->sleep.surf_sleep =
- surf_workstation_sleep(host, duration);
+ synchro->sleep.host = host;
+ synchro->sleep.surf_sleep = surf_host_sleep(host, duration);
- surf_action_set_data(action->sleep.surf_sleep, action);
- XBT_DEBUG("Create sleep action %p", action);
+ surf_action_set_data(synchro->sleep.surf_sleep, synchro);
+ XBT_DEBUG("Create sleep synchronization %p", synchro);
- return action;
+ return synchro;
}
-void SIMIX_post_process_sleep(smx_action_t action)
+void SIMIX_post_process_sleep(smx_synchro_t synchro)
{
smx_simcall_t simcall;
e_smx_state_t state;
- xbt_assert(action->type == SIMIX_ACTION_SLEEP || action->type == SIMIX_ACTION_JOIN);
+ xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
- while ((simcall = xbt_fifo_shift(action->simcalls))) {
+ while ((simcall = xbt_fifo_shift(synchro->simcalls))) {
- switch(surf_action_get_state(action->sleep.surf_sleep)){
+ switch(surf_action_get_state(synchro->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_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall_process_sleep__set__result(simcall, state);
- simcall->issuer->waiting_action = NULL;
+ simcall->issuer->waiting_synchro = NULL;
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);
+ simcall_HANDLER_process_suspend(simcall, simcall->issuer);
} else {
SIMIX_simcall_answer(simcall);
}
}
- SIMIX_process_sleep_destroy(action);
+ SIMIX_process_sleep_destroy(synchro);
}
-void SIMIX_process_sleep_destroy(smx_action_t action)
+void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
{
- XBT_DEBUG("Destroy action %p", action);
- xbt_assert(action->type == SIMIX_ACTION_SLEEP || action->type == SIMIX_ACTION_JOIN);
+ XBT_DEBUG("Destroy synchro %p", synchro);
+ xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
- if (action->sleep.surf_sleep) {
- surf_action_unref(action->sleep.surf_sleep);
- action->sleep.surf_sleep = NULL;
+ if (synchro->sleep.surf_sleep) {
+ surf_action_unref(synchro->sleep.surf_sleep);
+ synchro->sleep.surf_sleep = NULL;
}
- if (action->type == SIMIX_ACTION_SLEEP)
- xbt_mallocator_release(simix_global->action_mallocator, action);
+ if (synchro->type == SIMIX_SYNC_SLEEP)
+ xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void SIMIX_process_sleep_suspend(smx_action_t action)
+void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
{
- xbt_assert(action->type == SIMIX_ACTION_SLEEP);
- surf_action_suspend(action->sleep.surf_sleep);
+ xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
+ surf_action_suspend(synchro->sleep.surf_sleep);
}
-void SIMIX_process_sleep_resume(smx_action_t action)
+void SIMIX_process_sleep_resume(smx_synchro_t synchro)
{
- 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);
+ XBT_DEBUG("Synchro state is %d on process_sleep_resume.", synchro->state);
+ xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
+ surf_action_resume(synchro->sleep.surf_sleep);
}
/**
}
}
-void SIMIX_pre_process_on_exit(smx_simcall_t simcall, smx_process_t process,
- int_f_pvoid_pvoid_t fun, void *data) {
- SIMIX_process_on_exit(process, fun, data);
-}
-
void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data) {
xbt_assert(process, "current process not found: are you in maestro context ?");
xbt_dynar_push_as(process->on_exit,s_smx_process_exit_fun_t,exit_fun);
}
-void SIMIX_pre_process_auto_restart_set(smx_simcall_t simcall, smx_process_t process,
- int auto_restart) {
- SIMIX_process_auto_restart_set(process, auto_restart);
-}
/**
* \brief Sets the auto-restart status of the process.
* If set to 1, the process will be automatically restarted when its host
process->auto_restart = auto_restart;
}
-smx_process_t SIMIX_pre_process_restart(smx_simcall_t simcall, smx_process_t process) {
+smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process_t process) {
return SIMIX_process_restart(process, simcall->issuer);
}
-/**
- * \brief Restart a process.
- * Restart a process, starting it again from the beginning.
- */
+/** @brief Restart a process, starting it again from the beginning. */
smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_name(process->smx_host));
+ XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_name(process->host));
//retrieve the arguments of the old process
- //FIXME: Factorise this with SIMIX_host_add_auto_restart_process ?
+ //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
s_smx_process_arg_t arg;
arg.code = process->code;
- arg.hostname = sg_host_name(process->smx_host);
- arg.kill_time = process->kill_time;
+ arg.hostname = sg_host_name(process->host);
+ arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
arg.argc = process->argc;
arg.data = process->data;
int i;
//start the new process
smx_process_t new_process;
if (simix_global->create_process_function) {
- simix_global->create_process_function(&new_process,
+ new_process = simix_global->create_process_function(
arg.argv[0],
arg.code,
arg.data,
arg.auto_restart,
NULL);
} else {
- simcall_process_create(&new_process,
+ new_process = simcall_process_create(
arg.argv[0],
arg.code,
arg.data,
