*/
void SIMIX_process_cleanup(smx_process_t process)
{
- XBT_DEBUG("Cleanup process %s", process->name);
+ XBT_DEBUG("Cleanup process %s (%p), waiting action %p",
+ process->name, process, process->waiting_action);
+
+ /* cancel non-blocking communications */
+ smx_action_t action;
+ while ((action = xbt_fifo_pop(process->comms))) {
+
+ /* make sure no one will finish the comm after this process is destroyed */
+ SIMIX_comm_cancel(action);
+
+ if (action->comm.src_proc == process) {
+ XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d",
+ action, action->comm.detached, action->state);
+ action->comm.src_proc = NULL;
+
+ if (action->comm.detached) {
+ /* the receiver was supposed to destroy the comm after completion,
+ * but the comm will actually never finish */
+ action->comm.refcount++;
+ }
+ }
+ else if (action->comm.dst_proc == process){
+ XBT_DEBUG("Found an unfinished recv comm %p, state %d", action, action->state);
+ action->comm.dst_proc = NULL;
+ }
+ else {
+ THROW_IMPOSSIBLE;
+ }
+
+ SIMIX_comm_destroy(action);
+ }
+
/*xbt_swag_remove(process, simix_global->process_to_run);*/
xbt_swag_remove(process, simix_global->process_list);
xbt_swag_remove(process, process->smx_host->process_list);
if (process->properties)
xbt_dict_free(&process->properties);
+ xbt_fifo_free(process->comms);
+
free(process->name);
process->name = NULL;
free(process);
else {
*process = xbt_new0(s_smx_process_t, 1);
- xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
+ 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();
XBT_VERB("Create context %s", (*process)->name);
(*process)->context = SIMIX_context_new(code, argc, argv,
}
}
+/**
+ * \brief Executes the processes from simix_global->process_to_run.
+ *
+ * The processes of simix_global->process_to_run are run (in parallel if
+ * possible). On exit, simix_global->process_to_run is empty, and
+ * simix_global->process_that_ran contains the list of processes that just ran.
+ * The two lists are swapped so, be careful when using them before and after a
+ * call to this function.
+ */
+void SIMIX_process_runall(void)
+{
+ SIMIX_context_runall(simix_global->process_to_run);
+ xbt_dynar_t tmp = simix_global->process_that_ran;
+ simix_global->process_that_ran = simix_global->process_to_run;
+ simix_global->process_to_run = tmp;
+ xbt_dynar_reset(simix_global->process_to_run);
+}
+
/**
* \brief Internal function to kill a SIMIX process.
*
process->suspended = 0;
/* FIXME: set doexception to 0 also? */
+ /* destroy the blocking action if any */
if (process->waiting_action) {
switch (process->waiting_action->type) {
}
void SIMIX_process_change_host(smx_process_t process,
- const char *source, const char *dest)
+ smx_host_t dest)
{
- smx_host_t h1 = NULL;
- smx_host_t h2 = NULL;
- xbt_assert0((process != NULL), "Invalid parameters");
- h1 = SIMIX_host_get_by_name(source);
- h2 = SIMIX_host_get_by_name(dest);
- process->smx_host = h2;
- xbt_swag_remove(process, h1->process_list);
- xbt_swag_insert(process, h2->process_list);
+ xbt_assert((process != NULL), "Invalid parameters");
+ xbt_swag_remove(process, process->smx_host->process_list);
+ process->smx_host = dest;
+ xbt_swag_insert(process, dest->process_list);
+}
+
+void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest)
+{
+ process->new_host = dest;
}
void SIMIX_pre_process_suspend(smx_req_t req)
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
{
- xbt_assert0((process != NULL), "Invalid parameters");
+ xbt_assert((process != NULL), "Invalid parameters");
process->suspended = 0;
XBT_DEBUG("Destroy action %p", action);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep);
-#ifdef HAVE_TRACING
- TRACE_smx_action_destroy(action);
-#endif
xbt_mallocator_release(simix_global->action_mallocator, action);
}
self->doexception = 0;
RETHROW;
}
+
+ if (self->new_host) {
+ SIMIX_process_change_host(self, self->new_host);
+ self->new_host = NULL;
+ }
}
/* callback: context fetching */