X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..d63082ddf272639cfc695dd677d69a0f12300898:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 72126a7669..8eb92c79cd 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -11,91 +11,19 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
+XBT_LOG_EXTERNAL_CATEGORY(simix);
+XBT_LOG_EXTERNAL_CATEGORY(simix_action);
+XBT_LOG_EXTERNAL_CATEGORY(simix_deployment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_host);
+XBT_LOG_EXTERNAL_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+XBT_LOG_EXTERNAL_CATEGORY(simix_context);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                 "Logging specific to SIMIX (kernel)");
 
 SIMIX_Global_t simix_global = NULL;
 
-/********************************* SIMIX **************************************/
-static void __simix_config_helper(const char *name, ...)
-{
-  va_list pa;
-  va_start(pa, name);
-
-  SIMIX_config(name, pa);
-
-  va_end(pa);
-}
-
-static void simix_cfg_control_set(const char *control_string)
-{
-  /* To split the string in commands, and the cursors */
-  xbt_dynar_t set_strings;
-  char *str;
-  unsigned int cpt;
-
-  if (!control_string)
-    return;
-  DEBUG1("Parse log settings '%s'", control_string);
-
-  /* split the string, and remove empty entries */
-  set_strings = xbt_str_split_quoted(control_string);
-
-  if (xbt_dynar_length(set_strings) == 0) {     /* vicious user! */
-    xbt_dynar_free(&set_strings);
-    return;
-  }
-  /* Parse each entry and either use it right now (if the category was already
-     created), or store it for further use */
-  xbt_dynar_foreach(set_strings, cpt, str) {
-    char *control_string, *control_string_sav, *name, *value;
-
-
-    control_string = control_string_sav = strdup(str);
-    control_string += strspn(control_string, " ");
-    name = control_string;
-    control_string += strcspn(str, ":=");
-    value = control_string;
-    *value = 0;
-    value++;
-
-    xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'",
-                name);
-    xbt_assert1(strlen(value) != 0,
-                "Invalid value for configuration: '%s'", value);
-    INFO2("setting '%s' to '%s'", name, value);
-
-    __simix_config_helper(name, value);
-
-    free(control_string_sav);
-  }
-  xbt_dynar_free(&set_strings);
-}
-
-static void simix_cfg_init(int *argc, char **argv)
-{
-  int i, j;
-  char *opt;
-
-  for (i = 1; i < *argc; i++) {
-    if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
-      opt = strchr(argv[i], '=');
-      opt++;
-
-      simix_cfg_control_set(opt);
-      DEBUG1("Did apply '%s' as config setting", opt);
-      /*remove this from argv */
-
-      for (j = i + 1; j < *argc; j++) {
-        argv[j - 1] = argv[j];
-      }
-
-      argv[j - 1] = NULL;
-      (*argc)--;
-      i--;                      /* compensate effect of next loop incrementation */
-    }
-  }
-}
 
 /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
 #include <signal.h>
@@ -107,9 +35,10 @@ static void _XBT_CALL inthandler(int ignored)
   exit(1);
 }
 
+/********************************* SIMIX **************************************/
 
 /**
- * \brief Initialize some SIMIX internal data.
+ * \brief Initialize SIMIX internal data.
  *
  * \param argc Argc
  * \param argv Argv
@@ -119,8 +48,15 @@ void SIMIX_global_init(int *argc, char **argv)
   s_smx_process_t proc;
 
   if (!simix_global) {
-    surf_init(argc, argv);      /* Initialize some common structures. Warning, it sets simix_global=NULL */
-    simix_cfg_init(argc, argv);
+    /* Connect our log channels: that must be done manually under windows */
+    XBT_LOG_CONNECT(simix_action, simix);
+    XBT_LOG_CONNECT(simix_deployment, simix);
+    XBT_LOG_CONNECT(simix_environment, simix);
+    XBT_LOG_CONNECT(simix_host, simix);
+    XBT_LOG_CONNECT(simix_kernel, simix);
+    XBT_LOG_CONNECT(simix_process, simix);
+    XBT_LOG_CONNECT(simix_synchro, simix);
+    XBT_LOG_CONNECT(simix_context, simix);
 
     simix_global = xbt_new0(s_SIMIX_Global_t, 1);
 
@@ -129,15 +65,28 @@ void SIMIX_global_init(int *argc, char **argv)
       xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
     simix_global->process_list =
       xbt_swag_new(xbt_swag_offset(proc, process_hookup));
+    simix_global->process_to_destroy =
+      xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+
     simix_global->current_process = NULL;
