X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a65bcaf6fb85551eb08cbaef7180f8f1a173a2b0..6fc3119abd6191409d110f9ba3625da1d13c1d1a:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index aad25692b9..fe4348c8de 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -190,16 +190,9 @@ int find_model_description(s_surf_model_description_t * table,
 }
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
-				      size_t offset)
-{
-  return generic_maxmin_share_resources2(running_actions, offset,
-					 maxmin_system, lmm_solve);
-}
-
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
-				       size_t offset,
-				       lmm_system_t sys,
-				       void (*solve) (lmm_system_t))
+				      size_t offset,
+				      lmm_system_t sys,
+				      void (*solve) (lmm_system_t))
 {
   surf_action_t action = NULL;
   double min = -1;
@@ -361,10 +354,10 @@ void surf_init(int *argc, char **argv)
 static char *path_name = NULL;
 FILE *surf_fopen(const char *name, const char *mode)
 {
-  int i;
+  unsigned int iter;
   char *path = NULL;
   FILE *file = NULL;
-  int path_name_len = 0;	/* don't count '\0' */
+  unsigned int path_name_len = 0;	/* don't count '\0' */
 
   xbt_assert0(name, "Need a non-NULL file name");
 
@@ -381,7 +374,7 @@ FILE *surf_fopen(const char *name, const char *mode)
       path_name = xbt_new0(char, path_name_len + 1);
     }
 
-    xbt_dynar_foreach(surf_path, i, path) {
+    xbt_dynar_foreach(surf_path, iter, path) {
       if (path_name_len < strlen(path) + strlen(name) + 1) {
 	path_name_len = strlen(path) + strlen(name) + 1;	/* plus '/' */
 	path_name = xbt_realloc(path_name, path_name_len + 1);
@@ -397,10 +390,10 @@ FILE *surf_fopen(const char *name, const char *mode)
 
 void surf_exit(void)
 {
-  int i;
+  unsigned int iter;
   surf_model_t model = NULL;
 
-  xbt_dynar_foreach(model_list, i, model) {
+  xbt_dynar_foreach(model_list, iter, model) {
     model->common_private->finalize();
   }
 
@@ -424,6 +417,8 @@ void surf_exit(void)
     free(path_name);
     path_name = NULL;
   }
+  surf_parse_free_callbacks();
+  NOW=0; /* Just in case the user plans to restart the simulation afterward */
   xbt_exit();
 }
 
@@ -438,7 +433,7 @@ double surf_solve(void)
   surf_model_object_t model_obj = NULL;
   surf_model_t model = NULL;
   tmgr_trace_event_t event = NULL;
-  int i;
+  unsigned int iter;
 
   if (first_run) {
     DEBUG0
@@ -454,7 +449,7 @@ double surf_solve(void)
 	    update_resource_state(model_obj, event, value);
       }
     }
-    xbt_dynar_foreach(model_list, i, model) {
+    xbt_dynar_foreach(model_list, iter, model) {
       model->common_private->update_actions_state(NOW, 0.0);
     }
     first_run = 0;
@@ -464,7 +459,7 @@ double surf_solve(void)
   min = -1.0;
 
   DEBUG0("Looking for next action end");
-  xbt_dynar_foreach(model_list, i, model) {
+  xbt_dynar_foreach(model_list, iter, model) {
     DEBUG1("Running for Resource [%s]", model->common_public->name);
     model_next_action_end =
 	model->common_private->share_resources(NOW);
@@ -507,7 +502,7 @@ double surf_solve(void)
 
   NOW = NOW + min;
 
-  xbt_dynar_foreach(model_list, i, model) {
+  xbt_dynar_foreach(model_list, iter, model) {
     model->common_private->update_actions_state(NOW, min);
   }