#endif
#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf.hpp"
#include "smx_private.h"
#include "smx_private.hpp"
#include "xbt/heap.h"
#endif
#include "src/mc/mc_record.h"
-#include "src/surf/platform.hpp"
#ifdef HAVE_SMPI
#include "src/smpi/private.h"
SIMIX_storage_create(key, storage, NULL);
}
+static std::function<void()> maestro_code;
+
+namespace simgrid {
+namespace simix {
+
+XBT_PUBLIC(void) set_maestro(std::function<void()> code)
+{
+ maestro_code = std::move(code);
+}
+
+}
+}
+
+void SIMIX_set_maestro(void (*code)(void*), void* data)
+{
+ maestro_code = std::bind(code, data);
+}
+
/**
* \ingroup SIMIX_API
* \brief Initialize SIMIX internal data.
surf_init(argc, argv); /* Initialize SURF structures */
SIMIX_context_mod_init();
- SIMIX_create_maestro_process();
+
+ // Either create a new context with maestro or create
+ // a context object with the current context mestro):
+ simgrid::simix::create_maestro(maestro_code);
/* context exception handlers */
__xbt_running_ctx_fetch = SIMIX_process_get_running_context;
signal(SIGINT, inthandler);
#ifndef WIN32
- /* Install SEGV handler */
install_segvhandler();
#endif
/* register a function to be called by SURF after the environment creation */
}
/* Autorestart all process */
- if(host_that_restart) {
- char *hostname = NULL;
- xbt_dynar_foreach(host_that_restart,iter,hostname) {
- XBT_INFO("Restart processes on host: %s",hostname);
- SIMIX_host_autorestart(sg_host_by_name(hostname));
- }
- xbt_dynar_reset(host_that_restart);
+ char *hostname = NULL;
+ xbt_dynar_foreach(host_that_restart,iter,hostname) {
+ XBT_INFO("Restart processes on host: %s",hostname);
+ SIMIX_host_autorestart(sg_host_by_name(hostname));
}
+ xbt_dynar_reset(host_that_restart);
/* Clean processes to destroy */
SIMIX_process_empty_trash();