/* 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 "smpi_process.hpp"
#include "mc/mc.h"
+#include "private.hpp"
+#include "smpi_comm.hpp"
+#include "smpi_group.hpp"
#include "src/mc/mc_replay.h"
#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp"
-#include "private.hpp"
-#include "smpi_process.hpp"
-#include "smpi_group.hpp"
-#include "smpi_comm.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)");
void Process::set_data(int index, int* argc, char*** argv)
{
char* instance_id = (*argv)[1];
- comm_world_ = smpi_deployment_comm_world(instance_id);
- msg_bar_t bar = smpi_deployment_finalization_barrier(instance_id);
- if (bar!=nullptr) // don't overwrite the default one
+ comm_world_ = smpi_deployment_comm_world(instance_id);
+ msg_bar_t bar = smpi_deployment_finalization_barrier(instance_id);
+ if (bar != nullptr) // don't overwrite the current one if the instance has none
finalization_barrier_ = bar;
instance_id_ = instance_id;
- index_ = index;
+ index_ = index;
static_cast<simgrid::msg::ActorExt*>(SIMIX_process_self()->userdata)->data = this;
return &trace_call_loc_;
}
+void Process::set_privatized_region(smpi_privatization_region_t region)
+{
+ privatized_region_ = region;
+}
+
+smpi_privatization_region_t Process::privatized_region()
+{
+ return privatized_region_;
+}
+
int Process::index()
{
return index_;
smx_actor_t proc = SIMIX_process_self();
proc->context->set_cleanup(&MSG_process_cleanup_from_SIMIX);
- int index = proc->pid - 1;
+ int index = proc->pid - 1; // The maestro process has always ID 0 but we don't need that process here
if(index_to_process_data == nullptr){
index_to_process_data=static_cast<int*>(xbt_malloc(SIMIX_process_count()*sizeof(int)));
throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]);
}
+ // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved
+ // this up here so that I can set the privatized region before the switch.
+ Process* process = smpi_process_remote(index);
if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){
/* Now using segment index of the process */
index = proc->segment_index;
+ process->set_privatized_region(smpi_init_global_memory_segment_process());
/* Done at the process's creation */
SMPI_switch_data_segment(index);
}
- Process* process = smpi_process_remote(index);
process->set_data(index, argc, argv);
}
xbt_assert(smpi_process(),