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
[mc] Do not take NULL to mean 'the current address space' in dwarf expressions
[simgrid.git]
/
src
/
surf
/
trace_mgr.c
diff --git
a/src/surf/trace_mgr.c
b/src/surf/trace_mgr.c
index
5b45dab
..
2f0478f
100644
(file)
--- a/
src/surf/trace_mgr.c
+++ b/
src/surf/trace_mgr.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004
, 2005, 2007, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2005, 2007, 2009-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-269,7
+269,7
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
}
xbt_assert(periodicity >= 0,
}
xbt_assert(periodicity >= 0,
- "Invalid periodicity %
l
g (must be positive)", periodicity);
+ "Invalid periodicity %g (must be positive)", periodicity);
trace = xbt_new0(s_tmgr_trace_t, 1);
trace->type = e_trace_list;
trace = xbt_new0(s_tmgr_trace_t, 1);
trace->type = e_trace_list;
@@
-292,7
+292,7
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
if (last_event) {
if (last_event->delta > event.delta) {
xbt_die("%s:%d: Invalid trace: Events must be sorted, "
if (last_event) {
if (last_event->delta > event.delta) {
xbt_die("%s:%d: Invalid trace: Events must be sorted, "
- "but time %
lg > time %l
g.\n%s",
+ "but time %
g > time %
g.\n%s",
id, linecount, last_event->delta, event.delta, input);
}
last_event->delta = event.delta - last_event->delta;
id, linecount, last_event->delta, event.delta, input);
}
last_event->delta = event.delta - last_event->delta;
@@
-339,8
+339,9
@@
tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
}
f = surf_fopen(filename, "r");
}
f = surf_fopen(filename, "r");
- xbt_assert(f != NULL, "Cannot open file '%s' (path=%s)", filename,
- xbt_str_join(surf_path, ":"));
+ if (f == NULL)
+ xbt_die("Cannot open file '%s' (path=%s)", filename,
+ xbt_str_join(surf_path, ":"));
tstr = xbt_str_from_file(f);
fclose(f);
tstr = xbt_str_from_file(f);
fclose(f);
@@
-444,7
+445,7
@@
tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
trace_event->idx++;
} else if (event->delta > 0) { /* Last element, checking for periodicity */
xbt_heap_push(h->heap, trace_event, event_date + event->delta);
trace_event->idx++;
} else if (event->delta > 0) { /* Last element, checking for periodicity */
xbt_heap_push(h->heap, trace_event, event_date + event->delta);
- trace_event->idx =
0;
+ trace_event->idx =
1; /* not 0 as the first event is a placeholder to handle when events really start */
} else { /* We don't need this trace_event anymore */
trace_event->free_me = 1;
}
} else { /* We don't need this trace_event anymore */
trace_event->free_me = 1;
}