X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a9daf6dc6023e088fc54646fbe95de0bf872f2d..8d01bd80335f89f2c28cbd1cc00094b5edd8d2de:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index c2449fbfd8..f0fc0bc8ad 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -57,12 +57,11 @@ public: aid_t pid = 0; aid_t ppid = -1; simgrid::xbt::string name; - const simgrid::xbt::string& getName() const { return name; } - const char* getCname() const { return name.c_str(); } + const simgrid::xbt::string& get_name() const { return name; } + const char* get_cname() const { return name.c_str(); } s4u::Host* host = nullptr; /* the host on which the process is running */ smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */ - // TODO, pack them std::exception_ptr exception; bool finished = false; bool blocked = false; @@ -71,7 +70,7 @@ public: smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */ std::list comms; /* the current non-blocking communication synchros */ - s_smx_simcall_t simcall; + s_smx_simcall simcall; void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */ std::vector on_exit; /* list of functions executed when the process dies */