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
This seems to be useless since ... a long time, now (and it breaks on macos)
[simgrid.git]
/
src
/
simix
/
smx_deployment.cpp
diff --git
a/src/simix/smx_deployment.cpp
b/src/simix/smx_deployment.cpp
index
1b7be72
..
08a8727
100644
(file)
--- a/
src/simix/smx_deployment.cpp
+++ b/
src/simix/smx_deployment.cpp
@@
-8,7
+8,7
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
-#include "s
urf/surfxml_parse.h"
+#include "s
rc/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
"Logging specific to SIMIX (deployment)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
"Logging specific to SIMIX (deployment)");
@@
-17,7
+17,8
@@
extern int surf_parse_lineno;
void SIMIX_init_application(void)
{
void SIMIX_init_application(void)
{
- surf_parse_reset_callbacks();
+ sg_platf_exit();
+ sg_platf_init();
}
/**
}
/**
@@
-63,11
+64,9
@@
void SIMIX_launch_application(const char *file)
* \param name the reference name of the function.
* \param code the function
*/
* \param name the reference name of the function.
* \param code the function
*/
-void SIMIX_function_register(const char *name,
- xbt_main_func_t code)
+void SIMIX_function_register(const char *name, xbt_main_func_t code)
{
{
- xbt_assert(simix_global,
- "SIMIX_global_init has to be called before SIMIX_function_register.");
+ xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
xbt_dict_set(simix_global->registered_functions, name, (void*) code, NULL);
}
xbt_dict_set(simix_global->registered_functions, name, (void*) code, NULL);
}