Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fixed some issues in logs logic due to recent changes [Cristian]
[simgrid.git] / src / simix / smx_process.c
index 936f385..e0c849c 100644 (file)
@@ -1,4 +1,4 @@
-/*     $Id$     */
+//*     $Id$     */
 
 /* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
 
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
+#include "msg/mailbox.h"
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
-                               "Logging specific to SIMIX (process)");
-/** \defgroup m_process_management Management Functions of Agents
- *  \brief This section describes the agent structure of MSG
- *  (#m_process_t) and the functions for managing it.
- *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Agents" --> \endhtmlonly
- * 
- *  We need to simulate many independent scheduling decisions, so
- *  the concept of <em>process</em> is at the heart of the
- *  simulator. A process may be defined as a <em>code</em>, with
- *  some <em>private data</em>, executing in a <em>location</em>.
- *  \see m_process_t
- */
+                                "Logging specific to SIMIX (process)");
 
 /******************************** Process ************************************/
-/** \ingroup m_process_management
- * \brief Creates and runs a new #m_process_t.
- *
- * Does exactly the same as #MSG_process_create_with_arguments but without 
-   providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
- * \sa MSG_process_create_with_arguments
+/**
+ * \brief Move a process to the list of process to destroy. *
  */
-smx_process_t SIMIX_process_create(const char *name,
-                              smx_process_code_t code, void *data,
-                              smx_host_t host)
+void SIMIX_process_cleanup(void *arg)
 {
-  return SIMIX_process_create_with_arguments(name, code, data, host, -1, NULL);
+  xbt_swag_remove(arg, simix_global->process_to_run);
+  xbt_swag_remove(arg, simix_global->process_list);
+  xbt_swag_remove(arg, ((smx_process_t)arg)->smx_host->process_list);
+  xbt_swag_insert(arg, simix_global->process_to_destroy);
+}
+
+/** 
+ * Garbage collection
+ *
+ * Should be called some time to time to free the memory allocated for processes
+ * that have finished (or killed).
+ */
+void SIMIX_process_empty_trash(void)
+{ 
+  smx_process_t process = NULL;
+
+  while ((process = xbt_swag_extract(simix_global->process_to_destroy))){
+    SIMIX_context_free(process->context);
+    free(process->name);
+    process->name = NULL;
+    free(process);
+  }
 }
 
-static void SIMIX_process_cleanup(void *arg)
+/**
+ * \brief Creates and runs the maestro process
+ */
+void __SIMIX_create_maestro_process()
 {
-  xbt_swag_remove(arg, simix_global->process_list);
-  xbt_swag_remove(arg, simix_global->process_to_run);
-  xbt_swag_remove(arg, ((smx_process_t) arg)->simdata->host->simdata->process_list);
-  free(((smx_process_t) arg)->name);
-  ((smx_process_t) arg)->name = NULL;
-  free(((smx_process_t) arg)->simdata);
-  ((smx_process_t) arg)->simdata = NULL;
-  free(arg);
+  smx_process_t process = NULL;
+  process = xbt_new0(s_smx_process_t, 1);
+
+  /* Process data */
+  process->name = (char *)"";
+
+  /* Create the right context type */
+  process->context = SIMIX_context_create_maestro();
+
+  /* Set it as the maestro process */
+  simix_global->maestro_process = process;
+  simix_global->current_process = process;
+
+  return;
 }
 
