finish the s/smurf/popping/ renaming

Actually, that strange dance is called Popping in English and Smurf
only in French :)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index f428d99..0052fd1 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -29,16 +29,16 @@ set(EXTRA_DIST
   src/simdag/private.h
   src/simix/simcalls.in
   src/simix/simcalls.py
-  src/simix/smx_popping_bodies.c
-  src/simix/smx_popping_generated.c
-  src/simix/smx_popping_enum.h
-  src/simix/smx_popping_accessors.h
+  src/simix/popping_private.h
+  src/simix/popping_bodies.c
+  src/simix/popping_generated.c
+  src/simix/popping_enum.h
+  src/simix/popping_accessors.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
   src/simix/smx_process_private.h
-  src/simix/smx_smurf_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
   src/smpi/colls/coll_tuned_topo.h
@@ -359,7 +359,7 @@ set(SURF_SRC
   )
 
 set(SIMIX_GENERATED_SRC
-  src/simix/smx_popping_generated.c
+  src/simix/popping_generated.c
   )
 set(SIMIX_SRC
   src/simix/smx_context.c
@@ -372,10 +372,10 @@ set(SIMIX_SRC
   src/simix/smx_io.c
   src/simix/smx_network.c
   src/simix/smx_process.c
-  src/simix/smx_smurf.c
   src/simix/smx_synchro.c
   src/simix/smx_user.c
   src/simix/smx_vm.c
+  src/simix/popping.c
   ${SIMIX_GENERATED_SRC}
   )
 

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 60f188c..fba030f 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
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_bodies.c
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_enum.h
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_accessors.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.c
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.c
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h
       
       DEPENDS
       ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls.py
@@ -26,14 +26,14 @@ if(enable_maintainer_mode AND NOT WIN32)
 
     add_custom_target(simcalls_generated_src
       DEPENDS
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_bodies.c
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_enum.h
-      ${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_accessors.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.c
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.c
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h
       )
 
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-      "${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_generated.c;${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_bodies.c;${CMAKE_HOME_DIRECTORY}/src/simix/smx_popping_accessors.h"
+      "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.c;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.c;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h"
       )
   endif()
 endif()

diff --git a/src/simix/smx_smurf.c b/src/simix/popping.c
similarity index 90%
rename from src/simix/smx_smurf.c
rename to src/simix/popping.c
index f18141c..a6e3ac8 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/popping.c
@@ -11,8 +11,8 @@
 #include "mc/mc_private.h"
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
-                                "Logging specific to SIMIX (SMURF)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
+                                "Popping part of SIMIX (transmuting from user request into kernel handlers)");
 
 void SIMIX_simcall_answer(smx_simcall_t simcall)
 {

diff --git a/src/simix/smx_popping_accessors.h b/src/simix/popping_accessors.h
similarity index 100%
rename from src/simix/smx_popping_accessors.h
rename to src/simix/popping_accessors.h

diff --git a/src/simix/smx_popping_bodies.c b/src/simix/popping_bodies.c
similarity index 100%
rename from src/simix/smx_popping_bodies.c
rename to src/simix/popping_bodies.c

diff --git a/src/simix/smx_popping_enum.h b/src/simix/popping_enum.h
similarity index 100%
rename from src/simix/smx_popping_enum.h
rename to src/simix/popping_enum.h

diff --git a/src/simix/smx_popping_generated.c b/src/simix/popping_generated.c
similarity index 99%
rename from src/simix/smx_popping_generated.c
rename to src/simix/popping_generated.c
index 46f9bdb..d2afb25 100644 (file)
--- a/src/simix/smx_popping_generated.c
+++ b/src/simix/popping_generated.c
@@ -18,7 +18,7 @@
 #include "mc/mc_private.h"
 #endif
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_smurf);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
 
 /** @brief Simcalls' names (generated from src/simix/simcalls.in) */
 const char* simcall_names[] = {

diff --git a/src/simix/smx_smurf_private.h b/src/simix/popping_private.h
similarity index 91%
rename from src/simix/smx_smurf_private.h
rename to src/simix/popping_private.h
index 76bc48a..cc2d741 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/popping_private.h
@@ -4,15 +4,15 @@
 /* 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 _SIMIX_SMURF_PRIVATE_H
-#define _SIMIX_SMURF_PRIVATE_H
+#ifndef _POPPING_PRIVATE_H
+#define _POPPING_PRIVATE_H
 
 SG_BEGIN_DECL()
 
 /********************************* Simcalls *********************************/
 XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
 
-#include "smx_popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
+#include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
 
 typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
 typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
@@ -61,7 +61,7 @@ typedef struct s_smx_simcall {
 #define SIMCALL_GET_MC_VALUE(simcall) 0
 #endif
 
-#include "smx_popping_accessors.h"
+#include "popping_accessors.h"
 
 /******************************** General *************************************/
 

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 58840ce..ad1435e 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -240,14 +240,14 @@ if __name__=='__main__':
   ###
   ### smx_popping_accessors.c
   ###
-  fd = header('smx_popping_accessors.h')
+  fd = header('popping_accessors.h')
   handle(fd, Simcall.accessors, simcalls, simcalls_dict)
   fd.close()
 
   ###
   ### smx_popping_enum.c
   ###
-  fd = header("smx_popping_enum.h")
+  fd = header("popping_enum.h")
   fd.write('/**\n')
   fd.write(' * @brief All possible simcalls.\n')
   fd.write(' */\n')
@@ -264,14 +264,14 @@ if __name__=='__main__':
   ### smx_popping_generated.c
   ###
   
-  fd = header("smx_popping_generated.c")
+  fd = header("popping_generated.c")
   
   fd.write('#include "smx_private.h"\n');
   fd.write('#ifdef HAVE_MC\n');
   fd.write('#include "mc/mc_private.h"\n');
   fd.write('#endif\n');
   fd.write('\n');
-  fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_smurf);\n\n');
+  fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n');
   
   fd.write('/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
   fd.write('const char* simcall_names[] = {\n')
@@ -313,7 +313,7 @@ if __name__=='__main__':
   ###
   ### smx_popping_bodies.c
   ###
-  fd = header('smx_popping_bodies.c')
+  fd = header('popping_bodies.c')
   fd.write('#include "smx_private.h"\n')
   fd.write('#include "mc/mc_interface.h"\n')
   fd.write('#include "xbt/ex.h"\n')

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 2e17bcf..a26a9c4 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_HOST_PRIVATE_H
 
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h
index 9750c40..f06e783 100644 (file)
--- a/src/simix/smx_io_private.h
+++ b/src/simix/smx_io_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_IO_PRIVATE_H
 
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 
 /** @brief Storage datatype */
 typedef struct s_smx_storage_priv {

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index ea3095a..a980644 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_NETWORK_PRIVATE_H
 
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 
 /** @brief Rendez-vous point datatype */
 typedef struct s_smx_rvpoint {

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 81c0fd9..e6f0060 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -22,7 +22,7 @@
 #include "smx_host_private.h"
 #include "smx_io_private.h"
 #include "smx_network_private.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 #include "smx_synchro_private.h"
 
 /* Define only for SimGrid benchmarking purposes */

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index d49eced..c07ac3c 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_PROCESS_PRIVATE_H
 
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index d327392..8d80aa3 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -13,7 +13,7 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
-#include "smx_popping_bodies.c"
+#include "popping_bodies.c"
 
 /**
  * \ingroup simix_host_management
@@ -392,7 +392,6 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution)
  * \return The host object of the VM
  */
 void* simcall_vm_create(const char *name, smx_host_t phys_host){
-  /* will jump to SIMIX_pre_vm_create() in src/simix/smx_smurf_private.h */
   return simcall_BODY_vm_create(name, phys_host);
 }
 
@@ -404,7 +403,6 @@ void* simcall_vm_create(const char *name, smx_host_t phys_host){
  */
 void simcall_vm_start(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_start in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_start(vm);
 }
 
@@ -417,7 +415,6 @@ void simcall_vm_start(smx_host_t vm)
  */
 int simcall_vm_get_state(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_get_state in src/simix/smx_smurf_private.h */
   return simcall_BODY_vm_get_state(vm);
 }
 
@@ -430,31 +427,26 @@ int simcall_vm_get_state(smx_host_t vm)
  */
 void *simcall_vm_get_pm(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_get_pm in src/simix/smx_smurf_private.h */
   return simcall_BODY_vm_get_pm(vm);
 }
 
 void simcall_vm_set_bound(smx_host_t vm, double bound)
 {
-  /* will jump to SIMIX_pre_vm_set_bound in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_set_bound(vm, bound);
 }
 
 void simcall_vm_set_affinity(smx_host_t vm, smx_host_t pm, unsigned long mask)
 {
-  /* will jump to SIMIX_pre_vm_set_affinity in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_set_affinity(vm, pm, mask);
 }
 
 void simcall_host_get_params(smx_host_t vm, ws_params_t params)
 {
-  /* will jump to SIMIX_pre_host_get_params in src/simix/smx_smurf_private.h */
   simcall_BODY_host_get_params(vm, params);
 }
 
 void simcall_host_set_params(smx_host_t vm, ws_params_t params)
 {
-  /* will jump to SIMIX_pre_host_set_params in src/simix/smx_smurf_private.h */
   simcall_BODY_host_set_params(vm, params);
 }
 
@@ -467,7 +459,6 @@ void simcall_host_set_params(smx_host_t vm, ws_params_t params)
  */
 void simcall_vm_migrate(smx_host_t vm, smx_host_t host)
 {
-  /* will jump to SIMIX_pre_vm_migrate in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_migrate(vm, host);
 }
 
@@ -479,7 +470,6 @@ void simcall_vm_migrate(smx_host_t vm, smx_host_t host)
  */
 void simcall_vm_suspend(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_suspend in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_suspend(vm);
 }
 
@@ -491,7 +481,6 @@ void simcall_vm_suspend(smx_host_t vm)
  */
 void simcall_vm_resume(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_resume in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_resume(vm);
 }
 
@@ -503,7 +492,6 @@ void simcall_vm_resume(smx_host_t vm)
  */
 void simcall_vm_save(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_save in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_save(vm);
 }
 
@@ -515,7 +503,6 @@ void simcall_vm_save(smx_host_t vm)
  */
 void simcall_vm_restore(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_restore in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_restore(vm);
 }
 
@@ -527,7 +514,6 @@ void simcall_vm_restore(smx_host_t vm)
  */
 void simcall_vm_shutdown(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_shutdown in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_shutdown(vm);
 }
 
@@ -539,7 +525,6 @@ void simcall_vm_shutdown(smx_host_t vm)
  */
 void simcall_vm_destroy(smx_host_t vm)
 {
-   /* will jump to SIMIX_pre_vm_destroy in src/simix/smx_smurf_private.h */
   simcall_BODY_vm_destroy(vm);
 }
 

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 3b59e3c..f04e5b5 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -676,7 +676,7 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(simix_kernel);
   XBT_LOG_CONNECT(simix_network);
   XBT_LOG_CONNECT(simix_process);
-  XBT_LOG_CONNECT(simix_smurf);
+  XBT_LOG_CONNECT(simix_popping);
   XBT_LOG_CONNECT(simix_synchro);
   XBT_LOG_CONNECT(simix_vm);