X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac4e0d6a72781d6b567bd45cdb2de02aa4b41d67..26164f8a638ff3139ff0a776041ff805789199a9:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 0ac05fb90e..ecc9f70b08 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -13,9 +13,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 
-int use_sdp_solver = 0;
-int use_lagrange_solver = 0;
-
 /* Additional declarations for Windows potability. */
 
 #ifndef MAX_DRIVE
@@ -120,9 +117,6 @@ s_surf_model_description_t surf_network_model_description[] = {
   {"LegrandVelho", NULL, surf_network_model_init_LegrandVelho},
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
-#endif
-#ifdef HAVE_SDP
-  {"SDP", NULL, surf_network_model_init_SDP},
 #endif
   {"Reno", NULL, surf_network_model_init_Reno},
   {"Reno2", NULL, surf_network_model_init_Reno2},
@@ -235,16 +229,13 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange);
 XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy);
 XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin);
 XBT_LOG_EXTERNAL_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_CATEGORY(surf_trace);
 XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
 XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
 XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
 XBT_LOG_EXTERNAL_CATEGORY(surf_config);
 
 
-#ifdef HAVE_SDP
-XBT_LOG_EXTERNAL_CATEGORY(surf_sdp_out);
-XBT_LOG_EXTERNAL_CATEGORY(surf_sdp);
-#endif
 #ifdef HAVE_GTNETS
 XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 #endif
@@ -258,15 +249,12 @@ void surf_init(int *argc, char **argv)
   XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
   XBT_LOG_CONNECT(surf_maxmin, surf);
   XBT_LOG_CONNECT(surf_network, surf);
+  XBT_LOG_CONNECT(surf_trace, surf);
   XBT_LOG_CONNECT(surf_parse, surf);
   XBT_LOG_CONNECT(surf_timer, surf);
   XBT_LOG_CONNECT(surf_workstation, surf);
   XBT_LOG_CONNECT(surf_config, surf);
 
-#ifdef HAVE_SDP
-  XBT_LOG_CONNECT(surf_sdp_out, surf);
-  XBT_LOG_CONNECT(surf_sdp, surf);
-#endif
 #ifdef HAVE_GTNETS
   XBT_LOG_CONNECT(surf_network_gtnets, surf);
 #endif
@@ -280,45 +268,34 @@ void surf_init(int *argc, char **argv)
   surf_config_init(argc, argv);
 }
 
-static char *path_name = NULL;
+#ifdef WIN32
+# define FILE_DELIM "\\"
+#else
+# define FILE_DELIM "/" /* FIXME: move to better location */
+#endif
+
 FILE *surf_fopen(const char *name, const char *mode)
 {
-  unsigned int iter;
-  char *path = NULL;
+  unsigned int cpt;
+  char *path_elm = NULL;
+  char *buff;
   FILE *file = NULL;
-  unsigned int path_name_len = 0;       /* don't count '\0' */
-
-  xbt_assert0(name, "Need a non-NULL file name");
 
-  xbt_assert0(surf_path,
-              "surf_init has to be called before using surf_fopen");
+  xbt_assert(name);
 
-  if (__surf_is_absolute_file_path(name)) {     /* don't mess with absolute file names */
+  if (__surf_is_absolute_file_path(name))     /* don't mess with absolute file names */
     return fopen(name, mode);
 
-  } else {                      /* search relative files in the path */
+  /* search relative files in the path */
+  xbt_dynar_foreach(surf_path, cpt, path_elm) {
+    buff = bprintf("%s" FILE_DELIM "%s", path_elm,name);
+    file = fopen(buff, mode);
+    free(buff);
 
-    if (!path_name) {
-      path_name_len = strlen(name);
-      path_name = xbt_new0(char, path_name_len + 1);
-    }
-
-    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);
-      }
-#ifdef WIN32
-      sprintf(path_name, "%s\\%s", path, name);
-#else
-      sprintf(path_name, "%s/%s", path, name);
-#endif
-      file = fopen(path_name, mode);
-      if (file)
-        return file;
-    }
+    if (file)
+      return file;
   }
-  return file;
+  return NULL;
 }
 
 void surf_exit(void)
@@ -328,9 +305,9 @@ void surf_exit(void)
 
   surf_config_finalize();
 
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->finalize();
-  }
+  xbt_dynar_free(&model_list);
 
   if (maxmin_system) {
     lmm_system_free(maxmin_system);
@@ -340,18 +317,12 @@ void surf_exit(void)
     tmgr_history_free(history);
     history = NULL;
   }
-  if (model_list)
-    xbt_dynar_free(&model_list);
 
   if (surf_path)
     xbt_dynar_free(&surf_path);
 
   tmgr_finalize();
   surf_parse_lex_destroy();
-  if (path_name) {
-    free(path_name);
-    path_name = NULL;
-  }
   surf_parse_free_callbacks();
   xbt_dict_free(&route_table);
   NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
@@ -380,9 +351,8 @@ void surf_presolve(void)
                                                             NOW);
     }
   }
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->update_actions_state(NOW, 0.0);
-  }
 }
 
 double surf_solve(void)
@@ -439,9 +409,8 @@ double surf_solve(void)
 
   NOW = NOW + min;
 
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->update_actions_state(NOW, min);
-  }
 
   return min;
 }