-/** \ingroup m_process_management
- * \brief Creates and runs a new #m_process_t.
-
- * A constructor for #m_process_t taking four arguments and returning the 
- * corresponding object. The structure (and the corresponding thread) is
- * created, and put in the list of ready process.
- * \param name a name for the object. It is for user-level information
-   and can be NULL.
- * \param code is a function describing the behavior of the agent. It
-   should then only use functions described in \ref
-   m_process_management (to create a new #m_process_t for example),
-   in \ref m_host_management (only the read-only functions i.e. whose
-   name contains the word get), in \ref m_task_management (to create
-   or destroy some #m_task_t for example) and in \ref
-   msg_gos_functions (to handle file transfers and task processing).
- * \param data a pointer to any data one may want to attach to the new
-   object.  It is for user-level information and can be NULL. It can
-   be retrieved with the function \ref MSG_process_get_data.
+/**
+ * \brief Creates and runs a new #smx_process_t.
+ *
+ * A constructor for #m_process_t taking four arguments and returning the corresponding object. The structure (and the corresponding thread) is created, and put in the list of ready process.
+ *
+ * \param name a name for the object. It is for user-level information and can be NULL.
+ * \param data a pointer to any data one may want to attach to the new object.  It is for user-level information and can be NULL. It can be retrieved with the function \ref MSG_process_get_data.
  * \param host the location where the new agent is executed.
  * \param argc first argument passed to \a code
  * \param argv second argument passed to \a code
- * \see m_process_t
+ * \param clean_process_function The cleanup function of user process. It will be called when the process finish. This function have to call the SIMIX_process_cleanup.
+ * \see smx_process_t
  * \return The new corresponding object.
  */
