From 9b8e91c4ab7d0acb4161de83da283774b9d59a6c Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 26 Feb 2022 13:30:14 +0100
Subject: [PATCH] Kill popping_accessors.hpp

---
 MANIFEST.in                      |  1 -
 src/simix/popping_accessors.hpp  | 44 --------------------------------
 src/simix/popping_private.hpp    |  5 ----
 src/simix/simcalls.py            | 11 --------
 tools/cmake/DefinePackages.cmake |  1 -
 5 files changed, 62 deletions(-)
 delete mode 100644 src/simix/popping_accessors.hpp

diff --git a/MANIFEST.in b/MANIFEST.in
index b85dab4479..eac44c5f74 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2464,7 +2464,6 @@ 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_accessors.hpp
 include src/simix/popping_bodies.cpp
 include src/simix/popping_enum.hpp
 include src/simix/popping_generated.cpp
diff --git a/src/simix/popping_accessors.hpp b/src/simix/popping_accessors.hpp
deleted file mode 100644
index 77d6c2655e..0000000000
--- a/src/simix/popping_accessors.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**********************************************************************/
-/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */
-/*                                                                    */
-/*                    DO NOT EVER CHANGE THIS FILE                    */
-/*                                                                    */
-/* change simcalls specification in src/simix/simcalls.in             */
-/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved.    */
-/**********************************************************************/
-
-/*
- * Note that the name comes from http://en.wikipedia.org/wiki/Popping
- * Indeed, the control flow is doing a strange dance in there.
- *
- * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
- */
-
-#include "src/simix/popping_private.hpp"
-static inline std::function<void()> const* simcall_run_kernel__get__code(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args_[0]);
-}
-static inline std::function<void()> const* simcall_run_kernel__getraw__code(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<std::function<void()> const*>(simcall->args_[0]);
-}
-static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, std::function<void()> const* arg)
-{
-  simgrid::simix::marshal<std::function<void()> const*>(simcall->args_[0], arg);
-}
-
-static inline std::function<void()> const* simcall_run_blocking__get__code(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args_[0]);
-}
-static inline std::function<void()> const* simcall_run_blocking__getraw__code(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<std::function<void()> const*>(simcall->args_[0]);
-}
-static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::function<void()> const* arg)
-{
-  simgrid::simix::marshal<std::function<void()> const*>(simcall->args_[0], arg);
-}
-
-/* The prototype of all simcall handlers, automatically generated for you */
diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index e335252eff..19c4084f77 100644
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -61,9 +61,6 @@ XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);
 XBT_PRIVATE void SIMIX_run_blocking(std::function<void()> const* code);
 
 /* Defines the marshal/unmarshal functions for each type of parameters.
- *
- * They will be used in popping_accessors.hpp to define the functions allowing
- * to retrieve/set each parameter of each simcall.
  *
  * There is a unmarshal_raw() function, which is exactly similar to unmarshal()
  * for all types but boost::intrusive_ptr(T). For that type, the unmarshal()
@@ -203,6 +200,4 @@ template <class... A> inline void marshal(smx_simcall_t simcall, Simcall call, A
 }
 }
 
-#include "popping_accessors.hpp"
-
 #endif
diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 78e2c94929..20f6d4182a 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -269,17 +269,6 @@ def main():
         print("Some checks fail!")
         sys.exit(1)
 
-    #
-    # popping_accessors.hpp
-    #
-    fd = header('popping_accessors.hpp')
-    fd.write('#include "src/simix/popping_private.hpp"')
-    handle(fd, Simcall.accessors, simcalls, simcalls_dict)
-    fd.write(
-        "\n/* The prototype of all simcall handlers, automatically generated for you */\n\n")
-    handle(fd, Simcall.handler_prototype, simcalls, simcalls_dict)
-    fd.close()
-
     #
     # popping_enum.hpp
     #
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 31ca111183..9469044bcd 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -28,7 +28,6 @@ set(EXTRA_DIST
   src/simix/popping_bodies.cpp
   src/simix/popping_generated.cpp
   src/simix/popping_enum.hpp
-  src/simix/popping_accessors.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
-- 
2.20.1