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 conflicts
[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
..
ea04624
100644
(file)
--- a/
examples/gras/replay/xbt_workload.c
+++ b/
examples/gras/replay/xbt_workload.c
@@
-29,7
+29,7
@@
xbt_workload_elm_t xbt_workload_elm_parse(char *line)
xbt_dynar_t w = xbt_str_split(line, " ");
xbt_dynar_t w = xbt_str_split(line, " ");
- if (xbt_dynar_
length(w) == 0
) {
+ if (xbt_dynar_
is_empty(w)
) {
free(res);
xbt_dynar_free(&w);
return NULL;
free(res);
xbt_dynar_free(&w);
return NULL;
@@
-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] == '#') {
@@
-71,12
+71,9
@@
void xbt_workload_elm_free(xbt_workload_elm_t cmd)
{
if (!cmd)
return;
{
if (!cmd)
return;
- if (cmd->who)
- free(cmd->who);
- if (cmd->comment)
- free(cmd->comment);
- if (cmd->str_arg)
- free(cmd->str_arg);
+ free(cmd->who);
+ free(cmd->comment);
+ free(cmd->str_arg);
free(cmd);
}
free(cmd);
}
@@
-119,7
+116,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
+154,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");