Split too long file, various cleanups

[simgrid.git] / src / simix / smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 42225ef..81f097b 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -44,7 +44,7 @@ void SIMIX_global_init(int *argc, char **argv)
 }
 
 /* Debug purpose, incomplete */
-void __SIMIX_display_process_status(void)
+void SIMIX_display_process_status(void)
 {
    smx_process_t process = NULL;
    xbt_fifo_item_t item = NULL;
@@ -91,7 +91,7 @@ void __SIMIX_display_process_status(void)
 static void _XBT_CALL inthandler(int ignored)
 {
    INFO0("CTRL-C pressed. Displaying status and bailing out");
-   __SIMIX_display_process_status();
+   SIMIX_display_process_status();
    exit(1);
 }
 
@@ -185,7 +185,6 @@ void SIMIX_clean(void)
   smx_host_t h = NULL;
   smx_process_t p = NULL;
 
-
   while((p=xbt_swag_extract(simix_global->process_list))) {
     SIMIX_process_kill(p);
   }
@@ -317,7 +316,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 /*                     INFO0("Congratulations ! Simulation terminated : all processes are over"); */
                } else {
                        INFO0("Oops ! Deadlock or code not perfectly clean.");
-                       __SIMIX_display_process_status();
+                       SIMIX_display_process_status();
                        if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
                                        XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
                                DEBUG0("Aborting!");
@@ -355,7 +354,7 @@ int SIMIX_timer_get(void **function, void **arg)
  *     \param function Create process function
  *
  */
-void SIMIX_function_register_process_create(void * function)
+void SIMIX_function_register_process_create(smx_creation_func_t* function)
 {
   xbt_assert0((simix_global->create_process_function == NULL), "Data already set");
 
@@ -372,7 +371,7 @@ void SIMIX_function_register_process_create(void * function)
  *     \param function Kill process function
  *
  */
-void SIMIX_function_register_process_kill(void * function)
+void SIMIX_function_register_process_kill(void_f_pvoid_t* function)
 {
   xbt_assert0((simix_global->kill_process_function == NULL), "Data already set");