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
don't set a field to its default value from the constructor
[simgrid.git]
/
src
/
surf
/
trace_mgr.cpp
diff --git
a/src/surf/trace_mgr.cpp
b/src/surf/trace_mgr.cpp
index
c5b9e2f
..
944073f
100644
(file)
--- a/
src/surf/trace_mgr.cpp
+++ b/
src/surf/trace_mgr.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2004-2005, 2007, 2009-2014, 2016-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-121,11
+120,12
@@
tmgr_trace_t tmgr_trace_new_from_file(std::string filename)
}
/** @brief Registers 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_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, kernel::model::Resource* resource)
+tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace,
+ kernel::resource::Resource* resource)
{
tmgr_trace_event_t trace_iterator = nullptr;
{
tmgr_trace_event_t trace_iterator = nullptr;
- trace_iterator = new s
_tmgr_trace_event_t
;
+ trace_iterator = new s
imgrid::kernel::resource::TraceEvent()
;
trace_iterator->trace = trace;
trace_iterator->idx = 0;
trace_iterator->resource = resource;
trace_iterator->trace = trace;
trace_iterator->idx = 0;
trace_iterator->resource = resource;
@@
-144,9
+144,9
@@
double simgrid::trace_mgr::future_evt_set::next_date() const
return heap_.empty() ? -1.0 : heap_.top().first;
}
return heap_.empty() ? -1.0 : heap_.top().first;
}
-/** @brief Retrieves the next occurring event, or nullptr if none happens before
#
date */
+/** @brief Retrieves the next occurring event, or nullptr if none happens before date */
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value,
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value,
- kernel::
model
::Resource** resource)
+ kernel::
resource
::Resource** resource)
{
double event_date = next_date();
if (event_date > date)
{
double event_date = next_date();
if (event_date > date)