-smx_process_t SIMIX_process_create_with_arguments(const char *name,
-                                             smx_process_code_t code, void *data,
-                                             smx_host_t host, int argc, char **argv)
+smx_process_t SIMIX_process_create(const char *name,
+                                   xbt_main_func_t code, void *data,
+                                   const char *hostname, int argc,
+                                   char **argv, xbt_dict_t properties)
 {
-  simdata_process_t simdata = xbt_new0(s_simdata_process_t,1);
-  smx_process_t process = xbt_new0(s_smx_process_t,1);
-  smx_process_t self = NULL;
+  smx_process_t process = NULL;
+  smx_host_t host = SIMIX_host_get_by_name(hostname);
 
-  xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
-  /* Simulator Data */
-
-  simdata->host = host;
-  simdata->argc = argc;
-  simdata->argv = argv;
-  simdata->context = xbt_context_new(code, NULL, NULL, 
-                                    SIMIX_process_cleanup, process, 
-                                    simdata->argc, simdata->argv);
+  DEBUG2("Start process %s on host %s", name, hostname);
 
-  if((self=simix_global->current_process)) {
-    //simdata->PPID = MSG_process_get_PID(self);
-  } else {
-   // simdata->PPID = -1;
+  if (!SIMIX_host_get_state(host)) {
+    WARN2("Cannot launch process '%s' on failed host '%s'", name, hostname);
+    return NULL;
   }
-  simdata->last_errno=SIMIX_OK;
+  process = xbt_new0(s_smx_process_t, 1);
 
+  xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
 
-  /* Process structure */
+  /* Process data */
   process->name = xbt_strdup(name);
-  process->simdata = simdata;
+  process->smx_host = host;
+  process->mutex = NULL;
+  process->cond = NULL;
+  process->iwannadie = 0;
+
+  VERB1("Create context %s", process->name);
+  process->context = SIMIX_context_new(code, argc, argv, 
+                                       simix_global->cleanup_process_function,
+                                       process);
+
   process->data = data;
 
-  xbt_swag_insert_at_head(process, host->simdata->process_list);
+  /* Add properties */
+  process->properties = properties;
 
-  /* *************** FIX du current_process !!! *************** */
-  self = simix_global->current_process;
-  xbt_context_start(process->simdata->context);
-  simix_global->current_process = self;
+  /* Add the process to it's host process list */
+  xbt_swag_insert(process, host->process_list);
 
-  xbt_swag_insert_at_head(process,simix_global->process_list);
-  DEBUG2("Inserting %s(%s) in the to_run list",process->name,
-        host->name);
-  xbt_swag_insert_at_head(process,simix_global->process_to_run);
+  DEBUG1("Start context '%s'", process->name);
+  SIMIX_context_start(process->context);
+   
+  /* Now insert it in the global process list and in the process to run list */
+  xbt_swag_insert(process, simix_global->process_list);
+  DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
+  xbt_swag_insert(process, simix_global->process_to_run);
 
   return process;
 }
 
-/** \ingroup m_process_management
- * \param process poor victim
+/**
+ * \brief Creates and runs a new #smx_process_t hosting a JAVA thread
  *
- * This function simply kills a \a process... scarry isn't it ? :)
+ * Warning: this should only be used in libsimgrid4java, since it create
+ * a context with no code, which leads to segfaults in plain libsimgrid
  */
-void SIMIX_process_kill(smx_process_t process)
+void SIMIX_jprocess_create(const char *name, smx_host_t host,
+                           void *data,
+                           void *jprocess, void *jenv, smx_process_t * res)
 {
-  //int i;
-  simdata_process_t p_simdata = process->simdata;
-  //simdata_host_t h_simdata= p_simdata->host->simdata;
-  //int _cursor;
-  //smx_process_t proc = NULL;
+  smx_process_t process = xbt_new0(s_smx_process_t, 1);
+  smx_process_t self = NULL;
 
-  DEBUG2("Killing %s on %s",process->name, p_simdata->host->name);
-  
-  /*
-  
-  if(p_simdata->waiting_task) {
-    xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
-      if(proc==process) 
-       xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
-    }
-    if(p_simdata->waiting_task->simdata->compute)
-      surf_workstation_resource->common_public->
-       action_free(p_simdata->waiting_task->simdata->compute);
-    else if (p_simdata->waiting_task->simdata->comm) {
-      surf_workstation_resource->common_public->
-       action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
-      surf_workstation_resource->common_public->
-       action_free(p_simdata->waiting_task->simdata->comm);
-    } else {
-      xbt_die("UNKNOWN STATUS. Please report this bug.");
-    }
-  }
+  /* HACK: We need this trick because when we xbt_context_new() do
+     syncronization stuff, the s_process field in the m_process needs
+     to have a valid value, and we call xbt_context_new() before
+     returning, of course, ie, before providing a right value to the
+     caller (Java_simgrid_msg_Msg_processCreate) have time to store it
+     in place. This way, we initialize the m_process->simdata->s_process
+     field ourself ASAP.
 
-  if ((i==msg_global->max_channel) && (process!=MSG_process_self()) && 
-      (!p_simdata->waiting_task)) {
-    xbt_die("UNKNOWN STATUS. Please report this bug.");
-  }
-*/
-  xbt_swag_remove(process,simix_global->process_to_run);
-  xbt_swag_remove(process,simix_global->process_list);
-  xbt_context_free(process->simdata->context);
-
-  if(process==SIMIX_process_self()) {
-    /* I just killed myself */
-    xbt_context_yield();
-  }
+     All this would be much simpler if the synchronization stuff would be done
+     in the JAVA world, I think.
+   */
+  *res = process;
+
+  DEBUG5("jprocess_create(name=%s,host=%p,data=%p,jproc=%p,jenv=%p)",
+         name, host, data, jprocess, jenv);
+  xbt_assert0(host, "Invalid parameters");
+
+  /* Process data */
+  process->name = xbt_strdup(name);
+  process->smx_host = host;
+  process->mutex = NULL;
+  process->cond = NULL;
+  SIMIX_context_new(jprocess, 0, NULL, NULL, NULL);
+  process->data = data;
+
+  /* Add the process to it's host process list */
+  xbt_swag_insert(&process, host->process_list);
+
+  /* fix current_process, about which xbt_context_start mocks around */
+  self = simix_global->current_process;
+  SIMIX_context_start(process->context);
+  simix_global->current_process = self;
+
+  /* Now insert it in the global process list and in the process to run list */
+  xbt_swag_insert(process, simix_global->process_list);
+  DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
+  xbt_swag_insert(process, simix_global->process_to_run);
 }
 
-/** \ingroup m_process_management
- * \brief Migrates an agent to another location.
+/** \brief Kill a SIMIX process
+ *
+ * This function simply kills a \a process... scarry isn't it ? :).
+ * \param process poor victim
  *
- * This functions checks whether \a process and \a host are valid pointers
-   and change the value of the #m_host_t on which \a process is running.
  */
-SIMIX_error_t SIMIX_process_change_host(smx_process_t process, smx_host_t host)
+void SIMIX_process_kill(smx_process_t process)
 {
-  simdata_process_t simdata = NULL;
+  DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
+
+  /* Cleanup if we were waiting for something */
+  if (process->mutex)
+    xbt_swag_remove(process, process->mutex->sleeping);
 
-  /* Sanity check */
+  if (process->cond)
+    xbt_swag_remove(process, process->cond->sleeping);
 
-  xbt_assert0(((process) && (process->simdata)
-         && (host)), "Invalid parameters");
-  simdata = process->simdata;
+  DEBUG2("%p here! killing %p", simix_global->current_process, process);
 
-  xbt_swag_remove(process,simdata->host->simdata->process_list);
-  simdata->host = host;
-  xbt_swag_insert_at_head(process,host->simdata->process_list);
+  process->iwannadie = 1;
 
-  return SIMIX_OK;
+  /* If I'm killing myself then stop otherwise schedule the process to kill */
+  if (process == SIMIX_process_self())
+    SIMIX_context_stop(process->context);
+  else
+    __SIMIX_process_schedule(process);
+  
 }
 
-/** \ingroup m_process_management
- * \brief Return the user data of a #m_process_t.
+/**
+ * \brief Return the user data of a #smx_process_t.
  *
- * This functions checks whether \a process is a valid pointer or not 
-   and return the user data associated to \a process if it is possible.
+ * This functions checks whether \a process is a valid pointer or not and return the user data associated to \a process if it is possible.
+ * \param process SIMIX process
+ * \return A void pointer to the user data
  */
 void *SIMIX_process_get_data(smx_process_t process)
 {
   xbt_assert0((process != NULL), "Invalid parameters");
-
   return (process->data);
 }
 
-/** \ingroup m_process_management
+/**
  * \brief Set the user data of a #m_process_t.
  *
- * This functions checks whether \a process is a valid pointer or not 
-   and set the user data associated to \a process if it is possible.
+ * This functions checks whether \a process is a valid pointer or not and set the user data associated to \a process if it is possible.
+ * \param process SIMIX process
+ * \param data User data
  */
-SIMIX_error_t SIMIX_process_set_data(smx_process_t process,void *data)
+void SIMIX_process_set_data(smx_process_t process, void *data)
 {
   xbt_assert0((process != NULL), "Invalid parameters");
-  xbt_assert0((process->data == NULL), "Data already set");
-  
+
   process->data = data;
-   
-  return SIMIX_OK;
+  return;
 }
 
-/** \ingroup m_process_management
+/**
  * \brief Return the location on which an agent is running.
  *
- * This functions checks whether \a process is a valid pointer or not 
-   and return the m_host_t corresponding to the location on which \a 
-   process is running.
+ * This functions checks whether \a process is a valid pointer or not and return the m_host_t corresponding to the location on which \a process is running.
+ * \param process SIMIX process
+ * \return SIMIX host
  */
 smx_host_t SIMIX_process_get_host(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-
-  return (((simdata_process_t) process->simdata)->host);
-}
-
-/** \ingroup m_process_management
- *
- * \brief Return a #m_process_t given its PID.
- *
- * This functions search in the list of all the created m_process_t for a m_process_t 
-   whose PID is equal to \a PID. If no host is found, \c NULL is returned. 
-   Note that the PID are uniq in the whole simulation, not only on a given host.
- */
-/*
-m_process_t MSG_process_from_PID(int PID)
-{
-  xbt_fifo_item_t i = NULL;
-  m_process_t process = NULL;
-
-  xbt_fifo_foreach(msg_global->process_list,i,process,m_process_t) {
-    if(MSG_process_get_PID(process) == PID) return process;
-  }
-  return NULL;
-}
-*/
-
-/** \ingroup m_process_management
- * \brief Returns the process ID of \a process.
- *
- * This functions checks whether \a process is a valid pointer or not 
-   and return its PID.
- */
-/*
-int MSG_process_get_PID(m_process_t process)
-{
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-
-  return (((simdata_process_t) process->simdata)->PID);
+  xbt_assert0((process != NULL), "Invalid parameters");
+  return (process->smx_host);
 }
-*/
-/** \ingroup m_process_management
- * \brief Returns the process ID of the parent of \a process.
- *
- * This functions checks whether \a process is a valid pointer or not 
-   and return its PID. Returns -1 if the agent has not been created by 
-   another agent.
- */
-/*
-int MSG_process_get_PPID(m_process_t process)
-{
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
 
-  return (((simdata_process_t) process->simdata)->PPID);
-}
-*/
-/** \ingroup m_process_management
+/**
  * \brief Return the name of an agent.
  *
- * This functions checks whether \a process is a valid pointer or not 
-   and return its name.
+ * This functions checks whether \a process is a valid pointer or not and return its name.
+ * \param process SIMIX process
+ * \return The process name
  */
 const char *SIMIX_process_get_name(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-
+  xbt_assert0((process != NULL), "Invalid parameters");
   return (process->name);
 }
 
-/** \ingroup m_process_management
- * \brief Return the PID of the current agent.
+/**
+ * \brief Changes the name of an agent.
  *
- * This functions returns the PID of the currently running #m_process_t.
+ * This functions checks whether \a process is a valid pointer or not and return its name.
+ * \param process SIMIX process
+ * \param name The new process name
  */
-/*
-int MSG_process_self_PID(void)
+void SIMIX_process_set_name(smx_process_t process, char *name)
 {
-  return (MSG_process_get_PID(MSG_process_self()));
+  xbt_assert0((process != NULL), "Invalid parameters");
+  process->name = name;
 }
-*/
+
 /** \ingroup m_process_management
- * \brief Return the PPID of the current agent.
+ * \brief Return the properties
  *
- * This functions returns the PID of the parent of the currently
- * running #m_process_t.
+ * This functions returns the properties associated with this process
  */
-/*
-int MSG_process_self_PPID(void)
+xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
 {
-  return (MSG_process_get_PPID(MSG_process_self()));
+  return process->properties;
 }
-*/
-/** \ingroup m_process_management
+
+/**
  * \brief Return the current agent.
  *
- * This functions returns the currently running #m_process_t.
+ * This functions returns the currently running #smx_process_t.
+ * \return The SIMIX process
  */
 smx_process_t SIMIX_process_self(void)
 {
   return simix_global ? simix_global->current_process : NULL;
 }
 
-/** \ingroup m_process_management
+/**
  * \brief Suspend the process.
  *
- * This functions suspend the process by suspending the task on which
- * it was waiting for the completion.
+ * This functions suspend the process by suspending the action on
+ * which it was waiting for the completion.
+ *
+ * \param process SIMIX process
  */
-SIMIX_error_t SIMIX_process_suspend(smx_process_t process)
+void SIMIX_process_suspend(smx_process_t process)
 {
-/*
-  simdata_process_t simdata = NULL;
-  simdata_task_t simdata_task = NULL;
-
-  XBT_IN2("(%p(%s))", process, process->name);
-
-  xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
-
-  PAJE_PROCESS_PUSH_STATE(process,"S",NULL);
-
-  if(process!=SIMIX_process_self()) {
-    simdata = process->simdata;
-    
-    xbt_assert0(simdata->waiting_task,"Process not waiting for anything else. Weird !");
-
-    simdata_task = simdata->waiting_task->simdata;
-
-    simdata->suspended = 1;
-    if(simdata->blocked) {
-      XBT_OUT;
-      return SIMIX_OK;
+  xbt_assert0(process, "Invalid parameters");
+
+  if (process != SIMIX_process_self()) {
+
+    if (process->mutex) {
+      /* process blocked on a mutex, only set suspend=1 */
+      process->suspended = 1;
+    } else if (process->cond) {
+      /* process blocked cond, suspend all actions */
+
+      /* temporaries variables */
+      smx_cond_t c;
+      xbt_fifo_item_t i;
+      smx_action_t act;
+
+      process->suspended = 1;
+      c = process->cond;
+      xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
+        surf_workstation_model->suspend(act->surf_action);
+      }
+    } else {
+      process->suspended = 1;
     }
