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
rename a test in order to easily select it
[simgrid.git]
/
src
/
instr
/
instr_private.h
diff --git
a/src/instr/instr_private.h
b/src/instr/instr_private.h
index
dd531af
..
b06099e
100644
(file)
--- a/
src/instr/instr_private.h
+++ b/
src/instr/instr_private.h
@@
-7,16
+7,15
@@
#ifndef INSTR_PRIVATE_H_
#define INSTR_PRIVATE_H_
#ifndef INSTR_PRIVATE_H_
#define INSTR_PRIVATE_H_
-#include "
instr
/instr.h"
+#include "
simgrid
/instr.h"
#include "instr/instr_interface.h"
#include "internal_config.h"
#include "simgrid_config.h"
#include "instr/instr_interface.h"
#include "internal_config.h"
#include "simgrid_config.h"
-#ifdef HAVE_TRACING
-
SG_BEGIN_DECL()
/* Need to define function drand48 for Windows */
SG_BEGIN_DECL()
/* Need to define function drand48 for Windows */
+/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
#ifdef _WIN32
# define drand48() (rand()/(RAND_MAX + 1.0))
#endif
#ifdef _WIN32
# define drand48() (rand()/(RAND_MAX + 1.0))
#endif
@@
-311,7
+310,7
@@
void TRACE_surf_link_set_utilization(const char *resource,
double value,
double now,
double delta);
double value,
double now,
double delta);
-
void
TRACE_surf_resource_utilization_alloc(void);
+
XBT_PUBLIC(void)
TRACE_surf_resource_utilization_alloc(void);
/* instr_paje.c */
extern xbt_dict_t trivaNodeTypes;
/* instr_paje.c */
extern xbt_dict_t trivaNodeTypes;
@@
-465,8
+464,6
@@
typedef struct s_instr_extra_data {
SG_END_DECL()
SG_END_DECL()
-#endif /* HAVE_TRACING */
-
#ifdef HAVE_JEDULE
#include "instr/jedule/jedule_sd_binding.h"
#endif
#ifdef HAVE_JEDULE
#include "instr/jedule/jedule_sd_binding.h"
#endif