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
change macro names to avoid nameclashes on FINISHED
[simgrid.git]
/
src
/
smpi
/
include
/
smpi_process.hpp
diff --git
a/src/smpi/include/smpi_process.hpp
b/src/smpi/include/smpi_process.hpp
index
0b11c1f
..
7e55da0
100644
(file)
--- a/
src/smpi/include/smpi_process.hpp
+++ b/
src/smpi/include/smpi_process.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
0, 2012-2017
. The SimGrid Team.
+/* Copyright (c) 2009-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-28,24
+28,24
@@
class Process {
MPI_Comm comm_intra_ = MPI_COMM_NULL;
MPI_Comm* comm_world_ = nullptr;
void* data_ = nullptr; /* user data */
MPI_Comm comm_intra_ = MPI_COMM_NULL;
MPI_Comm* comm_world_ = nullptr;
void* data_ = nullptr; /* user data */
- int index_ = MPI_UNDEFINED;
char state_;
int sampling_ = 0; /* inside an SMPI_SAMPLE_ block? */
char state_;
int sampling_ = 0; /* inside an SMPI_SAMPLE_ block? */
-
char* instance_id_ = nullptr
;
+
std::string instance_id_
;
bool replaying_ = false; /* is the process replaying a trace */
msg_bar_t finalization_barrier_;
bool replaying_ = false; /* is the process replaying a trace */
msg_bar_t finalization_barrier_;
- int return_value_ = 0;
smpi_trace_call_location_t trace_call_loc_;
smpi_trace_call_location_t trace_call_loc_;
- s
mx_actor_t process
_ = nullptr;
+ s
imgrid::s4u::ActorPtr actor
_ = nullptr;
smpi_privatization_region_t privatized_region_;
smpi_privatization_region_t privatized_region_;
+ int optind=0; /*for getopt replacement */
#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, msg_bar_t barrier);
- void set_data(int index, int* argc, char*** argv);
+ explicit Process(simgrid::s4u::ActorPtr actor, msg_bar_t barrier);
+ ~Process();
+ void set_data(int* argc, char*** argv);
void finalize();
int finalized();
int initialized();
void finalize();
int finalized();
int initialized();
@@
-57,7
+57,6
@@
class Process {
smpi_trace_call_location_t* call_location();
void set_privatized_region(smpi_privatization_region_t region);
smpi_privatization_region_t privatized_region();
smpi_trace_call_location_t* call_location();
void set_privatized_region(smpi_privatization_region_t region);
smpi_privatization_region_t privatized_region();
- int index();
smx_mailbox_t mailbox();
smx_mailbox_t mailbox_small();
xbt_mutex_t mailboxes_mutex();
smx_mailbox_t mailbox();
smx_mailbox_t mailbox_small();
xbt_mutex_t mailboxes_mutex();
@@
-74,11
+73,10
@@
class Process {
void set_comm_intra(MPI_Comm comm);
void set_sampling(int s);
int sampling();
void set_comm_intra(MPI_Comm comm);
void set_sampling(int s);
int sampling();
- msg_bar_t finalization_barrier();
- int return_value();
- void set_return_value(int val);
static void init(int *argc, char ***argv);
static void init(int *argc, char ***argv);
- smx_actor_t process();
+ simgrid::s4u::ActorPtr get_actor();
+ int get_optind();
+ void set_optind(int optind);
};
};