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
snake_case s4u::Activity
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Actor.hpp
diff --git
a/include/simgrid/s4u/Actor.hpp
b/include/simgrid/s4u/Actor.hpp
index
e1b47f3
..
efdc1bd
100644
(file)
--- a/
include/simgrid/s4u/Actor.hpp
+++ b/
include/simgrid/s4u/Actor.hpp
@@
-206,10
+206,16
@@
public:
/** Returns whether or not this actor has been daemonized or not **/
bool isDaemon();
/** Returns whether or not this actor has been daemonized or not **/
bool isDaemon();
+ XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_name()") const simgrid::xbt::string& getName() const
+ {
+ return get_name();
+ }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_cname()") const char* getCname() const { return get_cname(); }
+
/** Retrieves the name of that actor as a C++ string */
/** Retrieves the name of that actor as a C++ string */
- const simgrid::xbt::string& get
N
ame() const;
+ const simgrid::xbt::string& get
_n
ame() const;
/** Retrieves the name of that actor as a C string */
/** Retrieves the name of that actor as a C string */
- const char* get
C
name() const;
+ const char* get
_c
name() const;
/** Retrieves the host on which that actor is running */
s4u::Host* getHost();
/** Retrieves the PID of that actor
/** Retrieves the host on which that actor is running */
s4u::Host* getHost();
/** Retrieves the PID of that actor
@@
-226,9
+232,9
@@
public:
/** Resume a suspended actor by resuming the task on which it was waiting for the completion. */
void resume();
/** Resume a suspended actor by resuming the task on which it was waiting for the completion. */
void resume();
-
+
void yield();
void yield();
-
+
/** Returns true if the actor is suspended. */
int isSuspended();
/** Returns true if the actor is suspended. */
int isSuspended();
@@
-328,10
+334,12
@@
XBT_PUBLIC aid_t getPid();
XBT_PUBLIC aid_t getPpid();
/** @brief Returns the name of the current actor. */
XBT_PUBLIC aid_t getPpid();
/** @brief Returns the name of the current actor. */
-XBT_PUBLIC std::string getName();
-
+XBT_PUBLIC std::string get_name();
/** @brief Returns the name of the current actor as a C string. */
/** @brief Returns the name of the current actor as a C string. */
-XBT_PUBLIC const char* getCname();
+XBT_PUBLIC const char* get_cname();
+
+XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_name()") XBT_PUBLIC std::string getName();
+XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_cname()") XBT_PUBLIC const char* getCname();
/** @brief Returns the name of the host on which the actor is running. */
XBT_PUBLIC Host* getHost();
/** @brief Returns the name of the host on which the actor is running. */
XBT_PUBLIC Host* getHost();