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 with master and fix conflicts
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.c
diff --git
a/src/simdag/sd_daxloader.c
b/src/simdag/sd_daxloader.c
index
a4364e7
..
29803e9
100644
(file)
--- a/
src/simdag/sd_daxloader.c
+++ b/
src/simdag/sd_daxloader.c
@@
-37,17
+37,6
@@
static double dax_parse_double(const char *string)
return value;
}
return value;
}
-static int dax_parse_int(const char *string)
-{
- int ret = 0;
- int value;
-
- ret = sscanf(string, "%d", &value);
- if (ret != 1)
- dax_parse_error(bprintf("%s is not an integer", string));
- return value;
-}
-
/* Ensure that transfer tasks have unique names even though a file is used
* several times */
/* Ensure that transfer tasks have unique names even though a file is used
* several times */
@@
-254,16
+243,6
@@
static xbt_dict_t files;
static SD_task_t current_job;
static SD_task_t root_task, end_task;
static SD_task_t current_job;
static SD_task_t root_task, end_task;
-static void dump_res()
-{
- unsigned int cursor;
- SD_task_t task;
- xbt_dynar_foreach(result, cursor, task) {
- XBT_INFO("Task %u", cursor);
- SD_task_dump(task);
- }
-}
-
static void dax_task_free(void *task)
{
SD_task_t t = task;
static void dax_task_free(void *task)
{
SD_task_t t = task;
@@
-325,7
+304,7
@@
xbt_dynar_t SD_daxload(const char *filename)
const char *category = depafter->src->category;
if (category){
TRACE_category (category);
const char *category = depafter->src->category;
if (category){
TRACE_category (category);
-
SD_task_set_category
(newfile, category);
+
TRACE_sd_set_task_category
(newfile, category);
}
}
#endif
}
}
#endif
@@
-341,7
+320,7
@@
xbt_dynar_t SD_daxload(const char *filename)
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
-
SD_task_set_category
(newfile, category);
+
TRACE_sd_set_task_category
(newfile, category);
}
}
#endif
}
}
#endif
@@
-363,7
+342,7
@@
xbt_dynar_t SD_daxload(const char *filename)
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
-
SD_task_set_category
(newfile, category);
+
TRACE_sd_set_task_category
(newfile, category);
}
}
#endif
}
}
#endif
@@
-418,7
+397,7
@@
void STag_dax__job(void)
char *category = A_dax__job_name;
if (category){
TRACE_category (category);
char *category = A_dax__job_name;
if (category){
TRACE_category (category);
-
SD_task_set
_category(current_job, category);
+
TRACE_sd_set_task
_category(current_job, category);
}
#endif
xbt_dict_set(jobs, A_dax__job_id, current_job, NULL);
}
#endif
xbt_dict_set(jobs, A_dax__job_id, current_job, NULL);