* Cleanup the DTD by renaming:

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index ff96a3d..5e3f7a8 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -147,7 +147,7 @@ void SIMIX_display_process_status(void)
 
     asprintf(&who, "%s on %s: %s",
             process->name,
-            p_simdata->s_host->name,
+            p_simdata->smx_host->name,
             (process->simdata->blocked) ? "[BLOCKED] "
             : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
 
@@ -163,7 +163,7 @@ void SIMIX_display_process_status(void)
       free(who);
       who = who2;
       xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
-       who2 = bprintf("%s '%s'", who, act->name);
+       who2 = bprintf("%s '%s'(%p)", who, act->name,act);
        free(who);
        who = who2;
       }
@@ -221,11 +221,11 @@ 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->s_host->name);
+                process->name, process->simdata->smx_host->name);
        }
        SIMIX_cond_broadcast(cond);
        /* remove conditional from action */
-       xbt_fifo_remove(smx_action->cond_list, cond);
+       SIMIX_unregister_action_to_condition(smx_action, cond);
       }
     }
 
@@ -236,11 +236,11 @@ 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->s_host->name);
+                process->name, process->simdata->smx_host->name);
        }
        SIMIX_cond_broadcast(cond);
        /* remove conditional from action */
-       xbt_fifo_remove(smx_action->cond_list, cond);
+       SIMIX_unregister_action_to_condition(smx_action, cond);
       }
     }
   }
@@ -294,6 +294,7 @@ void SIMIX_clean(void)
   xbt_dict_free(&(simix_global->registered_functions));
   simix_config_finalize();
   free(simix_global);
+  simix_global = NULL;
   surf_exit();
 
   return;
@@ -337,7 +338,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   }
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
     DEBUG2("Scheduling %s on %s",
-          process->name, process->simdata->s_host->name);
+          process->name, process->simdata->smx_host->name);
     simix_global->current_process = process;
     xbt_context_schedule(process->simdata->context);
     /*       fflush(NULL); */
@@ -346,17 +347,18 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 
   {
     surf_action_t action = NULL;
-    surf_resource_t resource = NULL;
+    surf_model_t model = NULL;
     smx_action_t smx_action = NULL;
 
     void *fun = NULL;
     void *arg = NULL;
 
-    xbt_dynar_foreach(resource_list, i, resource) {
-      if (xbt_swag_size(resource->common_public->states.failed_action_set)
-         || xbt_swag_size(resource->common_public->states.
+    xbt_dynar_foreach(model_list, i, model) {
+      if (xbt_swag_size(model->common_public->states.failed_action_set)
+         || xbt_swag_size(model->common_public->states.
                           done_action_set)) {
        state_modifications = 1;
+        break;
       }
     }
 
@@ -366,16 +368,16 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
       DEBUG1("Elapsed_time %f", elapsed_time);
     }
 
-    while (surf_timer_resource->extension_public->get(&fun, (void *) &arg)) {
+    while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
       DEBUG2("got %p %p", fun, arg);
       if (fun == SIMIX_process_create) {
        smx_process_arg_t args = arg;
        DEBUG2("Launching %s on %s", args->name, args->hostname);
        process = SIMIX_process_create(args->name, args->code,
                                       args->data, args->hostname,
-                                      args->argc, args->argv);
+                                      args->argc, args->argv, args->properties);
        if (args->kill_time > SIMIX_get_clock()) {
-         surf_timer_resource->extension_public->set(args->kill_time,
+         surf_timer_model->extension_public->set(args->kill_time,
                                                     (void *)
                                                     &SIMIX_process_kill,
                                                     (void *) process);
@@ -385,15 +387,15 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
       if (fun == SIMIX_process_kill) {
        process = arg;
        DEBUG2("Killing %s on %s", process->name,
-              process->simdata->s_host->name);
+              process->simdata->smx_host->name);
        SIMIX_process_kill(process);
       }
     }
 
     /* Wake up all process waiting for the action finish */
-    xbt_dynar_foreach(resource_list, i, resource) {
+    xbt_dynar_foreach(model_list, i, model) {
       while ((action =
-             xbt_swag_extract(resource->common_public->states.
+             xbt_swag_extract(model->common_public->states.
                               failed_action_set))) {
        smx_action = action->data;
        if (smx_action) {
@@ -401,7 +403,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
        }
       }
       while ((action =
-             xbt_swag_extract(resource->common_public->states.
+             xbt_swag_extract(model->common_public->states.
                               done_action_set))) {
        smx_action = action->data;
        if (smx_action) {
@@ -440,12 +442,12 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
  */
 void SIMIX_timer_set(double date, void *function, void *arg)
 {
-  surf_timer_resource->extension_public->set(date, function, arg);
+  surf_timer_model->extension_public->set(date, function, arg);
 }
 
 int SIMIX_timer_get(void **function, void **arg)
 {
-  return surf_timer_resource->extension_public->get(function, arg);
+  return surf_timer_model->extension_public->get(function, arg);
 }
 
 /**
@@ -455,7 +457,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)
+void SIMIX_function_register_process_create(smx_creation_func_t function)
 {
   xbt_assert0((simix_global->create_process_function == NULL),
              "Data already set");
@@ -470,7 +472,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)
+void SIMIX_function_register_process_kill(void_f_pvoid_t function)
 {
   xbt_assert0((simix_global->kill_process_function == NULL),
              "Data already set");
@@ -485,7 +487,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)
+void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
 {
   simix_global->cleanup_process_function = function;
 }