X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de93bc4e405706c217ce4ad11abcd9db16d5906b..60059959d6d517261ca7f4176b0267bc37caf04d:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index da4df7368e..ad1435e375 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -163,7 +163,7 @@ inline static %s simcall_BODY_%s(%s) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     %s
   }'''%(self.res.ret()
@@ -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')
@@ -287,7 +287,7 @@ if __name__=='__main__':
   fd.write(' * \n')
   fd.write(' * This function is generated from src/simix/simcalls.in\n')
   fd.write(' */\n');
-  fd.write('void SIMIX_simcall_enter(smx_simcall_t simcall, int value) {\n');
+  fd.write('void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {\n');
   fd.write('  XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));\n');
   fd.write('  SIMCALL_SET_MC_VALUE(simcall, value);\n');
   fd.write('  if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)\n');
@@ -313,6 +313,9 @@ 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')
   handle(fd, Simcall.body, simcalls, simcalls_dict)
   fd.close()