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
put the log message in the correct place
[simgrid.git]
/
src
/
surf
/
trace_mgr.c
diff --git
a/src/surf/trace_mgr.c
b/src/surf/trace_mgr.c
index
23ccb0d
..
c49bd7c
100644
(file)
--- a/
src/surf/trace_mgr.c
+++ b/
src/surf/trace_mgr.c
@@
-51,7
+51,7
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
}
}
}
}
- xbt_assert
1
(periodicity >= 0,
+ xbt_assert(periodicity >= 0,
"Invalid periodicity %lg (must be positive)", periodicity);
trace = xbt_new0(s_tmgr_trace_t, 1);
"Invalid periodicity %lg (must be positive)", periodicity);
trace = xbt_new0(s_tmgr_trace_t, 1);
@@
-88,10
+88,9
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
last_event->delta = periodicity;
if (!trace_list)
last_event->delta = periodicity;
if (!trace_list)
- trace_list = xbt_dict_new
(
);
+ trace_list = xbt_dict_new
_homogeneous((void (*)(void *)) tmgr_trace_free
);
- xbt_dict_set(trace_list, id, (void *) trace,
- (void (*)(void *)) tmgr_trace_free);
+ xbt_dict_set(trace_list, id, (void *) trace, NULL);
xbt_dynar_free(&list);
return trace;
xbt_dynar_free(&list);
return trace;
@@
-115,7
+114,7
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
}
f = surf_fopen(filename, "r");
}
f = surf_fopen(filename, "r");
- xbt_assert
2
(f != NULL, "Cannot open file '%s' (path=%s)", filename,
+ xbt_assert(f != NULL, "Cannot open file '%s' (path=%s)", filename,
xbt_str_join(surf_path, ":"));
tstr = xbt_str_from_file(f);
xbt_str_join(surf_path, ":"));
tstr = xbt_str_from_file(f);
@@
-161,7
+160,7
@@
tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
trace_event->idx = offset;
trace_event->model = model;
trace_event->idx = offset;
trace_event->model = model;
- xbt_assert
0
((trace_event->idx < xbt_dynar_length(trace->event_list)),
+ xbt_assert((trace_event->idx < xbt_dynar_length(trace->event_list)),
"You're referring to an event that does not exist!");
xbt_heap_push(h->heap, trace_event, start_time);
"You're referring to an event that does not exist!");
xbt_heap_push(h->heap, trace_event, start_time);