* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdlib.h>
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
#include "src/mc/mc_replay.h"
#include "simgrid/sg_config.h"
-#ifdef HAVE_MC
+#if HAVE_MC
#include "src/mc/mc_private.h"
#include "src/mc/mc_protocol.h"
-#include "src/mc/mc_client.h"
-#endif
+#include "src/mc/Client.hpp"
-#ifdef HAVE_MC
#include <stdlib.h>
#include "src/mc/mc_protocol.h"
#endif
#include "src/mc/mc_record.h"
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
#include "src/smpi/private.h"
#endif
}
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (smpi_enabled() && !smpi_privatize_global_variables) {
-#ifdef HAVE_PRIVATIZATION
+#if HAVE_PRIVATIZATION
fprintf(stderr,
"Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n");
#else
*/
void SIMIX_global_init(int *argc, char **argv)
{
-#ifdef HAVE_MC
+#if HAVE_MC
_sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL;
#endif
__xbt_running_ctx_fetch = SIMIX_process_get_running_context;
__xbt_ex_terminate = SIMIX_process_exception_terminate;
- SIMIX_network_init();
-
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
simix_timers = xbt_heap_new(8, &free);
}
- if (sg_cfg_get_boolean("clean_atexit"))
+ if (xbt_cfg_get_boolean("clean_atexit"))
atexit(SIMIX_clean);
-#ifdef HAVE_MC
+#if HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
- MC_client_init();
+ simgrid::mc::Client::initialize();
#endif
if (_sg_cfg_exit_asap)
SIMIX_process_killall(simix_global->maestro_process, 1);
/* Exit the SIMIX network module */
- SIMIX_network_exit();
+ SIMIX_mailbox_exit();
xbt_heap_free(simix_timers);
simix_timers = NULL;
*/
void SIMIX_run(void)
{
- if(MC_record_path) {
- MC_record_replay_init();
- MC_record_replay_from_string(MC_record_path);
+ if (MC_record_path) {
+ simgrid::mc::replay(MC_record_path);
return;
}