Fix segmentation faults

diff --git a/src/surf/network.c b/src/surf/network.c
index 2366019..73d6095 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -797,6 +797,9 @@ static void surf_network_model_init_internal(void)
   surf_network_model->suspend = surf_action_suspend;
   surf_network_model->resume = surf_action_resume;
   surf_network_model->is_suspended = surf_action_is_suspended;
+
+  xbt_assert(surf_cpu_model_pm);
+  xbt_assert(surf_cpu_model_vm);
   surf_cpu_model_pm->set_max_duration = surf_action_set_max_duration;
   surf_cpu_model_vm->set_max_duration = surf_action_set_max_duration;
 

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 1aa3463..6227ea2 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -217,6 +217,9 @@ void surf_network_model_init_Constant()
   surf_network_model->suspend = netcste_action_suspend;
   surf_network_model->resume = netcste_action_resume;
   surf_network_model->is_suspended = netcste_action_is_suspended;
+
+  xbt_assert(surf_cpu_model_pm);
+  xbt_assert(surf_cpu_model_vm);
   surf_cpu_model_pm->set_max_duration = surf_action_set_max_duration;
   surf_cpu_model_vm->set_max_duration = surf_action_set_max_duration;
 

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index e1c0469..fc7919d 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -132,8 +132,8 @@ static void vm_ws_destroy(void *ind_vm_workstation)
        /* this will call surf_resource_free() */
        xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
 
-       xbt_free(vm_ws->ws.generic_resource.name);
-       xbt_free(vm_ws);
+  /* NOTE: surf_resource_free() frees vm_ws->ws.generic_resource.name and
+   * vm_ws->ws. Do not free them here. */
 }
 
 static int vm_ws_get_state(void *ind_vm_ws){
@@ -145,11 +145,11 @@ static void vm_ws_set_state(void *ind_vm_ws, int state){
 }
 
 
-// TODO Please fix it (if found is wrong, nothing is returned)
 static double get_solved_value(surf_action_t cpu_action)
 {
   int found = 0;
-  lmm_system_t pm_system = surf_workstation_model->model_private->maxmin_system;
+  /* NOTE: Do not use surf_workstation_model's maxmin_system. It is not used. */
+  lmm_system_t pm_system = surf_cpu_model_pm->model_private->maxmin_system;
   lmm_variable_t var = NULL;
 
   xbt_swag_foreach(var, &pm_system->variable_set) {
@@ -164,6 +164,8 @@ static double get_solved_value(surf_action_t cpu_action)
     return var->value;
 
   XBT_CRITICAL("bug: cannot found the solved variable of the action %p", cpu_action);
+  DIE_IMPOSSIBLE;
+  return -1; /* NOT REACHED */
 }
 
 
@@ -172,10 +174,10 @@ static double vm_ws_share_resources(surf_model_t workstation_model, double now)
   /* 0. Make sure that we already calculated the resource share at the physical
    * machine layer. */
   {
-    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);
+    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");
-
+ 
     /* Another option is that we call sub_ws->share_resource() here. The
      * share_resource() function has no side-effect. We can call it here to
      * ensure that. */
@@ -254,6 +256,7 @@ static void surf_vm_workstation_model_init_internal(void)
   model->name = "Virtual Workstation";
   model->type = SURF_MODEL_TYPE_VM_WORKSTATION;
 
+  xbt_assert(surf_cpu_model_vm);
   model->extension.workstation.cpu_model = surf_cpu_model_vm;
 
   model->extension.vm_workstation.create        = vm_ws_create;

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 47fd18f..82c2188 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -432,6 +432,7 @@ static void surf_workstation_model_init_internal(void)
   /* For VM support, we have a surf cpu model object for each workstation model
    * object. The physical workstation model object has the cpu model object of
    * the physical machine layer. */
+  xbt_assert(surf_cpu_model_pm);
   model->extension.workstation.cpu_model = surf_cpu_model_pm;
 
   model->extension.workstation.execute   = ws_execute;
@@ -461,13 +462,15 @@ static void surf_workstation_model_init_internal(void)
 
 void surf_workstation_model_init_current_default(void)
 {
-
-  surf_workstation_model_init_internal();
-
   xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", 1);
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
+  /* surf_cpu_mode_pm and surf_network_model must be initialized in advance. */
+  xbt_assert(surf_cpu_model_pm);
+  xbt_assert(surf_network_model);
+  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);
@@ -476,9 +479,9 @@ void surf_workstation_model_init_current_default(void)
 
 void surf_workstation_model_init_compound()
 {
-
   xbt_assert(surf_cpu_model_pm, "No CPU model defined yet!");
   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);

diff --git a/src/surf/workstation_private.h b/src/surf/workstation_private.h
index 7f157f2..d454d01 100644 (file)
--- a/src/surf/workstation_private.h
+++ b/src/surf/workstation_private.h
@@ -12,7 +12,7 @@ typedef struct workstation_CLM03 {
   xbt_dynar_t storage;
 } s_workstation_CLM03_t, *workstation_CLM03_t;
 
-void __init_ws(workstation_CLM03_t ws,  const char *id, int level);
+void __init_workstation_CLM03(workstation_CLM03_t ws, const char *id);
 
 int ws_resource_used(void *resource_id);
 double ws_share_resources(surf_model_t workstation_model, double now);