rename a generated file involved in the kernel popping

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 05b579c..6c25f40 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -32,7 +32,7 @@ set(EXTRA_DIST
   src/simix/simcalls_generated_args_getter_setter.h
   src/simix/simcalls_generated_body.c
   src/simix/smx_popping_generated.c
   src/simix/simcalls_generated_args_getter_setter.h
   src/simix/simcalls_generated_body.c
   src/simix/smx_popping_generated.c

-  src/simix/simcalls_generated_enum.h
+  src/simix/smx_popping_generated.h

   src/simix/simcalls_generated_res_getter_setter.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/simcalls_generated_res_getter_setter.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 81f785c..8ef406f 100644 (file)
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -10,10 +10,10 @@ if(enable_maintainer_mode AND NOT WIN32)
   if (PYTHON_EXE)
     add_custom_command(
       OUTPUT
   if (PYTHON_EXE)
     add_custom_command(
       OUTPUT

-      ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_enum.h

       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c

+      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.h

       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c
       
       DEPENDS
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c
       
       DEPENDS


@@ -27,15 +27,15 @@ if(enable_maintainer_mode AND NOT WIN32)
 
     add_custom_target(simcalls_generated_src
       DEPENDS
 
     add_custom_target(simcalls_generated_src
       DEPENDS

-      ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_enum.h

       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h
       ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c

+      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.h

       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c
       )
 
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c
       )
 
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES

-      "${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c"
+      "${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c"

       )
   endif()
 endif()
       )
   endif()
 endif()

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index ccaa840..825c1c3 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -206,7 +206,7 @@ def parse(fn):
 
 def header(fd):
     fd.write('/**********************************************************************/\n')
 
 def header(fd):
     fd.write('/**********************************************************************/\n')

-    fd.write('/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */\n')
+    fd.write('/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */\n')

     fd.write('/*                                                                    */\n')
     fd.write('/*                    DO NOT EVER CHANGE THIS FILE                    */\n')
     fd.write('/*                                                                    */\n')
     fd.write('/*                                                                    */\n')
     fd.write('/*                    DO NOT EVER CHANGE THIS FILE                    */\n')
     fd.write('/*                                                                    */\n')


@@ -241,22 +241,38 @@ if __name__=='__main__':
   #  print ("Some checks fail!")
   #  sys.exit(1)
 
   #  print ("Some checks fail!")
   #  sys.exit(1)
 

-  write('simcalls_generated_enum.h', Simcall.enum, simcalls, simcalls_dict,"""
+  write('simcalls_generated_res_getter_setter.h', Simcall.result_getter_setter, simcalls, simcalls_dict)
+  write('simcalls_generated_args_getter_setter.h', Simcall.args_getter_setter, simcalls, simcalls_dict)
+  
+  
+  fd = open("smx_popping_generated.h", 'w')
+  header(fd)
+  fd.write("""
+/*
+ * 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 :)
+ */
+

 /**
  * @brief All possible simcalls.
  */
 typedef enum {
 SIMCALL_NONE,
 /**
  * @brief All possible simcalls.
  */
 typedef enum {
 SIMCALL_NONE,

-  ""","""
+  """)
+  
+  handle(fd, Simcall.enum, simcalls, simcalls_dict)
+  
+  fd.write("""

 SIMCALL_NEW_API_INIT,
 NUM_SIMCALLS
 } e_smx_simcall_t;
   """)
 SIMCALL_NEW_API_INIT,
 NUM_SIMCALLS
 } e_smx_simcall_t;
   """)

+

   
   

-  write('simcalls_generated_res_getter_setter.h', Simcall.result_getter_setter, simcalls, simcalls_dict)
-  write('simcalls_generated_args_getter_setter.h', Simcall.args_getter_setter, simcalls, simcalls_dict)
-  
-  
+  fd.close()
+

   
   fd = open("smx_popping_generated.c", 'w')
   header(fd)
   
   fd = open("smx_popping_generated.c", 'w')
   header(fd)

diff --git a/src/simix/simcalls_generated_args_getter_setter.h b/src/simix/simcalls_generated_args_getter_setter.h
index 392ea49..6b8b2ac 100644 (file)
--- a/src/simix/simcalls_generated_args_getter_setter.h
+++ b/src/simix/simcalls_generated_args_getter_setter.h
@@ -1,5 +1,5 @@
 /**********************************************************************/
 /**********************************************************************/

-/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */
+/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */

 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */

diff --git a/src/simix/simcalls_generated_body.c b/src/simix/simcalls_generated_body.c
index 8ab78ed..dec23ee 100644 (file)
--- a/src/simix/simcalls_generated_body.c
+++ b/src/simix/simcalls_generated_body.c
@@ -1,5 +1,5 @@
 /**********************************************************************/
 /**********************************************************************/

-/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */
+/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */

 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */

diff --git a/src/simix/simcalls_generated_res_getter_setter.h b/src/simix/simcalls_generated_res_getter_setter.h
index 86342fc..7180430 100644 (file)
--- a/src/simix/simcalls_generated_res_getter_setter.h
+++ b/src/simix/simcalls_generated_res_getter_setter.h
@@ -1,5 +1,5 @@
 /**********************************************************************/
 /**********************************************************************/

-/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */
+/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */

 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */

diff --git a/src/simix/smx_popping_generated.c b/src/simix/smx_popping_generated.c
index 2cee0fd..e33bfdc 100644 (file)
--- a/src/simix/smx_popping_generated.c
+++ b/src/simix/smx_popping_generated.c
@@ -1,5 +1,5 @@
 /**********************************************************************/
 /**********************************************************************/

-/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */
+/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */

 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */

diff --git a/src/simix/simcalls_generated_enum.h b/src/simix/smx_popping_generated.h
similarity index 92%
rename from src/simix/simcalls_generated_enum.h
rename to src/simix/smx_popping_generated.h
index b4663ea..84c5172 100644 (file)
--- a/src/simix/simcalls_generated_enum.h
+++ b/src/simix/smx_popping_generated.h
@@ -1,5 +1,5 @@
 /**********************************************************************/
 /**********************************************************************/

-/* File Generated by src/simix/simcalls.py from src/simix/simcalls.in */
+/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */

 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /*                                                                    */
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */


@@ -7,6 +7,13 @@
 /**********************************************************************/
 
 
 /**********************************************************************/
 
 

+/*
+ * 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 :)
+ */
+

 /**
  * @brief All possible simcalls.
  */
 /**
  * @brief All possible simcalls.
  */

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index 4c6c382..230d0cd 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -12,7 +12,7 @@ SG_BEGIN_DECL()
 /********************************* Simcalls *********************************/
 XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
 
 /********************************* Simcalls *********************************/
 XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
 

-#include "simcalls_generated_enum.h" /* All possible simcalls (generated) */
+#include "smx_popping_generated.h" /* All generated code about simcalls */

 
 typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
 typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
 
 typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
 typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);