-
-    xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&&
-               !((simdata_task->compute)&&(simdata_task->comm)),
-               "Got a problem in deciding which action to choose !");
-    simdata->suspended = 1;
-    if(simdata_task->compute) 
-      surf_workstation_resource->common_public->suspend(simdata_task->compute);
-    else
-      surf_workstation_resource->common_public->suspend(simdata_task->comm);
   } else {
-    m_task_t dummy = MSG_TASK_UNINITIALIZED;
-    dummy = MSG_task_create("suspended", 0.0, 0, NULL);
-
-    simdata = process->simdata;
-    simdata->suspended = 1;
-    __MSG_task_execute(process,dummy);
-    surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
-    __MSG_wait_for_computation(process,dummy);
-    simdata->suspended = 0;
-
-    MSG_task_destroy(dummy);
+    /* process executing, I can create an action and suspend it */
+    smx_action_t dummy;
+    smx_cond_t cond;
+    char name[] = "dummy";
+    process->suspended = 1;
+
+    cond = SIMIX_cond_init();
+    dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
+    surf_workstation_model->suspend(dummy->surf_action);
+    SIMIX_register_action_to_condition(dummy, cond);
+    __SIMIX_cond_wait(cond);
+    SIMIX_unregister_action_to_condition(dummy, cond);
+    SIMIX_action_destroy(dummy);
+    SIMIX_cond_destroy(cond);
   }
