remove the create_resource entry point in resource model APIs

[simgrid.git] / src / surf / surf_model.c

diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c
index 7713410..da1bdd7 100644 (file)
--- a/src/surf/surf_model.c
+++ b/src/surf/surf_model.c
@@ -16,6 +16,7 @@ static void void_die_impossible_paction(surf_action_t action)
 static int int_die_impossible_paction(surf_action_t action)
 {
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 /** @brief initialize common datastructures to all models */
@@ -27,14 +28,13 @@ surf_model_t surf_model_init(void)
   model->model_private = xbt_new0(s_surf_model_private_t, 1);
 
   model->states.ready_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
+      xbt_swag_new(xbt_swag_offset(action, state_hookup));
   model->states.running_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
+      xbt_swag_new(xbt_swag_offset(action, state_hookup));
   model->states.failed_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
+      xbt_swag_new(xbt_swag_offset(action, state_hookup));
   model->states.done_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->resource_set = xbt_dict_new();
+      xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   model->action_unref = int_die_impossible_paction;
   model->action_cancel = void_die_impossible_paction;
@@ -46,9 +46,14 @@ surf_model_t surf_model_init(void)
   model->action_get_finish_time = surf_action_get_finish_time;
   model->action_data_set = surf_action_data_set;
 
+  model->model_private->modified_set = NULL;
+  model->model_private->action_heap = NULL;
+  model->model_private->update_mechanism = UM_UNDEFINED;
+  model->model_private->selective_update = 0;
 
   return model;
 }
+
 /** @brief finalize common datastructures to all models */
 void surf_model_exit(surf_model_t model)
 {
@@ -56,14 +61,6 @@ void surf_model_exit(surf_model_t model)
   xbt_swag_free(model->states.running_action_set);
   xbt_swag_free(model->states.failed_action_set);
   xbt_swag_free(model->states.done_action_set);
-  xbt_dict_free(&model->resource_set);
   free(model->model_private);
   free(model);
 }
-
-void *surf_model_resource_by_name(surf_model_t model, const char *name)
-{
-  return xbt_dict_get_or_null(model->resource_set, name);
-}
-
-