Convert to C++, and call get_pid() directly.

diff --git a/MANIFEST.in b/MANIFEST.in
index 13b9e4e..85d7b34 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2604,7 +2604,7 @@ include src/xbt/xbt_os_time.c
 include src/xbt/xbt_replay.cpp
 include src/xbt/xbt_str.cpp
 include src/xbt/xbt_str_test.cpp
 include src/xbt/xbt_replay.cpp
 include src/xbt/xbt_str.cpp
 include src/xbt/xbt_str_test.cpp

-include src/xbt/xbt_virtu.c
+include src/xbt/xbt_virtu.cpp

 include src/xbt_modinter.h
 include teshsuite/java/CMakeLists.txt
 include teshsuite/lua/CMakeLists.txt
 include src/xbt_modinter.h
 include teshsuite/java/CMakeLists.txt
 include teshsuite/lua/CMakeLists.txt

diff --git a/src/xbt/xbt_virtu.c b/src/xbt/xbt_virtu.cpp
similarity index 78%
rename from src/xbt/xbt_virtu.c
rename to src/xbt/xbt_virtu.cpp
index 9032b78..557a2d3 100644 (file)
--- a/src/xbt/xbt_virtu.c
+++ b/src/xbt/xbt_virtu.cpp
@@ -5,17 +5,17 @@
 /* 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. */
 

-#include "simgrid/actor.h"

 #include "simgrid/simix.h"
 #include "simgrid/simix.h"

+#include "src/kernel/actor/ActorImpl.hpp"

 #include "xbt/virtu.h"
 
 int xbt_getpid()
 {
   smx_actor_t self = SIMIX_process_self();
 #include "xbt/virtu.h"
 
 int xbt_getpid()
 {
   smx_actor_t self = SIMIX_process_self();

-  return self == NULL ? 0 : sg_actor_self_get_pid();
+  return self == nullptr ? 0 : self->get_pid();

 }
 
 }
 

-const char *xbt_procname(void)
+const char* xbt_procname(void)

 {
   return SIMIX_process_self_get_name();
 }
 {
   return SIMIX_process_self_get_name();
 }

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e54e32d..b987e4a 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -294,7 +294,7 @@ set(XBT_SRC
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp

-  src/xbt/xbt_virtu.c
+  src/xbt/xbt_virtu.cpp

   src/xbt_modinter.h
   )
 
   src/xbt_modinter.h
   )