updating the dtd and some memory leacks

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index aad2569..f3d3211 100644 (file)
--- 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;
@@ -364,7 +357,7 @@ FILE *surf_fopen(const char *name, const char *mode)
   int i;
   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");
 
@@ -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();
 }