SURF: Embeed every fields of common_public directly into s_surf_model_t

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 9d261b1..267302b 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -299,8 +299,8 @@ 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;
       }
@@ -312,7 +312,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
       DEBUG1("Elapsed_time %f", elapsed_time);
     }
 
-    while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
+    while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
       DEBUG2("got %p %p", fun, arg);
       if (fun == SIMIX_process_create) {
         smx_process_arg_t args = arg;
@@ -322,9 +322,9 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                                        args->argc, args->argv,
                                        args->properties);
         if (process && args->kill_time > SIMIX_get_clock()) {
-          surf_timer_model->extension_public->set(args->kill_time, (void *)
-                                                  &SIMIX_process_kill,
-                                                  (void *) process);
+          surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                &SIMIX_process_kill,
+                                                (void *) process);
         }
         xbt_free(args);
       }
@@ -338,17 +338,13 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 
     /* 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))) {
+      while ((action = xbt_swag_extract(model->states.failed_action_set))) {
         smx_action = action->data;
         if (smx_action) {
           xbt_fifo_unshift(actions_failed, 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);
@@ -386,12 +382,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_model->extension_public->set(date, function, arg);
+  surf_timer_model->extension.timer.set(date, function, arg);
 }
 
 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);
 }
 
 /**