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
Merge branch 'master' into mc-process
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
e3f62b1
..
4af1362
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-43,9
+43,7
@@
SD_global_t sd_global = NULL;
*/
void SD_init(int *argc, char **argv)
{
*/
void SD_init(int *argc, char **argv)
{
-#ifdef HAVE_TRACING
TRACE_global_init(argc, argv);
TRACE_global_init(argc, argv);
-#endif
s_SD_task_t task;
s_SD_task_t task;
@@
-84,10
+82,6
@@
void SD_init(int *argc, char **argv)
xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model",
"ptask_L07");
xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model",
"ptask_L07");
-#ifdef HAVE_TRACING
- TRACE_start ();
-#endif
-
#ifdef HAVE_JEDULE
jedule_sd_init();
#endif
#ifdef HAVE_JEDULE
jedule_sd_init();
#endif
@@
-436,9
+430,7
@@
double SD_get_clock(void) {
*/
void SD_exit(void)
{
*/
void SD_exit(void)
{
-#ifdef HAVE_TRACING
TRACE_surf_resource_utilization_release();
TRACE_surf_resource_utilization_release();
-#endif
xbt_mallocator_free(sd_global->task_mallocator);
xbt_mallocator_free(sd_global->task_mallocator);
@@
-458,9
+450,7
@@
void SD_exit(void)
xbt_swag_free(sd_global->failed_task_set);
xbt_swag_free(sd_global->return_set);
xbt_swag_free(sd_global->failed_task_set);
xbt_swag_free(sd_global->return_set);
-#ifdef HAVE_TRACING
TRACE_end();
TRACE_end();
-#endif
xbt_free(sd_global);
sd_global = NULL;
xbt_free(sd_global);
sd_global = NULL;