-/* $Id$ */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand. */
-/* Copyright (c) 2007 Bruno Donassolo. */
-/* All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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. */
{
/* arg is a pointer to a simix process, we can get the msg process with the field data */
m_process_t proc = ((smx_process_t) arg)->data;
+#ifdef HAVE_TRACING
+ TRACE_msg_process_end (proc);
+#endif
xbt_fifo_remove(msg_global->process_list, proc);
SIMIX_process_cleanup(arg);
- free(proc->name);
- proc->name = NULL;
- free(proc->simdata);
- proc->simdata = NULL;
+ if (proc->name) {
+ free(proc->name);
+ proc->name = NULL;
+ }
+ if (proc->simdata) {
+ free(proc->simdata);
+ proc->simdata = NULL;
+ }
free(proc);
return;
/* Simulator Data */
simdata->PID = msg_global->PID++;
+ simdata->waiting_action = NULL;
simdata->waiting_task = NULL;
simdata->m_host = host;
simdata->argc = argc;
void _MSG_process_kill_from_SIMIX(void *p)
{
+#ifdef HAVE_TRACING
+ TRACE_msg_process_kill ((m_process_t) p);
+#endif
MSG_process_kill((m_process_t) p);
}
{
simdata_process_t p_simdata = process->simdata;
+#ifdef HAVE_TRACING
+ TRACE_msg_process_kill (process);
+#endif
+
DEBUG3("Killing %s(%d) on %s",
process->name, p_simdata->PID, p_simdata->m_host->name);
- if (p_simdata->waiting_task) {
- DEBUG1("Canceling waiting task %s", p_simdata->waiting_task->name);
- if (p_simdata->waiting_task->simdata->compute) {
- SIMIX_action_cancel(p_simdata->waiting_task->simdata->compute);
- } else if (p_simdata->waiting_task->simdata->comm) {
- SIMIX_action_cancel(p_simdata->waiting_task->simdata->comm);
- }
+ if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
+ SIMIX_communication_cancel(p_simdata->waiting_task->simdata->comm);
}
-
+
+ if (p_simdata->waiting_action) {
+ DEBUG1("Canceling waiting task %s",
+ SIMIX_action_get_name(p_simdata->waiting_action));
+ SIMIX_action_cancel(p_simdata->waiting_action);
+ }
+
xbt_fifo_remove(msg_global->process_list, process);
SIMIX_process_kill(process->simdata->s_process);
m_process_t process = MSG_process_self();
m_host_t now = process->simdata->m_host;
process->simdata->m_host = host;
+#ifdef HAVE_TRACING
+ TRACE_msg_process_change_host (process, now, host);
+#endif
SIMIX_process_change_host(process->simdata->s_process, now->name,
host->name);
return MSG_OK;
MSG_error_t MSG_process_set_data(m_process_t process, void *data)
{
xbt_assert0((process != NULL), "Invalid parameters");
- xbt_assert0((process->data == NULL), "Data already set");
process->data = data;
&& (process->simdata)), "Invalid parameters");
CHECK_HOST();
+#ifdef HAVE_TRACING
+ TRACE_msg_process_suspend (process);
+#endif
+
SIMIX_process_suspend(process->simdata->s_process);
MSG_RETURN(MSG_OK);
}
&& (process->simdata)), "Invalid parameters");
CHECK_HOST();
+#ifdef HAVE_TRACING
+ TRACE_msg_process_resume (process);
+#endif
+
SIMIX_process_resume(process->simdata->s_process);
MSG_RETURN(MSG_OK);
}