add model_list_invoke used for solving a problem

The callback function (i.e., share_resouces) of cpu_model and
network_model is now called from those of these workstation models.
They are not directly called from surf_solve(). model_list_invoke will
contain only surf_workstation and surf_vm_workstation.

- xbt_dynar_t model_list: for destroying all models correctly
- xbt_dynar_t model_list_invoke: for invoking the callback

FIXME: There might be other callbacks that should be called in the
iteration of model_list_invoke, not model_list. Update code if
neccessary.

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index ef4d9d7..4df91b1 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -682,6 +682,7 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_new_model_description[];
  *  \brief List of initialized models
  */
 XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) model_list_invoke;
 
 /*******************************************/
 /*** SURF Globals **************************/

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 233706a..af82043 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -284,6 +284,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
 
+    /* FIXME: shoud look at model_list or model_list_invoke? */
     /* let's see which tasks are done */
     xbt_dynar_foreach(model_list, iter, model) {
       while ((action = xbt_swag_extract(model->states.done_action_set))) {

diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index cd8fccd..7b28931 100644 (file)
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -436,6 +436,10 @@ void surf_cpu_model_init_Cas01()
 
   surf_cpu_model_init_internal();
   cpu_define_callbacks();
+
+  /* cpu_model is registered only to model_list, and not to
+   * model_list_invoke. The shared_resource callback function will be called
+   * from that of the workstation model. */
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 335351e..f520c98 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -110,7 +110,11 @@ int __surf_is_absolute_file_path(const char *file_path)
 
 double NOW = 0;
 
-xbt_dynar_t model_list = NULL;
+/* model_list_invoke contains only surf_workstation and surf_vm_workstation.
+ * The callback functions of cpu_model and network_model will be called from
+ * those of these workstation models. */
+xbt_dynar_t model_list = NULL; /* for destroying all models correctly */
+xbt_dynar_t model_list_invoke = NULL;  /* for invoking callbacks */
 tmgr_history_t history = NULL;
 lmm_system_t maxmin_system = NULL;
 xbt_dynar_t surf_path = NULL;
@@ -415,6 +419,8 @@ void surf_init(int *argc, char **argv)
   xbt_init(argc, argv);
   if (!model_list)
     model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
+  if (!model_list_invoke)
+    model_list_invoke = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
   if (!history)
     history = tmgr_history_new();
 
@@ -470,6 +476,9 @@ void surf_exit(void)
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->finalize();
   xbt_dynar_free(&model_list);
+
+  xbt_dynar_free(&model_list_invoke);
+
   routing_exit();
 
   if (maxmin_system) {
@@ -530,6 +539,8 @@ void surf_presolve(void)
       }
     }
   }
+
+  /* FIXME: see what is check_update_action_state(). if necessary, use model_list_invoke. */
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->update_actions_state(NOW, 0.0);
 }
@@ -552,7 +563,7 @@ double surf_solve(double max_date)
   XBT_DEBUG("Looking for next action end for all models except NS3");
 
   if (surf_mins == NULL) {
-    surf_mins = xbt_new(double, xbt_dynar_length(model_list));
+    surf_mins = xbt_new(double, xbt_dynar_length(model_list_invoke));
   }
   surf_min_index = 0;
 
@@ -560,20 +571,20 @@ double surf_solve(double max_date)
   if (surf_get_nthreads() > 1) {
     /* parallel version */
 #ifdef CONTEXT_THREADS
-    xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+    xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list_invoke);
 #else
     xbt_die("Asked to run in parallel, but no thread at hand...");
 #endif
   }
   else {
     /* sequential version */
-    xbt_dynar_foreach(model_list, iter, model) {
+    xbt_dynar_foreach(model_list_invoke, iter, model) {
       surf_share_resources(model);
     }
   }
 
   unsigned i;
-  for (i = 0; i < xbt_dynar_length(model_list); i++) {
+  for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) {
     if ((min < 0.0 || surf_mins[i] < min)
         && surf_mins[i] >= 0.0) {
       min = surf_mins[i];
@@ -652,6 +663,7 @@ double surf_solve(double max_date)
 #endif
   }
   else {
+    /* FIXME: model_list or model_list_invoke? revisit here later */
     /* sequential version */
     xbt_dynar_foreach(model_list, iter, model) {
       surf_update_actions_state(model);

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index 71dc8a9..3eec48a 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -103,8 +103,14 @@ static void vm_ws_set_state(void *ind_vm_ws, int state){
 
 static double ws_share_resources(double now)
 {
-   // Can be obsolete if you right can ensure that ws_model has been code previously
-   // invoke ws_share_resources on the physical_lyer: sub_ws->ws_share_resources()
+  // Can be obsolete if you right can ensure that ws_model has been code previously
+  // invoke ws_share_resources on the physical_lyer: sub_ws->ws_share_resources()
+  {
+    unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, surf_workstation_model);
+    unsigned int index_of_vm_ws_model = xbt_dynar_search(model_list_invoke, surf_vm_workstation_model);
+    xbt_assert((index_of_pm_ws_model < index_of_vm_ws_model), "Cannot assume surf_workstation_model comes before");
+    /* we have to make sure that the share_resource() callback of the model of the lower layer must be called in advance. */
+  }
 
        // assign the corresponding value to X1, X2, ....
 
@@ -144,4 +150,5 @@ void surf_vm_workstation_model_init()
 {
   surf_vm_workstation_model_init_internal();
   xbt_dynar_push(model_list, &surf_vm_workstation_model);
+  xbt_dynar_push(model_list_invoke, &surf_vm_workstation_model);
 }

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 5e3a613..9d5a71a 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -454,6 +454,7 @@ void surf_workstation_model_init_current_default(void)
   surf_network_model_init_LegrandVelho();
 
   xbt_dynar_push(model_list, &surf_workstation_model);
+  xbt_dynar_push(model_list_invoke, &surf_workstation_model);
   sg_platf_host_add_cb(workstation_new);
 //  sg_platf_postparse_add_cb(create_workstations);
 }
@@ -465,6 +466,7 @@ void surf_workstation_model_init_compound()
   xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
   xbt_dynar_push(model_list, &surf_workstation_model);
+  xbt_dynar_push(model_list_invoke, &surf_workstation_model);
   sg_platf_host_add_cb(workstation_new);
 //  sg_platf_postparse_add_cb(create_workstations);
 }