A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error on variable name
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
fbd51c2
..
8c3be87
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010, 2011
. The SimGrid Team.
+/* Copyright (c) 2004
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-401,7
+401,7
@@
void surf_init(int *argc, char **argv)
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
storage_type_lib = xbt_lib_new();
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
storage_type_lib = xbt_lib_new();
- watched_hosts_lib = xbt_dict_new
(
);
+ watched_hosts_lib = xbt_dict_new
_homogeneous(NULL
);
XBT_DEBUG("Add routing levels");
ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
XBT_DEBUG("Add routing levels");
ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
@@
-466,6
+466,11
@@
void surf_exit(void)
unsigned int iter;
surf_model_t model = NULL;
unsigned int iter;
surf_model_t model = NULL;
+#ifdef HAVE_TRACING
+ TRACE_end(); /* Just in case it was not called by the upper
+ * layer (or there is no upper layer) */
+#endif
+
sg_config_finalize();
xbt_dynar_foreach(model_list, iter, model)
sg_config_finalize();
xbt_dynar_foreach(model_list, iter, model)
@@
-488,7
+493,7
@@
void surf_exit(void)
xbt_free(surf_mins);
surf_mins = NULL;
#endif
xbt_free(surf_mins);
surf_mins = NULL;
#endif
-
if(host_that_restart)
xbt_dynar_free(&host_that_restart);
+ xbt_dynar_free(&host_that_restart);
xbt_dynar_free(&surf_path);
xbt_lib_free(&host_lib);
xbt_dynar_free(&surf_path);
xbt_lib_free(&host_lib);