/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "private.h"
+#include "smx_private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
if (action->comm.src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
- action, action->comm.detached, action->state, action->comm.src_proc, action->comm.dst_proc);
+ action, action->comm.detached, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
action->comm.src_proc = NULL;
if (action->comm.detached) {
}
else if (action->comm.dst_proc == process){
XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
- action, action->state, action->comm.src_proc, action->comm.dst_proc);
+ action, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
action->comm.dst_proc = NULL;
if (action->comm.detached && action->comm.refcount == 1
xbt_swag_remove(process, simix_global->process_list);
xbt_swag_remove(process, process->smx_host->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
+ process->context->iwannadie = 0;
}
/**
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->request.issuer = maestro;
+ maestro->simcall.issuer = maestro;
simix_global->maestro_process = maestro;
return;
args->code,
args->data,
args->hostname,
+ args->kill_time,
args->argc,
args->argv,
args->properties);
* \brief Internal function to create a process.
*
* This function actually creates the process.
- * It may be called when a REQ_PROCESS_CREATE request occurs,
- * or directly for SIMIX internal purposes.
+ * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs,
+ * or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context.
*
* \return the process created
*/
xbt_main_func_t code,
void *data,
const char *hostname,
+ double kill_time,
int argc, char **argv,
xbt_dict_t properties) {
(*process)->smx_host = host;
(*process)->data = data;
(*process)->comms = xbt_fifo_new();
- (*process)->request.issuer = *process;
+ (*process)->simcall.issuer = *process;
XBT_VERB("Create context %s", (*process)->name);
(*process)->context = SIMIX_context_new(code, argc, argv,
XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, host->name);
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process);
}
+
+ if (kill_time > SIMIX_get_clock()) {
+ if (simix_global->kill_process_function) {
+ XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
+ (*process)->smx_host->name, kill_time);
+ SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
+ }
+ }
}
/**
/**
* \brief Internal function to kill a SIMIX process.
*
- * This function may be called when a REQ_PROCESS_KILL request occurs,
+ * This function may be called when a SIMCALL_PROCESS_KILL simcall occurs,
* or directly for SIMIX internal purposes.
*
* \param process poor victim
break;
case SIMIX_ACTION_SYNCHRO:
- SIMIX_synchro_stop_waiting(process, &process->request);
+ SIMIX_synchro_stop_waiting(process, &process->simcall);
SIMIX_synchro_destroy(process->waiting_action);
break;
case SIMIX_ACTION_IO:
- THROW_UNIMPLEMENTED;
- break;
+ SIMIX_io_destroy(process->waiting_action);
+ break;
}
}
-
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
/**
}
}
- SIMIX_context_runall(simix_global->process_to_run);
+ SIMIX_context_runall();
SIMIX_process_empty_trash();
}
process->new_host = dest;
}
-void SIMIX_pre_process_suspend(smx_req_t req)
+void SIMIX_pre_process_suspend(smx_simcall_t simcall)
{
- smx_process_t process = req->process_suspend.process;
- SIMIX_process_suspend(process, req->issuer);
+ smx_process_t process = simcall->process_suspend.process;
+ smx_action_t action_suspend =
+ SIMIX_process_suspend(process, simcall->issuer);
- if (process != req->issuer) {
- SIMIX_request_answer(req);
+ 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);
}
- /* If we are suspending ourselves, then just do not replay the request. */
+ /* If we are suspending ourselves, then just do not finish the simcall now */
}
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
{
xbt_assert((process != NULL), "Invalid parameters");
if (process->suspended) {
XBT_DEBUG("Process '%s' is already suspended", process->name);
- return;
+ return NULL;
}
process->suspended = 1;
SIMIX_process_sleep_suspend(process->waiting_action);
break;
+ case SIMIX_ACTION_SYNCHRO:
+ /* Suspension is delayed to when the process is rescheduled. */
+ break;
+
default:
xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
- process->waiting_action->type);
+ (int)process->waiting_action->type);
}
+ return NULL;
+ } else {
+ /* Suspension is delayed to when the process is rescheduled. */
+ return NULL;
}
+ } else {
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
}
}
{
xbt_assert((process != NULL), "Invalid parameters");
- if (!process->suspended) {
- XBT_DEBUG("Process '%s' is not suspended", process->name);
+ XBT_IN("process = %p, issuer = %p", process, issuer);
+
+ if(process->context->iwannadie) {
+ XBT_VERB("Ignoring request to suspend a process that is currently dying.");
return;
}
+ if(!process->suspended) return;
process->suspended = 0;
/* If we are resuming another process, resume the action it was waiting for
SIMIX_process_sleep_resume(process->waiting_action);
break;
+ case SIMIX_ACTION_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",
- process->waiting_action->type);
+ (int)process->waiting_action->type);
}
}
- else {
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
- }
- }
+ } else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
+
+ XBT_OUT();
}
int SIMIX_process_get_maxpid(void) {
return process->smx_host;
}
-/* needs to be public and without request because it is called
+/* needs to be public and without simcall because it is called
by exceptions and logging events */
const char* SIMIX_process_self_get_name(void) {
return process->properties;
}
-void SIMIX_pre_process_sleep(smx_req_t req)
+void SIMIX_pre_process_sleep(smx_simcall_t simcall)
{
if (MC_IS_ENABLED) {
- MC_process_clock_add(req->issuer, req->process_sleep.duration);
- req->process_sleep.result = SIMIX_DONE;
- SIMIX_request_answer(req);
+ MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration);
+ simcall->process_sleep.result = SIMIX_DONE;
+ SIMIX_simcall_answer(simcall);
return;
}
- smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration);
- xbt_fifo_push(action->request_list, req);
- req->issuer->waiting_action = action;
+ smx_action_t action = SIMIX_process_sleep(simcall->issuer, simcall->process_sleep.duration);
+ xbt_fifo_push(action->simcalls, simcall);
+ simcall->issuer->waiting_action = action;
}
smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
void SIMIX_post_process_sleep(smx_action_t action)
{
- smx_req_t req;
+ smx_simcall_t simcall;
e_smx_state_t state;
- while ((req = xbt_fifo_shift(action->request_list))) {
+ while ((simcall = xbt_fifo_shift(action->simcalls))) {
switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){
case SURF_ACTION_FAILED:
THROW_IMPOSSIBLE;
break;
}
- req->process_sleep.result = state;
- req->issuer->waiting_action = NULL;
- SIMIX_request_answer(req);
+ simcall->process_sleep.result = state;
+ simcall->issuer->waiting_action = NULL;
+ SIMIX_simcall_answer(simcall);
}
SIMIX_process_sleep_destroy(action);
}
SIMIX_context_stop(self->context);
}
+ if(self->suspended) {
+ xbt_assert(!self->doexception, "Gloups! This exception may be lost by subsequent calls.");
+ self->suspended = 0;
+ SIMIX_process_suspend(self,self);
+ }
+
if (self->doexception) {
XBT_DEBUG("Wait, maestro left me an exception");
self->doexception = 0;
- RETHROW;
+ SMX_THROW();
}
if (self->new_host) {
}
return NULL;
}
+
+/** @brief returns a dynar containg all currently existing processes */
+xbt_dynar_t SIMIX_processes_as_dynar(void) {
+ smx_process_t proc;
+ xbt_dynar_t res = xbt_dynar_new(sizeof(smx_process_t),NULL);
+ xbt_swag_foreach(proc, simix_global->process_list) {
+ xbt_dynar_push(res,&proc);
+ }
+ return res;
+}