+    simix_global->maestro_process = NULL;
     simix_global->registered_functions = xbt_dict_new();
 
     simix_global->create_process_function = NULL;
     simix_global->kill_process_function = NULL;
     simix_global->cleanup_process_function = SIMIX_process_cleanup;
 
+    SIMIX_context_mod_init();
+    SIMIX_create_maestro_process();
+
+    /* context exception handlers */
+    __xbt_ex_ctx = SIMIX_process_get_exception;
+    __xbt_ex_terminate = SIMIX_process_exception_terminate;
+
+
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
+    surf_init(argc, argv);      /* Initialize SURF structures */
   }
 }
 
@@ -154,34 +103,31 @@ void SIMIX_display_process_status(void)
   INFO0
     ("Legend of the following listing: \"<process> on <host>: <status>.\"");
   xbt_swag_foreach(process, simix_global->process_list) {
-    smx_simdata_process_t p_simdata =
-      (smx_simdata_process_t) process->simdata;
-    // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
     char *who, *who2;
 
     asprintf(&who, "%s on %s: %s",
              process->name,
-             p_simdata->smx_host->name,
-             (process->simdata->blocked) ? "[BLOCKED] "
-             : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
+             process->smx_host->name,
+             (process->blocked) ? "[BLOCKED] "
+             : ((process->suspended) ? "[SUSPENDED] " : ""));
 
-    if (p_simdata->mutex) {
+    if (process->mutex) {
       who2 =
         bprintf("%s Blocked on mutex %p", who,
                 (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-                p_simdata->mutex : (void *) 0xdead);
+                process->mutex : (void *) 0xdead);
       free(who);
       who = who2;
-    } else if (p_simdata->cond) {
+    } else if (process->cond) {
       who2 =
         bprintf
         ("%s Blocked on condition %p; Waiting for the following actions:",
          who,
          (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-         p_simdata->cond : (void *) 0xdead);
+         process->cond : (void *) 0xdead);
       free(who);
       who = who2;
-      xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
+      xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
         who2 =
           bprintf("%s '%s'(%p)", who, act->name,
                   (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
@@ -189,6 +135,24 @@ void SIMIX_display_process_status(void)
         free(who);
         who = who2;
       }
+    } else if (process->sem) {
+      who2 =
+        bprintf
+        ("%s Blocked on semaphore %p; Waiting for the following actions:",
+         who,
+         (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+         process->sem : (void *) 0xdead);
+      free(who);
+      who = who2;
+      xbt_fifo_foreach(process->sem->actions, item, act, smx_action_t) {
+        who2 =
+          bprintf("%s '%s'(%p)", who, act->name,
+                  (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
+                  ? act : (void *) 0xdead);
+        free(who);
+        who = who2;
+      }
+
     } else {
       who2 =
         bprintf
@@ -230,7 +194,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
         xbt_swag_foreach(process, cond->sleeping) {
           DEBUG2("\t preparing to wake up %s on %s",
-                 process->name, process->simdata->smx_host->name);
+                 process->name, process->smx_host->name);
         }
         SIMIX_cond_broadcast(cond);
         /* remove conditional from action */
@@ -245,7 +209,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
         xbt_swag_foreach(process, cond->sleeping) {
           DEBUG2("\t preparing to wake up %s on %s",
-                 process->name, process->simdata->smx_host->name);
+                 process->name, process->smx_host->name);
         }
         SIMIX_cond_broadcast(cond);
         /* remove conditional from action */
@@ -258,23 +222,19 @@ void __SIMIX_main(void)
 
 /**
  * \brief Kill all running process
- *
+ *  Only maestro can kill everyone :)
  */
 void SIMIX_process_killall()
 {
   smx_process_t p = NULL;
-  smx_process_t self = SIMIX_process_self();
+  xbt_assert0((simix_global->current_process ==
+               simix_global->maestro_process),
+              "You are not supposed to run this function here!");
 
-  while ((p = xbt_swag_extract(simix_global->process_list))) {
-    if (p != self)
-      SIMIX_process_kill(p);
-  }
-
-  xbt_context_empty_trash();
+  while ((p = xbt_swag_extract(simix_global->process_list)))
+    SIMIX_process_kill(p);
 
-  if (self) {
-    xbt_context_yield();
-  }
+  SIMIX_process_empty_trash();
 
   return;
 }
@@ -282,26 +242,40 @@ void SIMIX_process_killall()
 /**
  * \brief Clean the SIMIX simulation
  *
- * This functions remove all memories needed to the SIMIX execution
+ * This functions remove the memory used by SIMIX
  */
 void SIMIX_clean(void)
 {
-  smx_process_t p = NULL;
+  /* Kill everyone (except maestro) */
+  SIMIX_process_killall();
 
-  while ((p = xbt_swag_extract(simix_global->process_list))) {
-    SIMIX_process_kill(p);
-  }
-
-  xbt_dict_free(&(simix_global->host));
+  /* Free the remaining data structures */
   xbt_swag_free(simix_global->process_to_run);
+  xbt_swag_free(simix_global->process_to_destroy);
   xbt_swag_free(simix_global->process_list);
+  simix_global->process_list = NULL;
+  simix_global->process_to_destroy = NULL;
   xbt_dict_free(&(simix_global->registered_functions));
-  simix_config_finalize();
-  free(simix_global);
-  simix_global = NULL;
+  xbt_dict_free(&(simix_global->host));
+
+  /* Let's free maestro now */
+  SIMIX_context_free(simix_global->maestro_process->context);
+  xbt_free(simix_global->maestro_process->exception);
+  xbt_free(simix_global->maestro_process);
+  simix_global->maestro_process = NULL;
+
+  /* Restore the default exception setup */
+  __xbt_ex_ctx = &__xbt_ex_ctx_default;
+  __xbt_ex_terminate = &__xbt_ex_terminate_default;
+
+  /* Finish context module and SURF */
+  SIMIX_context_mod_exit();
 
   surf_exit();
 
+  xbt_free(simix_global);
+  simix_global = NULL;
+
   return;
 }
 
@@ -311,7 +285,7 @@ void SIMIX_clean(void)
  *
  * \return Return the clock.
  */
-double SIMIX_get_clock(void)
+XBT_INLINE double SIMIX_get_clock(void)
 {
   return surf_get_clock();
 }
@@ -321,7 +295,7 @@ double SIMIX_get_clock(void)
  *
  *      Must be called before the first call to SIMIX_solve()
  */
-void SIMIX_init(void)
+XBT_INLINE void SIMIX_init(void)
 {
   surf_presolve();
 }
@@ -341,19 +315,16 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   unsigned int iter;
   double elapsed_time = 0.0;
   static int state_modifications = 1;
+  int actions_on_system = 0;
 
-  xbt_context_empty_trash();
+  SIMIX_process_empty_trash();
   if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
     DEBUG0("**************************************************");
   }
 
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
-    DEBUG2("Scheduling %s on %s",
-           process->name, process->simdata->smx_host->name);
-    simix_global->current_process = process;
-    xbt_context_schedule(process->simdata->context);
-    /*       fflush(NULL); */
-    simix_global->current_process = NULL;
+    DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+    SIMIX_process_schedule(process);
   }
 
   {
@@ -365,20 +336,27 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
     void *arg = NULL;
 
     xbt_dynar_foreach(model_list, iter, model) {
-      if (xbt_swag_size(model->common_public->states.failed_action_set)
-          || xbt_swag_size(model->common_public->states.done_action_set)) {
+      if (xbt_swag_size(model->states.failed_action_set)
+          || xbt_swag_size(model->states.done_action_set)) {
         state_modifications = 1;
         break;
       }
+      if (xbt_swag_size(model->states.running_action_set)
+          || xbt_swag_size(model->states.ready_action_set)) {
+        actions_on_system = 1;
+      }
     }
-
-    if (!state_modifications) {
+    /* only calls surf_solve if there are actions to run */
+    if (!state_modifications && actions_on_system) {
       DEBUG1("%f : Calling surf_solve", SIMIX_get_clock());
       elapsed_time = surf_solve();
       DEBUG1("Elapsed_time %f", elapsed_time);
     }
 
-    while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
+    actions_on_system = 0;
+    while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
+      /* change in process, don't quit */
+      actions_on_system = 1;
       DEBUG2("got %p %p", fun, arg);
       if (fun == SIMIX_process_create) {
         smx_process_arg_t args = arg;
@@ -387,42 +365,86 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                                        args->data, args->hostname,
                                        args->argc, args->argv,
                                        args->properties);
+        /* verify if process has been created */
+        if (!process) {
+          xbt_free(args);
+          continue;
+        }
+
         if (args->kill_time > SIMIX_get_clock()) {
-          surf_timer_model->extension_public->set(args->kill_time, (void *)
+          surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                &SIMIX_process_kill,
+                                                (void *) process);
+        }
+        xbt_free(args);
+      } else if (fun == simix_global->create_process_function) {
+        smx_process_arg_t args = arg;
+        DEBUG2("Launching %s on %s", args->name, args->hostname);
+        process =
+          (*simix_global->create_process_function) (args->name, args->code,
+                                                    args->data,
+                                                    args->hostname,
+                                                    args->argc, args->argv,
+                                                    args->properties);
+        /* verify if process has been created */
+        if (!process) {
+          xbt_free(args);
+          continue;
+        }
+        if (args->kill_time > SIMIX_get_clock()) {
+          if (simix_global->kill_process_function)
+            surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                  simix_global->
+                                                  kill_process_function,
+                                                  process);
+          else
+            surf_timer_model->extension.timer.set(args->kill_time, (void *)
                                                   &SIMIX_process_kill,
                                                   (void *) process);
         }
         xbt_free(args);
-      }
-      if (fun == SIMIX_process_kill) {
+      } else if (fun == SIMIX_process_kill) {
         process = arg;
-        DEBUG2("Killing %s on %s", process->name,
-               process->simdata->smx_host->name);
+        DEBUG2("Killing %s on %s", process->name, process->smx_host->name);
         SIMIX_process_kill(process);
+      } else if (fun == simix_global->kill_process_function) {
+        process = arg;
+        (*simix_global->kill_process_function) (process);
+      } else {
+        THROW_IMPOSSIBLE;
       }
     }
 
     /* Wake up all process waiting for the action finish */
     xbt_dynar_foreach(model_list, iter, model) {
-      while ((action =
-              xbt_swag_extract(model->common_public->
-                               states.failed_action_set))) {
+      /* stop simulation case there are no actions to run */
+      if ((xbt_swag_size(model->states.running_action_set)) ||
+          (xbt_swag_size(model->states.ready_action_set)) ||
+          (xbt_swag_size(model->states.done_action_set)) ||
+          (xbt_swag_size(model->states.failed_action_set)))
+        actions_on_system = 1;
+
+      while ((action = xbt_swag_extract(model->states.failed_action_set))) {
         smx_action = action->data;
         if (smx_action) {
-          xbt_fifo_unshift(actions_failed, smx_action);
+          SIMIX_action_signal_all(smx_action);
         }
       }
-      while ((action =
-              xbt_swag_extract(model->common_public->
-                               states.done_action_set))) {
+      while ((action = xbt_swag_extract(model->states.done_action_set))) {
         smx_action = action->data;
         if (smx_action) {
-          xbt_fifo_unshift(actions_done, smx_action);
+          /* Copy the transfered data of the completed communication actions */
+          /* FIXME: find a better way to determine if its a comm action */
+          if(smx_action->data != NULL)
+            SIMIX_network_copy_data((smx_comm_t)smx_action->data);
+          SIMIX_action_signal_all(smx_action);      
         }
       }
     }
   }
   state_modifications = 0;
+  if (!actions_on_system)
+    elapsed_time = -1;
 
   if (elapsed_time == -1) {
     if (xbt_swag_size(simix_global->process_list) == 0) {
@@ -450,14 +472,14 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
  * 	\param arg Parameters of the function
  *
  */
-void SIMIX_timer_set(double date, void *function, void *arg)
+XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg)
 {
-  surf_timer_model->extension_public->set(date, function, arg);
+  surf_timer_model->extension.timer.set(date, function, arg);
 }
 
-int SIMIX_timer_get(void **function, void **arg)
+XBT_INLINE int SIMIX_timer_get(void **function, void **arg)
 {
-  return surf_timer_model->extension_public->get(function, arg);
+  return surf_timer_model->extension.timer.get(function, arg);
 }
 
 /**
@@ -467,7 +489,7 @@ int SIMIX_timer_get(void **function, void **arg)
  *	\param function Create process function
  *
  */
-void SIMIX_function_register_process_create(smx_creation_func_t function)
+XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t function)
 {
   xbt_assert0((simix_global->create_process_function == NULL),
               "Data already set");
@@ -482,7 +504,7 @@ void SIMIX_function_register_process_create(smx_creation_func_t function)
  *	\param function Kill process function
  *
  */
-void SIMIX_function_register_process_kill(void_f_pvoid_t function)
+XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t function)
 {
   xbt_assert0((simix_global->kill_process_function == NULL),
               "Data already set");
@@ -497,7 +519,7 @@ void SIMIX_function_register_process_kill(void_f_pvoid_t function)
  *	\param function cleanup process function
  *
  */
-void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
+XBT_INLINE void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
 {
   simix_global->cleanup_process_function = function;
 }