Intermidiate step towards the new context mechanism [Cristian]

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index b2384bb..c62f822 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -16,11 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
 
 /******************************** Process ************************************/
 /**
- * \brief Creates and runs a new #smx_process_t.
- *
- * Does exactly the same as #SIMIX_process_create_with_arguments but without
-   providing standard arguments (\a argc, \a argv).
- * \see SIMIX_process_create_with_arguments
+ * \brief Move a process to the list of process to destroy. *
  */
 
 void SIMIX_process_cleanup(void *arg)
@@ -31,6 +27,32 @@ void SIMIX_process_cleanup(void *arg)
   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;
+  int i;  
+
+  while ((process = xbt_swag_extract(simix_global->process_to_destroy))){
+    free(process->name);
+    process->name = NULL;
+  
+    if (process->argv) {
+      for (i = 0; i < process->argc; i++)
+        if (process->argv[i])
+          free(process->argv[i]);
+
+      free(process->argv);
+    }
+  
+    free(process);
+  }
+}
 
 /**
  * \brief Creates and runs the maestro process
@@ -43,7 +65,7 @@ void __SIMIX_create_maestro_process()
   process = xbt_new0(s_smx_process_t, 1);
 
   /* Process data */
-  process->name = (char *)"maestro";
+  process->name = (char *)"";
 
   /*Create the right context type (FIXME: check the return value for success)*/
   SIMIX_context_create_maestro(&process);
@@ -51,11 +73,11 @@ void __SIMIX_create_maestro_process()
   /* Set it as the maestro process */
   simix_global->maestro_process = process;
   simix_global->current_process = process;
-  
+
   return;
 }
 
-/** 
+/**
  * \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.
@@ -75,7 +97,6 @@ smx_process_t SIMIX_process_create(const char *name,
                                    char **argv, xbt_dict_t properties)
 {
   smx_process_t process = NULL;
-  smx_process_t self = NULL;
   smx_host_t host = SIMIX_host_get_by_name(hostname);
 
   DEBUG2("Start process %s on host %s", name, hostname);
@@ -108,12 +129,9 @@ smx_process_t SIMIX_process_create(const char *name,
 
   /* Add the process to it's host process list */
   xbt_swag_insert(process, host->process_list);
-
-  /* fix current_process, about which SIMIX_context_start mocks around */
-  self = simix_global->current_process;
+  
   SIMIX_context_start(process);
-  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);
@@ -184,8 +202,7 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
  */
 void SIMIX_process_kill(smx_process_t process)
 {
-  DEBUG2("Killing process %s on %s", process->name,
-         process->smx_host->name);
+  DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
 
   /* Cleanup if we were waiting for something */
   if (process->mutex)
@@ -195,7 +212,10 @@ void SIMIX_process_kill(smx_process_t process)
     xbt_swag_remove(process, process->cond->sleeping);
 
   DEBUG2("%p here! killing %p", simix_global->current_process, process);
-  SIMIX_context_kill(process);
+
+  /*FIXME: If we are killing the running process we might call stop directly */  
+  process->iwannadie = 1;
+  __SIMIX_process_schedule(process);
 
   if (process == SIMIX_process_self()) {
     /* I just killed myself */
@@ -404,7 +424,7 @@ void SIMIX_process_change_host(smx_process_t process, char *source, char *dest)
  */
 int SIMIX_process_is_suspended(smx_process_t process)
 {
-  xbt_assert0(((process != NULL), "Invalid parameters");
+  xbt_assert0((process != NULL), "Invalid parameters");
 
   return (process->suspended);
 }
@@ -418,3 +438,40 @@ int SIMIX_process_count()
 {
   return xbt_swag_size(simix_global->process_list);
 }
+
+/** 
+ * 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)
+{
+  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!");
+
+  SIMIX_context_yield();
+
+  if (simix_global->current_process->iwannadie)
+    SIMIX_context_stop(1);
+}
+
+void __SIMIX_process_schedule(smx_process_t process)
+{
+  DEBUG1("Scheduling context: '%s'", process->name);
+
+  /* save the current process */
+  smx_process_t self = simix_global->current_process;
+
+  /* update the current process */
+  simix_global->current_process = process;
+
+  /* schedule the context */
+  SIMIX_context_schedule(process);
+
+  /* restore the current process to the previously saved process */
+  simix_global->current_process = self;
+}