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]
/
include
/
simgrid
/
simdag.h
diff --git
a/include/simgrid/simdag.h
b/include/simgrid/simdag.h
index
5906b04
..
b317441
100644
(file)
--- a/
include/simgrid/simdag.h
+++ b/
include/simgrid/simdag.h
@@
-140,7
+140,14
@@
XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst);
*
* @{
*/
*
* @{
*/
-XBT_PUBLIC(void) SD_init(int *argc, char **argv);
+
+#define SD_init(argc, argv) \
+ do { \
+ sg_version_check(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); \
+ SD_init_nocheck(argc, argv); \
+ } while (0)
+
+XBT_PUBLIC(void) SD_init_nocheck(int *argc, char **argv);
XBT_PUBLIC(void) SD_config(const char *key, const char *value);
XBT_PUBLIC(void) SD_create_environment(const char *platform_file);
XBT_PUBLIC(void) SD_simulate(double how_long);
XBT_PUBLIC(void) SD_config(const char *key, const char *value);
XBT_PUBLIC(void) SD_create_environment(const char *platform_file);
XBT_PUBLIC(void) SD_simulate(double how_long);
@@
-151,7
+158,6
@@
XBT_PUBLIC(xbt_dynar_t) SD_daxload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename);
-XBT_PUBLIC(void) SD_init_check(int *argc, char **argv);
#ifdef __cplusplus
namespace simgrid {
namespace sd {
#ifdef __cplusplus
namespace simgrid {
namespace sd {
@@
-161,12
+167,6
@@
XBT_PUBLIC(std::set<SD_task_t>*) simulate(double how_long);
#endif
/** @} */
#endif
/** @} */
-
-#define SD_init(argc,argv) do{\
- sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\
- SD_init_check(argc,argv);\
-}while(0)
-
/* Support some backward compatibility */
#define SD_workstation_t sg_host_t
/* Support some backward compatibility */
#define SD_workstation_t sg_host_t