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
Merge branch 'master' of github.com:mquinson/simgrid
[simgrid.git]
/
src
/
surf
/
trace_mgr.hpp
diff --git
a/src/surf/trace_mgr.hpp
b/src/surf/trace_mgr.hpp
index
a53be9e
..
ffb7620
100644
(file)
--- a/
src/surf/trace_mgr.hpp
+++ b/
src/surf/trace_mgr.hpp
@@
-11,7
+11,6
@@
#include "xbt/dynar.h"
#include "surf/maxmin.h"
#include "surf/datatypes.h"
#include "xbt/dynar.h"
#include "surf/maxmin.h"
#include "surf/datatypes.h"
-#include "simgrid/platf_interface.h"
#include "simgrid/forward.h"
SG_BEGIN_DECL()
#include "simgrid/forward.h"
SG_BEGIN_DECL()
@@
-65,8
+64,6
@@
typedef struct tmgr_trace_iterator {
int free_me;
} s_tmgr_trace_event_t;
int free_me;
} s_tmgr_trace_event_t;
-XBT_PRIVATE double tmgr_event_generator_next_value(probabilist_event_generator_t generator);
-
/* Creation functions */
XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void);
XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
/* Creation functions */
XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void);
XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
@@
-81,6
+78,9
@@
XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event);
XBT_PUBLIC(void) tmgr_finalize(void);
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, const char *input, double periodicity);
+
SG_END_DECL()
#ifdef __cplusplus
SG_END_DECL()
#ifdef __cplusplus