[simix] Declare the real type of the argument od run_kernel()

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 115a0e8..5f66232 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -1126,7 +1126,7 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
 
 void simcall_run_kernel(std::function<void()> const& code)
 {
 
 void simcall_run_kernel(std::function<void()> const& code)
 {

-  return simcall_BODY_run_kernel((void*) &code);
+  return simcall_BODY_run_kernel(&code);

 }
 
 int simcall_mc_random(int min, int max) {
 }
 
 int simcall_mc_random(int min, int max) {

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 832686d..8e93873 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -40,8 +40,7 @@ void SIMIX_simcall_exit(smx_synchro_t synchro)
   synchro->post();
 }
 
   synchro->post();
 }
 

-void SIMIX_run_kernel(void* code)
+void SIMIX_run_kernel(std::function<void()> const* code)

 {
 {

-  std::function<void()>* function = (std::function<void()>*) code;
-  (*function)();
+  (*code)();

 }
 }

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index 84a2a0f..5e913d9 100644 (file)
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -1143,11 +1143,11 @@ static inline void simcall_set_category__set__category(smx_simcall_t simcall, co
     simgrid::simix::marshal<const char*>(simcall->args[1], arg);
 }
 
     simgrid::simix::marshal<const char*>(simcall->args[1], arg);
 }
 

-static inline void* simcall_run_kernel__get__code(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<void*>(simcall->args[0]);
+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 void simcall_run_kernel__set__code(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[0], arg);
+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);

 }
 
 /* The prototype of all simcall handlers, automatically generated for you */
 }
 
 /* The prototype of all simcall handlers, automatically generated for you */

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index 5a5ef80..74b4dcf 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -13,6 +13,7 @@
  * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
  */
 
  * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
  */
 

+#include <functional>

 #include "smx_private.h"
 #include "src/mc/mc_forward.hpp"
 #include "xbt/ex.h"
 #include "smx_private.h"
 #include "src/mc/mc_forward.hpp"
 #include "xbt/ex.h"


@@ -436,8 +437,8 @@ inline static void simcall_BODY_set_category(smx_synchro_t synchro, const char*
     return simcall<void, smx_synchro_t, const char*>(SIMCALL_SET_CATEGORY, synchro, category);
   }
   
     return simcall<void, smx_synchro_t, const char*>(SIMCALL_SET_CATEGORY, synchro, category);
   }
   

-inline static void simcall_BODY_run_kernel(void* code) {
+inline static void simcall_BODY_run_kernel(std::function<void()> const* code) {

     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) SIMIX_run_kernel(code);
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) SIMIX_run_kernel(code);

-    return simcall<void, void*>(SIMCALL_RUN_KERNEL, code);
+    return simcall<void, std::function<void()> const*>(SIMCALL_RUN_KERNEL, code);

   }/** @endcond */
   }/** @endcond */

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index 77604ab..f7b5259 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -420,7 +420,7 @@ case SIMCALL_SET_CATEGORY:
       break;
 
 case SIMCALL_RUN_KERNEL:
       break;
 
 case SIMCALL_RUN_KERNEL:

-      SIMIX_run_kernel(simgrid::simix::unmarshal<void*>(simcall->args[0]));
+      SIMIX_run_kernel(simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]));

       SIMIX_simcall_answer(simcall);
       break;
     case NUM_SIMCALLS:
       SIMIX_simcall_answer(simcall);
       break;
     case NUM_SIMCALLS:

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 3415362..93f0bfe 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -59,7 +59,7 @@ XBT_PRIVATE void SIMIX_simcall_answer(smx_simcall_t);
 XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t, int);
 XBT_PRIVATE void SIMIX_simcall_exit(smx_synchro_t);
 XBT_PRIVATE const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t, int);
 XBT_PRIVATE void SIMIX_simcall_exit(smx_synchro_t);
 XBT_PRIVATE const char *SIMIX_simcall_name(e_smx_simcall_t kind);

-XBT_PRIVATE void SIMIX_run_kernel(void* code);
+XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);

 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index 75cb831..c8cf973 100644 (file)
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -115,4 +115,4 @@ xbt_dict_t asr_get_properties(const char* name);
 int        mc_random(int min, int max);
 void       set_category(smx_synchro_t synchro, const char* category) [[nohandler]];
 
 int        mc_random(int min, int max);
 void       set_category(smx_synchro_t synchro, const char* category) [[nohandler]];
 

-void       run_kernel(void* code) [[nohandler]];
+void       run_kernel(std::function<void()> const* code) [[nohandler]];

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 83f7d02..adca709 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -171,7 +171,7 @@ def parse(fn):
         if line.startswith('#') or not line:
             continue
         match = re.match(
         if line.startswith('#') or not line:
             continue
         match = re.match(

-            r'^(\S+)\s+([^\)\(\s]+)\s*\(*([^\(\)]*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
+            r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)

         assert match, line
         ret, name, args, attrs = match.groups()
         sargs = []
         assert match, line
         ret, name, args, attrs = match.groups()
         sargs = []


@@ -344,6 +344,7 @@ if __name__ == '__main__':
     # smx_popping_bodies.cpp
     #
     fd = header('popping_bodies.cpp')
     # smx_popping_bodies.cpp
     #
     fd = header('popping_bodies.cpp')

+    fd.write('#include <functional>\n')

     fd.write('#include "smx_private.h"\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')
     fd.write('#include "smx_private.h"\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')