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 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.c
diff --git
a/src/simdag/sd_daxloader.c
b/src/simdag/sd_daxloader.c
index
2bbd2c7
..
29803e9
100644
(file)
--- a/
src/simdag/sd_daxloader.c
+++ b/
src/simdag/sd_daxloader.c
@@
-8,6
+8,7
@@
#include "simdag/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
#include "simdag/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
+#include <libgen.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
@@
-22,7
+23,7
@@
bool parents_are_marked(SD_task_t task);
static void dax_parse_error(char *msg)
{
fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg);
static void dax_parse_error(char *msg)
{
fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg);
- abort();
+
xbt_
abort();
}
static double dax_parse_double(const char *string)
}
static double dax_parse_double(const char *string)
@@
-36,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 */
@@
-253,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;
@@
-324,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
@@
-340,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
@@
-362,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
@@
-386,7
+366,7
@@
xbt_dynar_t SD_daxload(const char *filename)
if (!acyclic_graph_detail(result)){
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
if (!acyclic_graph_detail(result)){
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
-
filename
);
+
basename((char*)filename)
);
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
@@
-417,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);