X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6d4c2261e41280b7a0ccd04425de8f5235216c9..5c037db836667c8408d94daf61b893dd1efbabca:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index dc95bd2d7f..f0de3ed8fd 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -21,16 +21,28 @@ namespace simgrid { namespace simix { + + /** @brief Process datatype + @ingroup simix_process_management + + A process may be defined as a code, with some private + data, executing in a location. + \see m_process_management + @{ */ + class Process; class Context; class ContextFactory; + } } typedef simgrid::simix::Context *smx_context_t; +typedef simgrid::simix::Process *smx_process_t; #else typedef struct s_smx_context *smx_context_t; +typedef struct s_smx_process *smx_process_t; #endif @@ -91,64 +103,25 @@ typedef struct s_smx_file *smx_file_t; typedef xbt_dictelm_t smx_storage_t; typedef struct s_smx_storage_priv *smx_storage_priv_t; -/********************************** Synchro *************************************/ -typedef struct s_smx_synchro *smx_synchro_t; /* FIXME: replace by specialized synchro handlers */ - /* ****************************** Process *********************************** */ -/** @brief Process datatype - @ingroup simix_process_management - A process may be defined as a code, with some private - data, executing in a location. - \see m_process_management - @{ */ -typedef struct s_smx_process *smx_process_t; typedef enum { SMX_EXIT_SUCCESS = 0, SMX_EXIT_FAILURE = 1 } smx_process_exit_status_t; /** @} */ - -/* - * Type of function that creates a process. - * The function must accept the following parameters: - * void* process: the process created will be stored there - * const char *name: a name for the object. It is for user-level information and can be NULL - * xbt_main_func_t code: is a function describing the behavior of the process - * void *data: data a pointer to any data one may want to attach to the new object. - * sg_host_t host: the location where the new process is executed - * int argc, char **argv: parameters passed to code - * xbt_dict_t pros: properties - */ -typedef smx_process_t (*smx_creation_func_t) ( - /* name */ const char*, - /* code */ xbt_main_func_t, - /* userdata */ void*, - /* hostname */ const char*, - /* kill_time */ double, - /* argc */ int, - /* argv */ char**, - /* props */ xbt_dict_t, - /* auto_restart */ int, - /* parent_process */ smx_process_t); - - /******************************* Networking ***********************************/ /** - * \ingroup simix_rdv_management + * \ingroup simix_mbox_management */ -typedef struct s_smx_rvpoint *smx_rdv_t; - -XBT_PUBLIC(void*) SIMIX_comm_get_src_data(smx_synchro_t synchro); -XBT_PUBLIC(void*) SIMIX_comm_get_dst_data(smx_synchro_t synchro); +typedef struct s_smx_mailbox *smx_mailbox_t; /* Process creation/destruction callbacks */ typedef void (*void_pfn_smxprocess_t) (smx_process_t); /* for auto-restart function */ typedef void (*void_pfn_sghost_t) (sg_host_t); -extern char* smx_context_factory_name; extern int smx_context_stack_size; extern int smx_context_stack_size_was_set; extern int smx_context_guard_size; @@ -180,7 +153,6 @@ XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv); XBT_PUBLIC(void) SIMIX_set_maestro(void (*code)(void*), void* data); XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function); -XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function); XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); /* Simulation execution */ @@ -258,9 +230,9 @@ XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_synchro_t comm, void* buff, size_t buff_size); XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_synchro_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(smx_synchro_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); -XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); -XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(smx_synchro_t) SIMIX_comm_get_send_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro); /******************************************************************************/ @@ -273,13 +245,8 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro); XBT_PUBLIC(void) simcall_call(smx_process_t process); /******************************* Host simcalls ********************************/ -/* TODO use handlers and keep sg_host_t hidden from higher levels */ -XBT_PUBLIC(xbt_swag_t) simcall_host_get_process_list(sg_host_t host); XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data); -XBT_PUBLIC(double) simcall_host_get_current_power_peak(sg_host_t host); -XBT_PUBLIC(double) simcall_host_get_power_peak_at(sg_host_t host, int pstate_index); - XBT_PUBLIC(smx_synchro_t) simcall_execution_start(const char *name, double flops_amount, double priority, double bound, unsigned long affinity_mask); @@ -290,20 +257,12 @@ XBT_PUBLIC(smx_synchro_t) simcall_execution_parallel_start(const char *name, double *bytes_amount, double amount, double rate); -XBT_PUBLIC(void) simcall_execution_destroy(smx_synchro_t execution); XBT_PUBLIC(void) simcall_execution_cancel(smx_synchro_t execution); -XBT_PUBLIC(double) simcall_execution_get_remains(smx_synchro_t execution); -XBT_PUBLIC(e_smx_state_t) simcall_execution_get_state(smx_synchro_t execution); XBT_PUBLIC(void) simcall_execution_set_priority(smx_synchro_t execution, double priority); XBT_PUBLIC(void) simcall_execution_set_bound(smx_synchro_t execution, double bound); XBT_PUBLIC(void) simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask); XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_synchro_t execution); -XBT_PUBLIC(xbt_dict_t) simcall_host_get_mounted_storage_list(sg_host_t host); -XBT_PUBLIC(xbt_dynar_t) simcall_host_get_attached_storage_list(sg_host_t host); -XBT_PUBLIC(void) simcall_host_get_params(sg_host_t vm, vm_params_t param); -XBT_PUBLIC(void) simcall_host_set_params(sg_host_t vm, vm_params_t param); - /******************************* VM simcalls ********************************/ // Create the vm_workstation at the SURF level XBT_PUBLIC(void*) simcall_vm_create(const char *name, sg_host_t host); @@ -365,26 +324,21 @@ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration); /************************** Comunication simcalls *****************************/ /***** Rendez-vous points *****/ -XBT_PUBLIC(smx_rdv_t) simcall_rdv_create(const char *name); -XBT_PUBLIC(void) simcall_rdv_destroy(smx_rdv_t rvp); -XBT_PUBLIC(smx_rdv_t) simcall_rdv_get_by_name(const char *name); -XBT_PUBLIC(int) simcall_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host); -XBT_PUBLIC(smx_synchro_t) simcall_rdv_get_head(smx_rdv_t rdv); -XBT_PUBLIC(smx_process_t) simcall_rdv_get_receiver(smx_rdv_t rdv); -XBT_PUBLIC(void) simcall_rdv_set_receiver(smx_rdv_t rdv , smx_process_t process); - -XBT_PUBLIC(xbt_dict_t) SIMIX_get_rdv_points(void); +XBT_PUBLIC(smx_mailbox_t) simcall_mbox_create(const char *name); +XBT_PUBLIC(smx_mailbox_t) simcall_mbox_get_by_name(const char *name); +XBT_PUBLIC(smx_synchro_t) simcall_mbox_front(smx_mailbox_t mbox); +XBT_PUBLIC(void) simcall_mbox_set_receiver(smx_mailbox_t mbox , smx_process_t process); /***** Communication simcalls *****/ -XBT_PUBLIC(void) simcall_comm_send(smx_process_t sender, smx_rdv_t rdv, double task_size, +XBT_PUBLIC(void) simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout); -XBT_PUBLIC(smx_synchro_t) simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv, +XBT_PUBLIC(smx_synchro_t) simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, @@ -393,19 +347,19 @@ XBT_PUBLIC(smx_synchro_t) simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, int detached); -XBT_PUBLIC(void) simcall_comm_recv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, +XBT_PUBLIC(void) simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout, double rate); -XBT_PUBLIC(smx_synchro_t) simcall_comm_irecv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, +XBT_PUBLIC(smx_synchro_t) simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double rate); -XBT_PUBLIC(smx_synchro_t) simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, +XBT_PUBLIC(smx_synchro_t) simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data); XBT_PUBLIC(void) simcall_comm_cancel(smx_synchro_t comm); @@ -415,18 +369,6 @@ XBT_PUBLIC(void) simcall_comm_wait(smx_synchro_t comm, double timeout); XBT_PUBLIC(int) simcall_comm_test(smx_synchro_t comm); XBT_PUBLIC(int) simcall_comm_testany(xbt_dynar_t comms); -/* Getters and setters */ -XBT_PUBLIC(double) simcall_comm_get_remains(smx_synchro_t comm); -XBT_PUBLIC(e_smx_state_t) simcall_comm_get_state(smx_synchro_t comm); -XBT_PUBLIC(void *) simcall_comm_get_src_data(smx_synchro_t comm); -XBT_PUBLIC(void *) simcall_comm_get_dst_data(smx_synchro_t comm); -XBT_PUBLIC(smx_process_t) simcall_comm_get_src_proc(smx_synchro_t comm); -XBT_PUBLIC(smx_process_t) simcall_comm_get_dst_proc(smx_synchro_t comm); - -#ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) simcall_comm_is_latency_bounded(smx_synchro_t comm); -#endif - /************************** Tracing handling **********************************/ XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *category); @@ -485,8 +427,6 @@ XBT_PUBLIC(xbt_dict_t) SIMIX_asr_get_properties(const char *name); XBT_PUBLIC(xbt_dict_t) simcall_asr_get_properties(const char *name); /************************** MC simcalls **********************************/ -XBT_PUBLIC(void *) simcall_mc_snapshot(void); -XBT_PUBLIC(int) simcall_mc_compare_snapshots(void *s1, void *s2); XBT_PUBLIC(int) simcall_mc_random(int min, int max); SG_END_DECL()