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
[trace_mgr] less void*, (some) more doc
[simgrid.git]
/
src
/
surf
/
trace_mgr.cpp
diff --git
a/src/surf/trace_mgr.cpp
b/src/surf/trace_mgr.cpp
index
1515321
..
d6839e3
100644
(file)
--- a/
src/surf/trace_mgr.cpp
+++ b/
src/surf/trace_mgr.cpp
@@
-369,11
+369,9
@@
void tmgr_trace_free(tmgr_trace_t trace)
free(trace);
}
free(trace);
}
-/**
Register
a new trace into the future event set, and get an iterator over the integrated trace */
+/**
@brief Registers
a new trace into the future event set, and get an iterator over the integrated trace */
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(
- tmgr_trace_t trace,
- double start_time,
- void *resource)
+ tmgr_trace_t trace, double start_time, surf::Resource *resource)
{
tmgr_trace_iterator_t trace_iterator = NULL;
{
tmgr_trace_iterator_t trace_iterator = NULL;
@@
-392,6
+390,7
@@
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(
return trace_iterator;
}
return trace_iterator;
}
+/** @brief returns the date of the next occurring event (pure function) */
double simgrid::trace_mgr::future_evt_set::next_date()
{
if (xbt_heap_size(p_heap))
double simgrid::trace_mgr::future_evt_set::next_date()
{
if (xbt_heap_size(p_heap))
@@
-400,10
+399,9
@@
double simgrid::trace_mgr::future_evt_set::next_date()
return -1.0;
}
return -1.0;
}
+/** @brief Retrieves the next occurring event, or NULL if none happens before #date */
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
- double date,
- double *value,
- void** resource)
+ double date, double *value, simgrid::surf::Resource **resource)
{
double event_date = next_date();
tmgr_trace_iterator_t trace_iterator = NULL;
{
double event_date = next_date();
tmgr_trace_iterator_t trace_iterator = NULL;
@@
-468,11
+466,10
@@
void tmgr_finalize(void)
xbt_dict_free(&trace_list);
}
xbt_dict_free(&trace_list);
}
-
int tmgr_trace_event_free(tmgr_trace_iterator_t
trace_event)
+
void tmgr_trace_event_unref(tmgr_trace_iterator_t *
trace_event)
{
{
- if (
trace_event
->free_me) {
- xbt_free(trace_event);
-
return 1
;
+ if (
(*trace_event)
->free_me) {
+ xbt_free(
*
trace_event);
+
*trace_event = nullptr
;
}
}
- return 0;
}
}