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 back master branch.
[simgrid.git]
/
examples
/
gras
/
replay
/
xbt_workload.c
diff --git
a/examples/gras/replay/xbt_workload.c
b/examples/gras/replay/xbt_workload.c
index
769d8b5
..
f3b3ddf
100644
(file)
--- a/
examples/gras/replay/xbt_workload.c
+++ b/
examples/gras/replay/xbt_workload.c
@@
-56,7
+56,7
@@
xbt_workload_elm_t xbt_workload_elm_parse(char *line)
res->action = XBT_WORKLOAD_COMPUTE;
sscanf(words[++i], "%lg", &(res->d_arg));
} else {
res->action = XBT_WORKLOAD_COMPUTE;
sscanf(words[++i], "%lg", &(res->d_arg));
} else {
- xbt_die(
bprintf("Unparsable command: %s (in %s)", words[i], line)
);
+ xbt_die(
"Unparsable command: %s (in %s)", words[i], line
);
}
i++;
if (words[i] && words[i][0] == '#') {
}
i++;
if (words[i] && words[i][0] == '#') {
@@
-119,7
+119,7
@@
char *xbt_workload_elm_to_string(xbt_workload_elm_t cmd)
free(addon);
break;
default:
free(addon);
break;
default:
- xbt_die(
bprintf("Unknown command %d in '%s...'", cmd->action, res)
);
+ xbt_die(
"Unknown command %d in '%s...'", cmd->action, res
);
}
if (cmd->comment) {
addon = bprintf(" (comment: %s)", cmd->comment);
}
if (cmd->comment) {
addon = bprintf(" (comment: %s)", cmd->comment);
@@
-157,7
+157,7
@@
xbt_dynar_t xbt_workload_parse_file(char *filename)
{
FILE *file_in;
file_in = fopen(filename, "r");
{
FILE *file_in;
file_in = fopen(filename, "r");
- xbt_assert
1
(file_in, "cannot open tracefile '%s'", filename);
+ xbt_assert(file_in, "cannot open tracefile '%s'", filename);
char *str_in = xbt_str_from_file(file_in);
fclose(file_in);
xbt_dynar_t in = xbt_str_split(str_in, "\n");
char *str_in = xbt_str_from_file(file_in);
fclose(file_in);
xbt_dynar_t in = xbt_str_split(str_in, "\n");