-  XBT_OUT;
-  */
-  return SIMIX_OK;
+  return;
 }
 
-/** \ingroup m_process_management
+/**
  * \brief Resume a suspended process.
  *
- * This functions resume a suspended process by resuming the task on
- * which it was waiting for the completion.
+ * This functions resume a suspended process by resuming the task on which it was waiting for the completion.
+ * \param process SIMIX process
  */
-SIMIX_error_t SIMIX_process_resume(smx_process_t process)
+void SIMIX_process_resume(smx_process_t process)
 {
-/*
-  simdata_process_t simdata = NULL;
-  simdata_task_t simdata_task = NULL;
-
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-  CHECK_HOST();
-
-  XBT_IN2("(%p(%s))", process, process->name);
-
-  if(process == SIMIX_process_self()) {
-    XBT_OUT;
-    SIMIX_RETURN(SIMIX_OK);
-  }
-
-  simdata = process->simdata;
-
-  if(simdata->blocked) {
-    PAJE_PROCESS_POP_STATE(process);
-
-    simdata->suspended = 0; *//* He'll wake up by itself */
-    /*XBT_OUT;
-    SIMIX_RETURN(SIMIX_OK);
-  }
-
-  if(!(simdata->waiting_task)) {
-    xbt_assert0(0,"Process not waiting for anything else. Weird !");
-    XBT_OUT;
-    return SIMIX_WARNING;
-  }
-  simdata_task = simdata->waiting_task->simdata;
-
-
-  if(simdata_task->compute) {
-    surf_workstation_resource->common_public->resume(simdata_task->compute);
-    PAJE_PROCESS_POP_STATE(process);
-  }
-  else {
-    PAJE_PROCESS_POP_STATE(process);
-    surf_workstation_resource->common_public->resume(simdata_task->comm);
+  xbt_assert0((process != NULL), "Invalid parameters");
+  SIMIX_CHECK_HOST();
+
+  if (process == SIMIX_process_self())
+    return;
+
+  if (process->mutex) {
+    DEBUG0("Resume process blocked on a mutex");
+    process->suspended = 0;     /* It'll wake up by itself when mutex releases */
+    return;
+  } else if (process->cond) {
+    /* temporaries variables */
+    smx_cond_t c;
+    xbt_fifo_item_t i;
+    smx_action_t act;
+    DEBUG0("Resume process blocked on a conditional");
+    process->suspended = 0;
+    c = process->cond;
+    xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
+      surf_workstation_model->resume(act->surf_action);
+    }
+    SIMIX_cond_signal(c);
+    return;
+  } else {
+    process->suspended = 0;
+    xbt_swag_insert(process, simix_global->process_to_run);
   }
