/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "mc/mc.h"
#include "private.h"
#include "private.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/sg_config.h"
#include "smpi_mpi_dt_private.h"
-#include "mc/mc.h"
+#include "src/kernel/activity/SynchroComm.hpp"
#include "src/mc/mc_record.h"
-#include "xbt/replay.h"
-#include "surf/surf.h"
-#include "src/simix/smx_private.h"
-#include "simgrid/sg_config.h"
#include "src/mc/mc_replay.h"
#include "src/msg/msg_private.h"
-#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/simix/smx_private.h"
+#include "surf/surf.h"
+#include "xbt/replay.h"
#include <float.h> /* DBL_MAX */
#include <fstream>
double simulated;
int *argc;
char ***argv;
- smx_mailbox_t mailbox;
- smx_mailbox_t mailbox_small;
+ simgrid::s4u::MailboxPtr mailbox;
+ simgrid::s4u::MailboxPtr mailbox_small;
xbt_mutex_t mailboxes_mutex;
xbt_os_timer_t timer;
MPI_Comm comm_self;
void smpi_process_init(int *argc, char ***argv)
{
+ if (process_data == nullptr){
+ printf("SimGrid was not initialized properly before entering MPI_Init. Aborting, please check compilation process and use smpirun\n");
+ exit(1);
+ }
if (argc != nullptr && argv != nullptr) {
smx_actor_t proc = SIMIX_process_self();
proc->context->set_cleanup(&MSG_process_cleanup_from_SIMIX);
data->instance_id = instance_id;
data->replaying = false;
- simdata_process_t simdata = static_cast<simdata_process_t>(simcall_process_get_data(proc));
- simdata->data = data;
+ static_cast<simgrid::MsgActorExt*>(proc->data)->data = data;
if (*argc > 3) {
memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2));
data->argc = argc;
data->argv = argv;
// set the process attached to the mailbox
- simcall_mbox_set_receiver(data->mailbox_small, proc);
+ data->mailbox_small->setReceiver(simgrid::s4u::Actor::self());
XBT_DEBUG("<%d> New process in the game: %p", index, proc);
}
xbt_assert(smpi_process_data(),
smpi_process_data_t smpi_process_data()
{
- simdata_process_t simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data());
- return static_cast<smpi_process_data_t>(simdata->data);
+ simgrid::MsgActorExt* msgExt = static_cast<simgrid::MsgActorExt*>(SIMIX_process_self()->data);
+ return static_cast<smpi_process_data_t>(msgExt->data);
}
smpi_process_data_t smpi_process_remote_data(int index)
smx_mailbox_t smpi_process_mailbox()
{
smpi_process_data_t data = smpi_process_data();
- return data->mailbox;
+ return data->mailbox->getImpl();
}
smx_mailbox_t smpi_process_mailbox_small()
{
smpi_process_data_t data = smpi_process_data();
- return data->mailbox_small;
+ return data->mailbox_small->getImpl();
}
xbt_mutex_t smpi_process_mailboxes_mutex()
smx_mailbox_t smpi_process_remote_mailbox(int index)
{
smpi_process_data_t data = smpi_process_remote_data(index);
- return data->mailbox;
+ return data->mailbox->getImpl();
}
smx_mailbox_t smpi_process_remote_mailbox_small(int index)
{
smpi_process_data_t data = smpi_process_remote_data(index);
- return data->mailbox_small;
+ return data->mailbox_small->getImpl();
}
xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index)
){
XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
-
- smpi_switch_data_segment((static_cast<smpi_process_data_t>((static_cast<simdata_process_t>(SIMIX_process_get_data(comm->src_proc))->data))->index));
+ smpi_switch_data_segment(
+ (static_cast<smpi_process_data_t>((static_cast<simgrid::MsgActorExt*>(comm->src_proc->data)->data))->index));
tmpbuff = static_cast<void*>(xbt_malloc(buff_size));
memcpy(tmpbuff, buff, buff_size);
}
if((smpi_privatize_global_variables) && ((char*)comm->dst_buff >= smpi_start_data_exe)
&& ((char*)comm->dst_buff < smpi_start_data_exe + smpi_size_data_exe )){
XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
- smpi_switch_data_segment((static_cast<smpi_process_data_t>((static_cast<simdata_process_t>(SIMIX_process_get_data(comm->dst_proc))->data))->index));
+ smpi_switch_data_segment(
+ (static_cast<smpi_process_data_t>((static_cast<simgrid::MsgActorExt*>(comm->dst_proc->data)->data))->index));
}
memcpy(comm->dst_buff, tmpbuff, buff_size);
void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size)
{
- return;
+ /* nothing done in this version */
}
static void smpi_check_options(){
process_data[i] = new s_smpi_process_data_t;
process_data[i]->argc = nullptr;
process_data[i]->argv = nullptr;
- process_data[i]->mailbox = simcall_mbox_create(get_mailbox_name(name, i));
- process_data[i]->mailbox_small = simcall_mbox_create(get_mailbox_name_small(name, i));
+ process_data[i]->mailbox = simgrid::s4u::Mailbox::byName(get_mailbox_name(name, i));
+ process_data[i]->mailbox_small = simgrid::s4u::Mailbox::byName(get_mailbox_name_small(name, i));
process_data[i]->mailboxes_mutex = xbt_mutex_init();
process_data[i]->timer = xbt_os_timer_new();
if (MC_is_active())
void __attribute__ ((weak)) user_main_()
{
xbt_die("Should not be in this smpi_simulated_main");
- return;
}
int __attribute__ ((weak)) smpi_simulated_main_(int argc, char **argv)
smpi_privatize_global_variables = xbt_cfg_get_boolean("smpi/privatize-global-variables");
if (smpi_cpu_threshold < 0)
smpi_cpu_threshold = DBL_MAX;
+
+ char* val = xbt_cfg_get_string("smpi/shared-malloc");
+ if (!strcasecmp(val, "yes") || !strcmp(val, "1") || !strcasecmp(val, "on") || !strcasecmp(val, "global")) {
+ smpi_cfg_shared_malloc = shmalloc_global;
+ } else if (!strcasecmp(val, "local")) {
+ smpi_cfg_shared_malloc = shmalloc_local;
+ } else if (!strcasecmp(val, "no") || !strcmp(val, "0") || !strcasecmp(val, "off")) {
+ smpi_cfg_shared_malloc = shmalloc_none;
+ } else {
+ xbt_die("Invalid value '%s' for option smpi/shared-malloc. Possible values: 'on' or 'global', 'local', 'off'",
+ val);
+ }
}
int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
SIMIX_global_init(&argc, argv);
MSG_init(&argc,argv);
- SMPI_switch_data_segment = smpi_switch_data_segment;
+ SMPI_switch_data_segment = &smpi_switch_data_segment;
smpi_init_options();
