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
Merge branch 'master' into actor-yield
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_process.cpp
diff --git
a/src/smpi/internals/smpi_process.cpp
b/src/smpi/internals/smpi_process.cpp
index
d073614
..
b6c4d10
100644
(file)
--- a/
src/smpi/internals/smpi_process.cpp
+++ b/
src/smpi/internals/smpi_process.cpp
@@
-8,7
+8,7
@@
#include "private.hpp"
#include "smpi_comm.hpp"
#include "smpi_group.hpp"
#include "private.hpp"
#include "smpi_comm.hpp"
#include "smpi_group.hpp"
-#include "src/mc/mc_replay.h"
+#include "src/mc/mc_replay.h
pp
"
#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp"
@@
-68,12
+68,12
@@
Process::Process(int index, msg_bar_t finalization_barrier)
void Process::set_data(int index, int* argc, char*** argv)
{
char* instance_id = (*argv)[1];
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 n
one
finalization_barrier_ = bar;
instance_id_ = instance_id;
finalization_barrier_ = bar;
instance_id_ = instance_id;
- index_ = index;
+ index_
= index;
static_cast<simgrid::msg::ActorExt*>(SIMIX_process_self()->userdata)->data = this;
static_cast<simgrid::msg::ActorExt*>(SIMIX_process_self()->userdata)->data = this;
@@
-166,6
+166,16
@@
smpi_trace_call_location_t* Process::call_location()
return &trace_call_loc_;
}
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_;
int Process::index()
{
return index_;
@@
-270,7
+280,7
@@
void Process::init(int *argc, char ***argv){
smx_actor_t proc = SIMIX_process_self();
proc->context->set_cleanup(&MSG_process_cleanup_from_SIMIX);
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)));
if(index_to_process_data == nullptr){
index_to_process_data=static_cast<int*>(xbt_malloc(SIMIX_process_count()*sizeof(int)));
@@
-284,14
+294,17
@@
void Process::init(int *argc, char ***argv){
throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]);
}
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;
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);
}
/* 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(),
process->set_data(index, argc, argv);
}
xbt_assert(smpi_process(),