+}
 
-  XBT_OUT;
-  */
-  SIMIX_RETURN(SIMIX_OK);
+/**
+ * \brief Migrates an agent to another location.
+ *
+ * This function changes the value of the host on which \a process is running.
+ */
+void SIMIX_process_change_host(smx_process_t process, char *source, char *dest)
+{
+  xbt_assert0((process != NULL), "Invalid parameters");
+  smx_host_t h1 = SIMIX_host_get_by_name(source);
+  smx_host_t 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);
 }
 
-/** \ingroup m_process_management
+/**
  * \brief Returns true if the process is suspended .
  *
- * This checks whether a process is suspended or not by inspecting the
- * task on which it was waiting for the completion.
+ * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion.
+ * \param process SIMIX process
+ * \return 1, if the process is suspended, else 0.
  */
 int SIMIX_process_is_suspended(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  xbt_assert0((process != NULL), "Invalid parameters");
 
-  return (process->simdata->suspended);
+  return (process->suspended);
 }
 
-int __SIMIX_process_block(double max_duration, const char *info)
+/**
+ * \brief Returns the amount of SIMIX processes in the system
+ *
+ * Maestro internal process is not counted, only user code processes are
+ */
+int SIMIX_process_count()
 {
-/*
-  smx_process_t process = SIMIX_process_self();
-  m_task_t dummy = SIMIX_TASK_UNINITIALIZED;
-  char blocked_name[512];
-  snprintf(blocked_name,512,"blocked [%s] (%s:%s)",
-         info, process->name, process->simdata->host->name);
-
-  XBT_IN1(": max_duration=%g",max_duration);
-
-  dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
-  
-  PAJE_PROCESS_PUSH_STATE(process,"B",NULL);
-
-  process->simdata->blocked=1;
-  __MSG_task_execute(process,dummy);
-  surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
-  if(max_duration>=0)
-    surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute, 
-                                                              max_duration);
-  __MSG_wait_for_computation(process,dummy);
-  MSG_task_destroy(dummy);
-  process->simdata->blocked=0;
-
-  if(process->simdata->suspended) {
-    DEBUG0("I've been suspended in the meantime");    
-    SIMIX_process_suspend(process);
-    DEBUG0("I've been resumed, let's keep going");    
-  }
-
-  PAJE_PROCESS_POP_STATE(process);
-
-  XBT_OUT;
-  */
-  return 1;
+  return xbt_swag_size(simix_global->process_list);
 }
 
