X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ae4444e56c58d6a957263114cff7d81ff48f6a8..9a9668a68e9d439ad4547ab5b9c85b3553493928:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 9beaaf80c3..53e7b0b654 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -16,7 +16,6 @@ #include "simgrid/datatypes.h" #include "simgrid/host.h" - #ifdef __cplusplus namespace simgrid { @@ -128,7 +127,7 @@ extern int smx_context_guard_size_was_set; SG_BEGIN_DECL() -XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void); +XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(); XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void); @@ -136,11 +135,11 @@ XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void); XBT_PUBLIC(int) SIMIX_context_is_parallel(void); XBT_PUBLIC(int) SIMIX_context_get_nthreads(void); XBT_PUBLIC(void) SIMIX_context_set_nthreads(int nb_threads); -XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(void); +XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(); XBT_PUBLIC(void) SIMIX_context_set_parallel_threshold(int threshold); XBT_PUBLIC(e_xbt_parmap_mode_t) SIMIX_context_get_parallel_mode(void); XBT_PUBLIC(void) SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); -XBT_PUBLIC(int) SIMIX_is_maestro(); +XBT_PUBLIC(int) SIMIX_is_maestro(void); /********************************** Global ************************************/ @@ -157,8 +156,8 @@ XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t f XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); /* Simulation execution */ -XBT_PUBLIC(void) SIMIX_run(void); -XBT_PUBLIC(double) SIMIX_get_clock(void); +XBT_PUBLIC(void) SIMIX_run(); +XBT_PUBLIC(double) SIMIX_get_clock(); /* Timer functions FIXME: should these be public? */ typedef struct s_smx_timer* smx_timer_t; @@ -168,7 +167,7 @@ XBT_PUBLIC(void) SIMIX_timer_remove(smx_timer_t timer); XBT_PUBLIC(double) SIMIX_timer_next(void); XBT_PUBLIC(double) SIMIX_timer_get_date(smx_timer_t timer); -XBT_PUBLIC(void) SIMIX_display_process_status(void); +XBT_PUBLIC(void) SIMIX_display_process_status(); /******************************* Environment **********************************/ XBT_PUBLIC(void) SIMIX_create_environment(const char *file); @@ -177,7 +176,6 @@ XBT_PUBLIC(void) SIMIX_create_environment(const char *file); XBT_PUBLIC(void) SIMIX_function_register(const char *name, xbt_main_func_t code); XBT_PUBLIC(void) SIMIX_function_register_default(xbt_main_func_t code); -XBT_PUBLIC(xbt_main_func_t) SIMIX_get_registered_function(const char *name); XBT_PUBLIC(void) SIMIX_init_application(void); XBT_PUBLIC(void) SIMIX_launch_application(const char *file); @@ -203,7 +201,7 @@ XBT_PUBLIC(smx_process_t) SIMIX_process_attach( const char* hostname, xbt_dict_t properties, smx_process_t parent_process); -XBT_PUBLIC(void) SIMIX_process_detach(void); +XBT_PUBLIC(void) SIMIX_process_detach(); /*********************************** Host *************************************/ XBT_PUBLIC(sg_host_t) SIMIX_host_self(void); @@ -221,7 +219,7 @@ XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void); XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_process_self_get_data(void); -XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t); +XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t process); XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c); XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_process_t process); XBT_PUBLIC(void) SIMIX_process_on_exit_runall(smx_process_t process);