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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
smpi
/
smpi_interface.h
diff --git
a/src/include/smpi/smpi_interface.h
b/src/include/smpi/smpi_interface.h
index
d3cab53
..
d139ada
100644
(file)
--- a/
src/include/smpi/smpi_interface.h
+++ b/
src/include/smpi/smpi_interface.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-8,7
+8,7
@@
#define _SMPI_INTERFACE_H
#include "smpi/smpi.h"
#define _SMPI_INTERFACE_H
#include "smpi/smpi.h"
-
+SG_BEGIN_DECL()
/** \brief MPI collective description
*/
/** \brief MPI collective description
*/
@@
-116,5
+116,13
@@
XBT_PUBLIC_DATA(int (*mpi_coll_barrier_fun)
XBT_PUBLIC(void) coll_help(const char *category,
s_mpi_coll_description_t * table);
XBT_PUBLIC(int) find_coll_description(s_mpi_coll_description_t * table,
XBT_PUBLIC(void) coll_help(const char *category,
s_mpi_coll_description_t * table);
XBT_PUBLIC(int) find_coll_description(s_mpi_coll_description_t * table,
- char *name);
+ char *name, const char *desc);
+
+
+extern XBT_PRIVATE double smpi_wtime_sleep;
+extern XBT_PRIVATE double smpi_iprobe_sleep;
+extern XBT_PRIVATE double smpi_test_sleep;
+
+SG_END_DECL()
+
#endif /* _SMPI_INTERFAC_H */
#endif /* _SMPI_INTERFAC_H */