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
change simgrid::surf::Resource into simgrid::kernel::model::Resource
[simgrid.git]
/
src
/
surf
/
trace_mgr.hpp
diff --git
a/src/surf/trace_mgr.hpp
b/src/surf/trace_mgr.hpp
index
d33a538
..
a3a8aa0
100644
(file)
--- a/
src/surf/trace_mgr.hpp
+++ b/
src/surf/trace_mgr.hpp
@@
-7,20
+7,20
@@
#define SURF_TMGR_H
#include "simgrid/forward.h"
#define SURF_TMGR_H
#include "simgrid/forward.h"
-#include "xbt/heap.h"
#include "xbt/sysdep.h"
#include "xbt/sysdep.h"
+#include <queue>
#include <vector>
#include <vector>
-SG_BEGIN_DECL()
+extern "C" {
/* Iterator within a trace */
/* Iterator within a trace */
-
typedef struct tmgr_trace_even
t {
+
struct s_tmgr_trace_event_
t {
tmgr_trace_t trace;
unsigned int idx;
sg_resource_t resource;
tmgr_trace_t trace;
unsigned int idx;
sg_resource_t resource;
-
int
free_me;
-}
s_tmgr_trace_event_t
;
-typedef s
truct tmgr_trace_even
t* tmgr_trace_event_t;
+
bool
free_me;
+};
+typedef s
_tmgr_trace_event_
t* tmgr_trace_event_t;
/**
* \brief Free a trace event structure
/**
* \brief Free a trace event structure
@@
-31,14
+31,12
@@
typedef struct tmgr_trace_event* tmgr_trace_event_t;
*/
XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_event_t* trace_event);
*/
XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_event_t* trace_event);
-XBT_PUBLIC(void) tmgr_finalize(void);
-
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char* filename);
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string input, double periodicity);
+XBT_PUBLIC(void) tmgr_finalize();
-SG_END_DECL()
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(std::string filename);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(std::string id, std::string input, double periodicity);
+}
-#ifdef __cplusplus
namespace simgrid {
/** @brief Modeling of the availability profile (due to an external load) or the churn
*
namespace simgrid {
/** @brief Modeling of the availability profile (due to an external load) or the churn
*
@@
-59,7
+57,7
@@
public:
explicit DatedValue() = default;
explicit DatedValue(double d, double v) : date_(d), value_(v) {}
bool operator==(DatedValue e2);
explicit DatedValue() = default;
explicit DatedValue(double d, double v) : date_(d), value_(v) {}
bool operator==(DatedValue e2);
- bool operator!=(DatedValue e2) { return
!
(*this == e2); }
+ bool operator!=(DatedValue e2) { return
not
(*this == e2); }
};
std::ostream& operator<<(std::ostream& out, const DatedValue& e);
};
std::ostream& operator<<(std::ostream& out, const DatedValue& e);
@@
-89,15
+87,14
@@
public:
future_evt_set();
virtual ~future_evt_set();
double next_date() const;
future_evt_set();
virtual ~future_evt_set();
double next_date() const;
- tmgr_trace_event_t pop_leq(double date, double* value, simgrid::
surf
::Resource** resource);
- tmgr_trace_event_t add_trace(tmgr_trace_t trace, simgrid::
surf
::Resource * resource);
+ tmgr_trace_event_t pop_leq(double date, double* value, simgrid::
kernel::model
::Resource** resource);
+ tmgr_trace_event_t add_trace(tmgr_trace_t trace, simgrid::
kernel::model
::Resource * resource);
private:
private:
- // TODO: use a boost type for the heap (or a ladder queue)
- xbt_heap_t heap_ = xbt_heap_new(8, xbt_free_f); /* Content: only trace_events (yep, 8 is an arbitrary value) */
+ typedef std::pair<double, tmgr_trace_event_t> Qelt;
+ std::priority_queue<Qelt, std::vector<Qelt>, std::greater<Qelt>> heap_;
};
}} // namespace simgrid::trace_mgr
};
}} // namespace simgrid::trace_mgr
-#endif /* C++ only */
#endif /* SURF_TMGR_H */
#endif /* SURF_TMGR_H */