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
Function smpi_process_papi_counters() was renamed (untested).
[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
4ec37ca
..
967936f
100644
(file)
--- a/
src/smpi/internals/smpi_process.cpp
+++ b/
src/smpi/internals/smpi_process.cpp
@@
-52,6
+52,10
@@
Process::Process(ActorPtr actor, msg_bar_t finalization_barrier)
Process::~Process()
{
Process::~Process()
{
+ if (comm_self_ != MPI_COMM_NULL)
+ simgrid::smpi::Comm::destroy(comm_self_);
+ if (comm_intra_ != MPI_COMM_NULL)
+ simgrid::smpi::Comm::destroy(comm_intra_);
xbt_os_timer_free(timer_);
xbt_mutex_destroy(mailboxes_mutex_);
}
xbt_os_timer_free(timer_);
xbt_mutex_destroy(mailboxes_mutex_);
}
@@
-77,7
+81,7
@@
void Process::set_data(int* argc, char*** argv)
argv_ = argv;
// set the process attached to the mailbox
mailbox_small_->setReceiver(process_);
argv_ = argv;
// set the process attached to the mailbox
mailbox_small_->setReceiver(process_);
- XBT_DEBUG("<%lu>
New process in the game
: %p", process_->getPid(), process_.get());
+ XBT_DEBUG("<%lu>
SMPI process has been initialized
: %p", process_->getPid(), process_.get());
}
/** @brief Prepares the current process for termination. */
}
/** @brief Prepares the current process for termination. */
@@
-183,7
+187,7
@@
int Process::papi_event_set()
return papi_event_set_;
}
return papi_event_set_;
}
-papi_counter_t&
smpi_process_
papi_counters()
+papi_counter_t&
Process::
papi_counters()
{
return papi_counter_data_;
}
{
return papi_counter_data_;
}
@@
-238,14
+242,6
@@
msg_bar_t Process::finalization_barrier(){
return finalization_barrier_;
}
return finalization_barrier_;
}
-int Process::return_value(){
- return return_value_;
-}
-
-void Process::set_return_value(int val){
- return_value_=val;
-}
-
void Process::init(int *argc, char ***argv){
if (smpi_process_count() == 0) {
void Process::init(int *argc, char ***argv){
if (smpi_process_count() == 0) {