X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68b0ad1f0b674b7e68eb1a94554140b1f732e195..7f85c01fa01dfbf9b06f6e8c1fa01e34f49647db:/src/include/simix/simix.h

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 20a656d893..d5effc7431 100644
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -10,40 +10,49 @@
 #define _SIMIX_SIMIX_H
 
 #include "xbt/misc.h"
+#include "xbt/fifo.h"
 #include "simix/datatypes.h"
 
 SG_BEGIN_DECL()
 
 
 /************************** Global ******************************************/
-XBT_PUBLIC(void) SIMIX_config(const char *name, ...);
+XBT_PUBLIC(void) SIMIX_config(const char *name, va_list pa);
 XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv);
 XBT_PUBLIC(void) SIMIX_global_init_args(int *argc, char **argv);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_main(void);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_clean(void);
+XBT_PUBLIC(void) SIMIX_clean(void);
 XBT_PUBLIC(void) SIMIX_function_register(const char *name, smx_process_code_t code);
 XBT_PUBLIC(smx_process_code_t) SIMIX_get_registered_function(const char *name);
-// SIMIX_deploy_application???
+
 XBT_PUBLIC(void) SIMIX_launch_application(const char *file);
 
 XBT_PUBLIC(double) SIMIX_get_clock(void);
+XBT_PUBLIC(double) SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed);
+
+/* Timer functions */
+XBT_PUBLIC(void) SIMIX_timer_set (double date, void *function, void *arg);
+XBT_PUBLIC(int) SIMIX_timer_get(void **function, void **arg);
 
+/* only for tests */
+XBT_PUBLIC(void) __SIMIX_main(void);
 /************************** Host handling ***********************************/
-//pointer to above layer
-XBT_PUBLIC(SIMIX_error_t) SIMIX_host_set_data(smx_host_t host, void *data);
+
+XBT_PUBLIC(void) SIMIX_host_set_data(smx_host_t host, void *data);
 XBT_PUBLIC(void*) SIMIX_host_get_data(smx_host_t host);
 
 XBT_PUBLIC(const char *) SIMIX_host_get_name(smx_host_t host);
 XBT_PUBLIC(smx_host_t) SIMIX_host_self(void);
-/* int SIMIX_get_msgload(void); This function lacks specification; discard it */
-XBT_PUBLIC(double) SIMIX_get_host_speed(smx_host_t h);
-XBT_PUBLIC(int) SIMIX_host_is_avail (smx_host_t h);
+XBT_PUBLIC(double) SIMIX_host_get_speed(smx_host_t host);
+XBT_PUBLIC(double) SIMIX_host_get_available_speed(smx_host_t host);
+
+XBT_PUBLIC(int) SIMIX_host_get_number(void);
+XBT_PUBLIC(smx_host_t *)SIMIX_host_get_table(void);
 
 XBT_PUBLIC(void) SIMIX_create_environment(const char *file);
+XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
 
-XBT_PUBLIC(smx_host_t) SIMIX_get_host_by_name(const char *name);
-XBT_PUBLIC(int) SIMIX_get_host_number(void);
-XBT_PUBLIC(smx_host_t *)SIMIX_get_host_table(void);
+/* Two possible states, 1 - CPU ON and 0 CPU OFF */
+XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host);
 
 /************************** Process handling *********************************/
 XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
@@ -55,21 +64,18 @@ XBT_PUBLIC(smx_process_t) SIMIX_process_create_with_arguments(const char *name,
 XBT_PUBLIC(void) SIMIX_process_kill(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_process_killall(void);
 
-XBT_PUBLIC(SIMIX_error_t) SIMIX_process_change_host(smx_process_t process, smx_host_t host);
 //above layer
 XBT_PUBLIC(void*) SIMIX_process_get_data(smx_process_t process);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_process_set_data(smx_process_t process, void *data);
+XBT_PUBLIC(void) SIMIX_process_set_data(smx_process_t process, void *data);
 
 XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process);
 XBT_PUBLIC(const char *)SIMIX_process_get_name(smx_process_t process);
 XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 
-XBT_PUBLIC(SIMIX_error_t) SIMIX_process_suspend(smx_process_t process);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_process_resume(smx_process_t process);
+XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process);
+XBT_PUBLIC(void) SIMIX_process_resume(smx_process_t process);
 XBT_PUBLIC(int) SIMIX_process_is_suspended(smx_process_t process);
 
-XBT_PUBLIC(SIMIX_error_t) SIMIX_process_sleep(double nb_sec);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_get_errno(void);
 
 /************************** Synchro handling **********************************/
 
@@ -78,7 +84,7 @@ XBT_PUBLIC(smx_mutex_t) SIMIX_mutex_init(void);
 XBT_PUBLIC(void) SIMIX_mutex_lock(smx_mutex_t mutex);
 XBT_PUBLIC(int) SIMIX_mutex_trylock(smx_mutex_t mutex);
 XBT_PUBLIC(void) SIMIX_mutex_unlock(smx_mutex_t mutex);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_mutex_destroy(smx_mutex_t mutex);
+XBT_PUBLIC(void) SIMIX_mutex_destroy(smx_mutex_t mutex);
 
 /*****Conditional*****/
 XBT_PUBLIC(smx_cond_t) SIMIX_cond_init(void);
@@ -86,19 +92,30 @@ XBT_PUBLIC(void) SIMIX_cond_signal(smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex);
 XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration);
 XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_cond_destroy(smx_cond_t cond);
+XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond);
+XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
 
 
 /************************** Action handling ************************************/
-XBT_PUBLIC(smx_action_t) SIMIX_communicate(smx_host_t sender,smx_host_t receiver, char *name, double size, double rate);
-XBT_PUBLIC(smx_action_t) SIMIX_execute(smx_host_t host,char *name, double amount);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_action_cancel(smx_action_t action);
+XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, char *name,
+																									double size, double rate);
+XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,char *name, double amount);
+XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount);
+XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_action_destroy(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
-XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
+XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
+
+/*Not implemented yet */
+XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(int workstation_nb,      
+												 															void **workstation_list,
+																											double *computation_amount,
+																											double *communication_amount,
+																											double amount,
+																											double rate);
 
-//SIMIX_action_wait_for_computation(smx_process_t process, smx_action_t action);
 
 SG_END_DECL()
+
 #endif                          /* _SIMIX_SIMIX_H */