-SIMIX_error_t __SIMIX_process_unblock(smx_process_t process)
+/** 
+ * Calling this function makes the process process to yield. The process
+ * that scheduled it returns from __SIMIX_process_schedule as if nothing
+ * had happened.
+ * 
+ * Only the processes can call this function, giving back the control
+ * to the maestro
+ */
+void __SIMIX_process_yield(void)
 {
-/*
-  simdata_process_t simdata = NULL;
-  simdata_task_t simdata_task = NULL;
+  DEBUG1("Yield process '%s'", simix_global->current_process->name);
+  xbt_assert0((simix_global->current_process != simix_global->maestro_process),
+              "You are not supposed to run this function here!");
 
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-  CHECK_HOST();
+  SIMIX_context_suspend(simix_global->current_process->context);
 
-  XBT_IN2(": %s unblocking %s", SIMIX_process_self()->name,process->name);
-
-  simdata = process->simdata;
-  if(!(simdata->waiting_task)) {
-    xbt_assert0(0,"Process not waiting for anything else. Weird !");
-    XBT_OUT;
-    return SIMIX_WARNING;
-  }
-  simdata_task = simdata->waiting_task->simdata;
+  if (simix_global->current_process->iwannadie)
+    SIMIX_context_stop(simix_global->current_process->context);
+}
 
-  xbt_assert0(simdata->blocked,"Process not blocked");
+void __SIMIX_process_schedule(smx_process_t new_process)
+{
+  DEBUG1("Scheduling context: '%s'", new_process->name);
 
-  surf_workstation_resource->common_public->resume(simdata_task->compute);
+  /* save the current process */
+  smx_process_t old_process = simix_global->current_process;
 
-  XBT_OUT;
-*/
-  SIMIX_RETURN(SIMIX_OK);
-}
+  /* update the current process */
+  simix_global->current_process = new_process;
 
-int __SIMIX_process_isBlocked(smx_process_t process)
-{
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  /* schedule the context */
+  SIMIX_context_resume(old_process->context, new_process->context);
 
-  return (process->simdata->blocked);
+  /* restore the current process to the previously saved process */
+  simix_global->current_process = old_process;
 }