Rename popping.cpp -> simcall.cpp to better reflect its content.

diff --git a/MANIFEST.in b/MANIFEST.in
index 1fdf7f4..eb199af 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2335,8 +2335,8 @@ include src/simgrid/sg_config.cpp
 include src/simgrid/sg_version.cpp
 include src/simgrid/util.hpp
 include src/simix/libsmx.cpp
-include src/simix/popping.cpp
-include src/simix/popping_private.hpp
+include src/simix/simcall.cpp
+include src/simix/simcall.hpp
 include src/simix/smx_context.cpp
 include src/smpi/bindings/smpi_f77.cpp
 include src/smpi/bindings/smpi_f77_coll.cpp

diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp
index 6d6deda..a8f893e 100644 (file)
--- a/src/kernel/actor/ActorImpl.hpp
+++ b/src/kernel/actor/ActorImpl.hpp
@@ -8,7 +8,7 @@
 
 #include "simgrid/kernel/Timer.hpp"
 #include "simgrid/s4u/Actor.hpp"
-#include "src/simix/popping_private.hpp"
+#include "src/simix/simcall.hpp"
 #include "xbt/PropertyHolder.hpp"
 #include <boost/intrusive/list.hpp>
 #include <functional>

diff --git a/src/simix/popping.cpp b/src/simix/simcall.cpp
similarity index 97%
rename from src/simix/popping.cpp
rename to src/simix/simcall.cpp
index dbd1415..dfa5dd9 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/simcall.cpp
@@ -3,11 +3,11 @@
 /* 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 "src/simix/simcall.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/popping_private.hpp"
 #include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(simix, "transmuting from user request into kernel handlers");

diff --git a/src/simix/popping_private.hpp b/src/simix/simcall.hpp
similarity index 91%
rename from src/simix/popping_private.hpp
rename to src/simix/simcall.hpp
index 856ddf5..99bf55a 100644 (file)
--- a/src/simix/popping_private.hpp
+++ b/src/simix/simcall.hpp
@@ -3,8 +3,8 @@
 /* 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. */
 
-#ifndef SG_POPPING_PRIVATE_HPP
-#define SG_POPPING_PRIVATE_HPP
+#ifndef SIMCALL_HPP
+#define SIMCALL_HPP
 
 #include "simgrid/forward.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
@@ -28,7 +28,7 @@ public:
   simgrid::kernel::actor::SimcallObserver* observer_ = nullptr; // makes that simcall observable by the MC
   unsigned int mc_max_consider_ =
       0; // How many times this simcall should be used. If >1, this will be a fork in the state space.
-  std::function<void()> const* code_      = nullptr;
+  std::function<void()> const* code_ = nullptr;
 
   const char* get_cname() const;
 };

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index b48ea4b..d53b27b 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -22,7 +22,7 @@ set(EXTRA_DIST
   src/dag/dax.dtd
   src/dag/dax_dtd.c
   src/dag/dax_dtd.h
-  src/simix/popping_private.hpp
+  src/simix/simcall.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
@@ -375,8 +375,6 @@ set(PLUGINS_SRC
   )
 
 set(SIMIX_SRC
-  src/simix/libsmx.cpp
-  src/simix/smx_context.cpp
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
@@ -385,7 +383,6 @@ set(SIMIX_SRC
   src/kernel/context/ContextSwapped.hpp
   src/kernel/context/ContextThread.cpp
   src/kernel/context/ContextThread.hpp
-  src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
   src/kernel/activity/BarrierImpl.cpp
@@ -416,6 +413,9 @@ set(SIMIX_SRC
   src/kernel/actor/SimcallObserver.hpp
   src/kernel/actor/SynchroObserver.cpp
   src/kernel/actor/SynchroObserver.hpp
+  src/simix/libsmx.cpp
+  src/simix/simcall.cpp
+  src/simix/smx_context.cpp
   )
 
 # Boost context may not be available

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 1cc1e60..cc89ebc 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -181,7 +181,7 @@ if(enable_model-checking AND enable_compile_optimizations)
   list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC})
   # but...
   list(APPEND src_list
-    src/simix/popping.cpp)
+    src/simix/simcall.cpp)
   foreach(src ${src_list})
       set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
       if(CMAKE_COMPILER_IS_GNUCC)