X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b63f78dc217b79305cef05bd2200069d3e24475..f968cbbb699423fa252994ff42de77f8671ac7eb:/src/smpi/include/smpi_process.hpp

diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp
index 1f4c60728b..e7c6772adc 100644
--- a/src/smpi/include/smpi_process.hpp
+++ b/src/smpi/include/smpi_process.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team.
+/* Copyright (c) 2009-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -28,15 +28,15 @@ class Process {
     MPI_Comm comm_intra_  = MPI_COMM_NULL;
     MPI_Comm* comm_world_ = nullptr;
     void* data_           = nullptr; /* user data */
-    char state_;
+    SmpiProcessState state_;
     int sampling_                   = 0; /* inside an SMPI_SAMPLE_ block? */
     std::string instance_id_;
     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_;
-    simgrid::s4u::ActorPtr process_ = nullptr;
+    simgrid::s4u::ActorPtr actor_ = nullptr;
     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_;
@@ -44,6 +44,7 @@ class Process {
 #endif
   public:
     explicit Process(simgrid::s4u::ActorPtr actor, msg_bar_t barrier);
+    ~Process();
     void set_data(int* argc, char*** argv);
     void finalize();
     int finalized();
@@ -72,11 +73,10 @@ class Process {
     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);
-    simgrid::s4u::ActorPtr process();
+    simgrid::s4u::ActorPtr get_actor();
+    int get_optind();
+    void set_optind(int optind);
 };