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
please sonar: nothing before the includes
[simgrid.git]
/
src
/
smpi
/
smpi_process.hpp
diff --git
a/src/smpi/smpi_process.hpp
b/src/smpi/smpi_process.hpp
index
ca557a1
..
8960249
100644
(file)
--- a/
src/smpi/smpi_process.hpp
+++ b/
src/smpi/smpi_process.hpp
@@
-7,45
+7,43
@@
#ifndef SMPI_PROCESS_HPP
#define SMPI_PROCESS_HPP
#ifndef SMPI_PROCESS_HPP
#define SMPI_PROCESS_HPP
-
-#include <xbt/base.h>
#include "src/instr/instr_smpi.h"
#include "src/instr/instr_smpi.h"
-#include "private.h"
#include "simgrid/s4u/Mailbox.hpp"
#include "simgrid/s4u/Mailbox.hpp"
+#include "xbt/synchro.h"
namespace simgrid{
namespace smpi{
class Process {
private:
namespace simgrid{
namespace smpi{
class Process {
private:
- double simulated_;
- int
*argc_
;
- char
***argv_
;
+ double simulated_
= 0 /* Used to time with simulated_start/elapsed */
;
+ int
* argc_ = nullptr
;
+ char
*** argv_ = nullptr
;
simgrid::s4u::MailboxPtr mailbox_;
simgrid::s4u::MailboxPtr mailbox_small_;
xbt_mutex_t mailboxes_mutex_;
xbt_os_timer_t timer_;
simgrid::s4u::MailboxPtr mailbox_;
simgrid::s4u::MailboxPtr mailbox_small_;
xbt_mutex_t mailboxes_mutex_;
xbt_os_timer_t timer_;
- MPI_Comm comm_self_;
- MPI_Comm comm_intra_;
- MPI_Comm* comm_world_;
- void
*data_;
/* user data */
- int index_;
+ MPI_Comm comm_self_
= MPI_COMM_NULL
;
+ MPI_Comm comm_intra_
= MPI_COMM_NULL
;
+ MPI_Comm* comm_world_
= nullptr
;
+ void
* data_ = nullptr;
/* user data */
+ int index_
= MPI_UNDEFINED
;
char state_;
char state_;
- int sampling_
;
/* inside an SMPI_SAMPLE_ block? */
- char* instance_id_;
- bool replaying_
;
/* is the process replaying a trace */
+ int sampling_
= 0;
/* inside an SMPI_SAMPLE_ block? */
+ char* instance_id_
= nullptr
;
+ bool replaying_
= false;
/* is the process replaying a trace */
msg_bar_t finalization_barrier_;
msg_bar_t finalization_barrier_;
- int return_value_;
+ int return_value_
= 0
;
smpi_trace_call_location_t trace_call_loc_;
smpi_trace_call_location_t trace_call_loc_;
+ smx_actor_t process_ = nullptr;
#if HAVE_PAPI
/** Contains hardware data as read by PAPI **/
int papi_event_set_;
papi_counter_t papi_counter_data_;
#endif
public:
#if HAVE_PAPI
/** Contains hardware data as read by PAPI **/
int papi_event_set_;
papi_counter_t papi_counter_data_;
#endif
public:
- explicit Process(int index);
- void destroy();
- void set_data(int index, int *argc, char ***argv);
+ explicit Process(int index, msg_bar_t barrier);
+ void set_data(int index, int* argc, char*** argv);
void finalize();
int finalized();
int initialized();
void finalize();
int finalized();
int initialized();
@@
-73,10
+71,10
@@
class Process {
void set_sampling(int s);
int sampling();
msg_bar_t finalization_barrier();
void set_sampling(int s);
int sampling();
msg_bar_t finalization_barrier();
- void set_finalization_barrier(msg_bar_t bar);
int return_value();
void set_return_value(int val);
static void init(int *argc, char ***argv);
int return_value();
void set_return_value(int val);
static void init(int *argc, char ***argv);
+ smx_actor_t process();
};
};