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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
virtu.h
diff --git
a/include/xbt/virtu.h
b/include/xbt/virtu.h
index ef604516e4b24c12e23acae1890978b419392416..0789a9a2ebd729d51d00982ba639c6f1743bbe56 100644
(file)
--- a/
include/xbt/virtu.h
+++ b/
include/xbt/virtu.h
@@
-1,6
+1,6
@@
/* virtu - virtualization layer for the logging to know about the actors */
/* virtu - virtualization layer for the logging to know about the actors */
-/* Copyright (c) 2007-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
23
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-8,22
+8,26
@@
#ifndef XBT_VIRTU_H
#define XBT_VIRTU_H
#ifndef XBT_VIRTU_H
#define XBT_VIRTU_H
-#include "xbt/misc.h"
-#include "xbt/base.h"
-#include "xbt/function_types.h"
-#include "xbt/dynar.h"
+#include <simgrid/actor.h>
+#include <xbt/base.h>
-SG_BEGIN_DECL()
+// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v337)
+#ifndef XBT_VIRTU_H_NO_DEPRECATED_WARNING
+#warning xbt/virtu.h is deprecated and will be removed in v3.37.
+#endif
-XBT_PUBLIC const char* xbt_procname(void);
+SG_BEGIN_DECL
-XBT_PUBLIC int xbt_getpid(void);
+XBT_ATTRIB_DEPRECATED_v337("Please use sg_actor_self_get_name()") static const char* xbt_procname(void)
+{
+ return sg_actor_self_get_name();
+}
-/* Get the name of the UNIX process englobing the world */
-XBT_PUBLIC_DATA(char*) xbt_binary_name;
+XBT_ATTRIB_DEPRECATED_v337("Please use sg_actor_self_get_pid()") static int xbt_getpid(void)
+{
+ return sg_actor_self_get_pid();
+};
-/** Contains all the parameters we got from the command line (including argv[0]) */
-XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline;
+SG_END_DECL
-SG_END_DECL()
#endif /* XBT_VIRTU_H */
#endif /* XBT_VIRTU_H */