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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 2adc9cb709..7df72d6e62 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -135,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
@@ -209,7 +227,8 @@ void __SIMIX_main(void)
 void SIMIX_process_killall()
 {
   smx_process_t p = NULL;
-  xbt_assert0((simix_global->current_process == simix_global->maestro_process),
+  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)))
@@ -230,7 +249,7 @@ void SIMIX_clean(void)
   /* Kill everyone (except maestro) */
   SIMIX_process_killall();
 
-  /* Free the remaining data structures*/
+  /* 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);
@@ -242,13 +261,13 @@ void SIMIX_clean(void)
   /* 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);  
+  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();
 
@@ -266,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();
 }
@@ -276,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();
 }
@@ -296,9 +315,11 @@ 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;
 
   SIMIX_process_empty_trash();
-  if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
+  if (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_debug) &&
+      xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
     DEBUG0("**************************************************");
   }
 
@@ -321,15 +342,22 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
         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);
     }
 
+    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;
@@ -338,38 +366,86 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                                        args->data, args->hostname,
                                        args->argc, args->argv,
                                        args->properties);
-        if (process && args->kill_time > SIMIX_get_clock()) {
+        /* verify if process has been created */
+        if (!process) {
+          xbt_free(args);
+          continue;
+        }
+
+        if (args->kill_time > SIMIX_get_clock()) {
           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_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);
+      } else if (fun == SIMIX_process_kill) {
         process = arg;
-        DEBUG2("Killing %s on %s", process->name,
-               process->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) {
+      /* 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->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) {
@@ -397,12 +473,12 @@ 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.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.timer.get(function, arg);
 }
@@ -414,7 +490,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");
@@ -429,7 +505,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");
@@ -444,7 +520,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;
 }