X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e487ef4538248f261ddb6e814357593df7646e33..f345bad939eef8e6f417c39a3d3e5fd45ca492ba:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 68779a4e2f..0084efddd8 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -1,8 +1,5 @@
-/*     $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. */
@@ -10,7 +7,6 @@
 #include "msg/private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "../simix/private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
                                 "Logging specific to MSG (process)");
@@ -30,16 +26,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
  */
 
 /******************************** Process ************************************/
-void __MSG_process_cleanup(void *arg)
+void __MSG_process_cleanup(smx_process_t smx_proc)
 {
   /* 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;
+  m_process_t proc = SIMIX_req_process_get_data(smx_proc);
+#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;
+  SIMIX_process_cleanup(smx_proc);
+  if (proc->name) {
+    free(proc->name);
+    proc->name = NULL;
+  }
+  if (proc->simdata) {
+    free(proc->simdata);
+    proc->simdata = NULL;
+  }
   free(proc);
 
   return;
@@ -52,8 +55,9 @@ void *_MSG_process_create_from_SIMIX(const char *name,
                                      xbt_dict_t properties)
 {
   m_host_t host = MSG_get_host_by_name(hostname);
-  return (void *) MSG_process_create_with_environment(name, code, data, host,
-                                                      argc, argv, properties);
+  return (void *) MSG_process_create_with_environment(name, code, data,
+                                                      host, argc, argv,
+                                                      properties);
 }
 
 /** \ingroup m_process_management
@@ -138,48 +142,53 @@ m_process_t MSG_process_create_with_environment(const char *name,
 {
   simdata_process_t simdata = NULL;
   m_process_t process = xbt_new0(s_m_process_t, 1);
-  smx_process_t smx_process = NULL;
   xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
 
-  smx_process = SIMIX_process_create(name, code,
-                                     (void *) process, host->name,
-                                     argc, argv, properties);
-  if (!smx_process) {
-    xbt_free(process);
-    return NULL;
-  }
-
   simdata = xbt_new0(s_simdata_process_t, 1);
 
   /* Simulator Data */
   simdata->PID = msg_global->PID++;
   simdata->waiting_action = NULL;
+  simdata->waiting_task = NULL;
   simdata->m_host = host;
   simdata->argc = argc;
   simdata->argv = argv;
-  simdata->s_process = smx_process;
 
   if (SIMIX_process_self()) {
-    simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
+    simdata->PPID = MSG_process_get_PID(SIMIX_process_self_get_data());
   } else {
     simdata->PPID = -1;
   }
   simdata->last_errno = MSG_OK;
 
-
   /* Process structure */
   process->name = xbt_strdup(name);
   process->simdata = simdata;
   process->data = data;
-
   xbt_fifo_unshift(msg_global->process_list, process);
 
-  return process;
+  /* Let's create the process (SIMIX may decide to start it right now) */
+  simdata->s_process = SIMIX_req_process_create(name, code, (void *) process, host->name,
+                                                argc, argv, properties);
+
+  if (!simdata->s_process) {
+    /* Undo everything we have just changed */
+    msg_global->PID--;
+    xbt_fifo_remove(msg_global->process_list, process);
+    xbt_free(process->name);
+    xbt_free(process);
+    xbt_free(simdata);
+    return NULL;
+  }
 
+  return process;
 }
 
 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);
 }
 
@@ -192,17 +201,19 @@ void MSG_process_kill(m_process_t process)
 {
   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_action) {
-    DEBUG1("Canceling waiting task %s",
-           SIMIX_action_get_name(p_simdata->waiting_action));
-    SIMIX_action_cancel(p_simdata->waiting_action);
+  if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
+    SIMIX_req_comm_cancel(p_simdata->waiting_task->simdata->comm);
   }
-
+ 
   xbt_fifo_remove(msg_global->process_list, process);
-  SIMIX_process_kill(process->simdata->s_process);
+  SIMIX_req_process_kill(process->simdata->s_process);
 
   return;
 }
@@ -218,7 +229,10 @@ MSG_error_t MSG_process_change_host(m_host_t host)
   m_process_t process = MSG_process_self();
   m_host_t now = process->simdata->m_host;
   process->simdata->m_host = host;
-  SIMIX_process_change_host(process->simdata->s_process, now->name,
+#ifdef HAVE_TRACING
+  TRACE_msg_process_change_host(process, now, host);
+#endif
+  SIMIX_req_process_change_host(process->simdata->s_process, now->name,
                             host->name);
   return MSG_OK;
 }
@@ -245,7 +259,6 @@ void *MSG_process_get_data(m_process_t process)
 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;
 
@@ -355,7 +368,7 @@ xbt_dict_t MSG_process_get_properties(m_process_t process)
 {
   xbt_assert0((process != NULL), "Invalid parameters");
 
-  return (SIMIX_process_get_properties
+  return (SIMIX_req_process_get_properties
           (((simdata_process_t) process->simdata)->s_process));
 
 }
@@ -388,13 +401,9 @@ int MSG_process_self_PPID(void)
  */
 m_process_t MSG_process_self(void)
 {
-  smx_process_t proc = SIMIX_process_self();
-  if (proc != NULL) {
-    return (m_process_t) proc->data;
-  } else {
-    return NULL;
-  }
-
+  /* we cannot make a SIMIX request here because this may create an exception or a logging
+     event, and both mechanisms call MSG_process_self() again (via xbt_getpid()) */
+  return (m_process_t) SIMIX_process_self_get_data();
 }
 
 /** \ingroup m_process_management
@@ -409,7 +418,11 @@ MSG_error_t MSG_process_suspend(m_process_t process)
                && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
-  SIMIX_process_suspend(process->simdata->s_process);
+#ifdef HAVE_TRACING
+  TRACE_msg_process_suspend(process);
+#endif
+
+  SIMIX_req_process_suspend(process->simdata->s_process);
   MSG_RETURN(MSG_OK);
 }
 
@@ -426,7 +439,11 @@ MSG_error_t MSG_process_resume(m_process_t process)
                && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
-  SIMIX_process_resume(process->simdata->s_process);
+#ifdef HAVE_TRACING
+  TRACE_msg_process_resume(process);
+#endif
+
+  SIMIX_req_process_resume(process->simdata->s_process);
   MSG_RETURN(MSG_OK);
 }
 
@@ -440,5 +457,10 @@ int MSG_process_is_suspended(m_process_t process)
 {
   xbt_assert0(((process != NULL)
                && (process->simdata)), "Invalid parameters");
-  return SIMIX_process_is_suspended(process->simdata->s_process);
+  return SIMIX_req_process_is_suspended(process->simdata->s_process);
+}
+
+
+smx_context_t MSG_process_get_smx_ctx(m_process_t process) {
+  return SIMIX_process_get_context(process->simdata->s_process);
 }