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
replace FILE* by ofstream for tracing_file
[simgrid.git]
/
src
/
instr
/
instr_private.hpp
diff --git
a/src/instr/instr_private.hpp
b/src/instr/instr_private.hpp
index
e7e5c18
..
20aa187
100644
(file)
--- a/
src/instr/instr_private.hpp
+++ b/
src/instr/instr_private.hpp
@@
-9,6
+9,7
@@
#include <xbt/base.h>
#include "simgrid/instr.h"
#include <xbt/base.h>
#include "simgrid/instr.h"
+#include "simgrid/s4u/Actor.hpp"
#include "simgrid_config.h"
#include "src/instr/instr_paje_containers.hpp"
#include "src/instr/instr_paje_events.hpp"
#include "simgrid_config.h"
#include "src/instr/instr_paje_containers.hpp"
#include "src/instr/instr_paje_events.hpp"
@@
-17,7
+18,9
@@
#include "src/internal_config.h"
#include "xbt/graph.h"
#include "src/internal_config.h"
#include "xbt/graph.h"
+#include <fstream>
#include <iomanip> /** std::setprecision **/
#include <iomanip> /** std::setprecision **/
+#include <iostream>
#include <map>
#include <memory>
#include <set>
#include <map>
#include <memory>
#include <set>
@@
-27,7
+30,6
@@
#ifdef WIN32
#include <direct.h> // _mkdir
/* Need to define function drand48 for Windows */
#ifdef WIN32
#include <direct.h> // _mkdir
/* Need to define function drand48 for Windows */
-/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
#define drand48() (rand() / (RAND_MAX + 1.0))
#endif
#define drand48() (rand() / (RAND_MAX + 1.0))
#endif
@@
-210,10
+212,6
@@
extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
/* instr_paje_header.c */
XBT_PRIVATE void TRACE_header(bool basic, int size);
/* instr_paje_header.c */
XBT_PRIVATE void TRACE_header(bool basic, int size);
-/* from paje.c */
-XBT_PRIVATE void TRACE_paje_start();
-XBT_PRIVATE void TRACE_paje_end();
-
/* from instr_config.c */
XBT_PRIVATE bool TRACE_needs_platform();
XBT_PRIVATE bool TRACE_is_enabled();
/* from instr_config.c */
XBT_PRIVATE bool TRACE_needs_platform();
XBT_PRIVATE bool TRACE_is_enabled();
@@
-254,11
+252,6
@@
void instr_new_user_variable_type(std::string father_type, std::string new_typen
void instr_new_user_state_type(std::string father_type, std::string new_typename);
void instr_new_value_for_user_state_type(std::string new_typename, const char* value, std::string color);
void instr_new_user_state_type(std::string father_type, std::string new_typename);
void instr_new_value_for_user_state_type(std::string new_typename, const char* value, std::string color);
-/* instr_config.c */
-XBT_PRIVATE void TRACE_start();
-XBT_PRIVATE void TRACE_TI_start();
-XBT_PRIVATE void TRACE_TI_end();
-XBT_PRIVATE void TRACE_end();
XBT_PRIVATE void TRACE_global_init();
XBT_PRIVATE void TRACE_help(int detailed);
XBT_PRIVATE void TRACE_global_init();
XBT_PRIVATE void TRACE_help(int detailed);