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
allow to pass a std::string as message to Exceptions
[simgrid.git]
/
src
/
surf
/
trace_mgr.cpp
diff --git
a/src/surf/trace_mgr.cpp
b/src/surf/trace_mgr.cpp
index
df5f1ee
..
944073f
100644
(file)
--- a/
src/surf/trace_mgr.cpp
+++ b/
src/surf/trace_mgr.cpp
@@
-1,16
+1,14
@@
-/* 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. */
#include "xbt/sysdep.h"
#include "xbt/log.h"
/* 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. */
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/str.h"
#include "src/surf/surf_interface.hpp"
#include "src/surf/trace_mgr.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-#include "surf_private.h"
+#include "surf_private.h
pp
"
#include "xbt/RngStream.h"
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp>
#include "xbt/RngStream.h"
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp>
@@
-51,9
+49,12
@@
trace::trace()
}
trace::~trace() = default;
future_evt_set::future_evt_set() = default;
}
trace::~trace() = default;
future_evt_set::future_evt_set() = default;
-
simgrid::trace_mgr::
future_evt_set::~future_evt_set()
+future_evt_set::~future_evt_set()
{
{
- xbt_heap_free(heap_);
+ while (not heap_.empty()) {
+ delete heap_.top().second;
+ heap_.pop();
+ }
}
}
}
}
}
}
@@
-119,18
+120,20
@@
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, surf::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
= xbt_new0(s_tmgr_trace_event_t, 1
);
- trace_iterator->trace = trace;
- trace_iterator->idx = 0;
+ trace_iterator
= new simgrid::kernel::resource::TraceEvent(
);
+ trace_iterator->trace
= trace;
+ trace_iterator->idx
= 0;
trace_iterator->resource = resource;
trace_iterator->resource = resource;
+ trace_iterator->free_me = false;
xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!");
xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!");
-
xbt_heap_push(heap_, trace_iterator, 0. /*start_time*/
);
+
heap_.emplace(0.0 /* start time */, trace_iterator
);
return trace_iterator;
}
return trace_iterator;
}
@@
-138,22
+141,21
@@
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t tr
/** @brief returns the date of the next occurring event (pure function) */
double simgrid::trace_mgr::future_evt_set::next_date() const
{
/** @brief returns the date of the next occurring event (pure function) */
double simgrid::trace_mgr::future_evt_set::next_date() const
{
- if (xbt_heap_size(heap_))
- return (xbt_heap_maxkey(heap_));
- return -1.0;
+ 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,
-
simgrid::surf
::Resource** resource)
+
kernel::resource
::Resource** resource)
{
double event_date = next_date();
if (event_date > date)
return nullptr;
{
double event_date = next_date();
if (event_date > date)
return nullptr;
- tmgr_trace_event_t trace_iterator = (tmgr_trace_event_t)xbt_heap_pop(heap_);
- if (trace_iterator == nullptr)
+ if (heap_.empty())
return nullptr;
return nullptr;
+ tmgr_trace_event_t trace_iterator = heap_.top().second;
+ heap_.pop();
tmgr_trace_t trace = trace_iterator->trace;
*resource = trace_iterator->resource;
tmgr_trace_t trace = trace_iterator->trace;
*resource = trace_iterator->resource;
@@
-163,13
+165,13
@@
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, doub
*value = dateVal.value_;
if (trace_iterator->idx < trace->event_list.size() - 1) {
*value = dateVal.value_;
if (trace_iterator->idx < trace->event_list.size() - 1) {
-
xbt_heap_push(heap_, trace_iterator, event_date + dateVal.date_
);
+
heap_.emplace(event_date + dateVal.date_, trace_iterator
);
trace_iterator->idx++;
} else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
trace_iterator->idx++;
} else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
-
xbt_heap_push(heap_, trace_iterator, event_date + dateVal.date_
);
+
heap_.emplace(event_date + dateVal.date_, trace_iterator
);
trace_iterator->idx = 1; /* idx=0 is a placeholder to store when events really start */
} else { /* If we don't loop, we don't need this trace_event anymore */
trace_iterator->idx = 1; /* idx=0 is a placeholder to store when events really start */
} else { /* If we don't loop, we don't need this trace_event anymore */
- trace_iterator->free_me =
1
;
+ trace_iterator->free_me =
true
;
}
return trace_iterator;
}
return trace_iterator;
@@
-185,7
+187,7
@@
void tmgr_finalize()
void tmgr_trace_event_unref(tmgr_trace_event_t* trace_event)
{
if ((*trace_event)->free_me) {
void tmgr_trace_event_unref(tmgr_trace_event_t* trace_event)
{
if ((*trace_event)->free_me) {
-
xbt_free(*trace_event)
;
+
delete *trace_event
;
*trace_event = nullptr;
}
}
*trace_event = nullptr;
}
}