X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/simdag/sd_dotloader.c diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index cc4edd1abb..fc32b2649d 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2009-2014. The SimGrid Team. +/* Copyright (c) 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" #include @@ -45,7 +45,6 @@ static void dot_task_p_free(void *task) { SD_task_destroy(*t); } -#ifdef HAVE_TRACING static void TRACE_sd_dotloader (SD_task_t task, const char *category) { if (category && strlen (category)){ if (task->category) @@ -57,7 +56,6 @@ static void TRACE_sd_dotloader (SD_task_t task, const char *category) { TRACE_sd_set_task_category(task, category); } } -#endif /** @brief loads a DOT file describing a DAG * @@ -192,9 +190,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){ } else { task = SD_task_create_comp_par_amdahl(name, NULL , amount, alpha); } -#ifdef HAVE_TRACING TRACE_sd_dotloader (task, agget (node, (char*)"category")); -#endif xbt_dict_set(jobs, name, task, NULL); if (!strcmp(name, "root")){ /* by design the root task is always SCHEDULABLE */ @@ -334,9 +330,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){ task = SD_task_create_comm_e2e(name, NULL , size); else task = SD_task_create_comm_par_mxn_1d_block(name, NULL , size); -#ifdef HAVE_TRACING TRACE_sd_dotloader (task, agget (node, (char*)"category")); -#endif SD_task_dependency_add(NULL, NULL, src, task); SD_task_dependency_add(NULL, NULL, task, dst); xbt_dict_set(jobs, name, task, NULL);