X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 5ebb9850c2..1e1e16a8d9 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -7,14 +7,10 @@ #ifndef _SIMIX_SIMIX_H #define _SIMIX_SIMIX_H -#include "xbt/misc.h" -#include "xbt/fifo.h" -#include "xbt/dict.h" -#include "xbt/function_types.h" -#include "xbt/parmap.h" -#include "xbt/swag.h" #include "simgrid/datatypes.h" #include "simgrid/host.h" +#include "xbt/ex.h" +#include "xbt/parmap.h" #ifdef __cplusplus @@ -23,9 +19,13 @@ namespace kernel { namespace context { class Context; class ContextFactory; -}} + } + namespace activity { + class MailboxImpl; + } + } -namespace simix { + namespace simix { /** @brief Process datatype @ingroup simix_process_management @@ -36,19 +36,18 @@ namespace simix { @{ */ class ActorImpl; class Mutex; - class Mailbox; } } typedef simgrid::kernel::context::Context *smx_context_t; -typedef simgrid::simix::ActorImpl *smx_process_t; +typedef simgrid::simix::ActorImpl *smx_actor_t; typedef simgrid::simix::Mutex *smx_mutex_t; -typedef simgrid::simix::Mailbox *smx_mailbox_t; +typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; #else typedef struct s_smx_context *smx_context_t; -typedef struct s_smx_process *smx_process_t; +typedef struct s_smx_actor *smx_actor_t; typedef struct s_smx_mutex *smx_mutex_t; typedef struct s_smx_mailbox *smx_mailbox_t; @@ -80,6 +79,7 @@ typedef enum { SIMIX_FAILED, SIMIX_SRC_HOST_FAILURE, SIMIX_DST_HOST_FAILURE, + SIMIX_TIMEOUT, SIMIX_SRC_TIMEOUT, SIMIX_DST_TIMEOUT, SIMIX_LINK_FAILURE @@ -115,7 +115,7 @@ typedef enum { /******************************* Networking ***********************************/ /* Process creation/destruction callbacks */ -typedef void (*void_pfn_smxprocess_t) (smx_process_t); +typedef void (*void_pfn_smxprocess_t) (smx_actor_t); /* for auto-restart function */ typedef void (*void_pfn_sghost_t) (sg_host_t); @@ -127,7 +127,7 @@ extern int smx_context_guard_size_was_set; SG_BEGIN_DECL() XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(); -XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); +XBT_PUBLIC(smx_actor_t) SIMIX_process_from_PID(int PID); XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(); /* parallelism */ @@ -194,45 +194,44 @@ XBT_PUBLIC(void) SIMIX_process_set_function(const char* process_host, */ XBT_PUBLIC(void) SIMIX_maestro_create(void (*code)(void*), void* data); -XBT_PUBLIC(smx_process_t) SIMIX_process_attach( +XBT_PUBLIC(smx_actor_t) SIMIX_process_attach( const char* name, void *data, const char* hostname, xbt_dict_t properties, - smx_process_t parent_process); + smx_actor_t parent_process); XBT_PUBLIC(void) SIMIX_process_detach(); /*********************************** Host *************************************/ XBT_PUBLIC(sg_host_t) SIMIX_host_self(); XBT_PUBLIC(const char*) SIMIX_host_self_get_name(); -XBT_PUBLIC(void) SIMIX_host_on(sg_host_t host); -XBT_PUBLIC(void) SIMIX_host_off(sg_host_t host, smx_process_t issuer); +XBT_PUBLIC(void) SIMIX_host_off(sg_host_t host, smx_actor_t issuer); XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_host_self_get_data(); /********************************* Process ************************************/ -XBT_PUBLIC(smx_process_t) SIMIX_process_ref(smx_process_t process); -XBT_PUBLIC(void) SIMIX_process_unref(smx_process_t process); +XBT_PUBLIC(smx_actor_t) SIMIX_process_ref(smx_actor_t process); +XBT_PUBLIC(void) SIMIX_process_unref(smx_actor_t process); XBT_PUBLIC(int) SIMIX_process_count(); -XBT_PUBLIC(smx_process_t) SIMIX_process_self(); +XBT_PUBLIC(smx_actor_t) SIMIX_process_self(); XBT_PUBLIC(const char*) SIMIX_process_self_get_name(); XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_process_self_get_data(); -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); -XBT_PUBLIC(void) SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data); +XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_actor_t process); +XBT_PUBLIC(void) SIMIX_process_set_context(smx_actor_t p,smx_context_t c); +XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_actor_t process); +XBT_PUBLIC(void) SIMIX_process_on_exit_runall(smx_actor_t process); +XBT_PUBLIC(void) SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data); /****************************** Communication *********************************/ -XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro_t, void*, size_t)); -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(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, size_t)); +XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_activity_t comm, void* buff, size_t buff_size); +XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(smx_synchro_t) SIMIX_comm_get_send_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(smx_activity_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); +XBT_PUBLIC(void) SIMIX_comm_finish(smx_activity_t synchro); /******************************************************************************/ /* SIMIX simcalls */ @@ -241,129 +240,99 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro); /* They can also be called from maestro's context, and they are thread safe. */ /******************************************************************************/ -XBT_PUBLIC(void) simcall_call(smx_process_t process); +XBT_PUBLIC(void) simcall_call(smx_actor_t process); /******************************* Host simcalls ********************************/ XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data); -XBT_PUBLIC(smx_synchro_t) simcall_execution_start(const char *name, +XBT_PUBLIC(smx_activity_t) simcall_execution_start(const char *name, double flops_amount, - double priority, double bound, unsigned long affinity_mask); -XBT_PUBLIC(smx_synchro_t) simcall_execution_parallel_start(const char *name, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double amount, - double rate); -XBT_PUBLIC(void) simcall_execution_cancel(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); - -/******************************* VM simcalls ********************************/ -// Create the vm_workstation at the SURF level -XBT_PUBLIC(void*) simcall_vm_create(const char *name, sg_host_t host); -XBT_PUBLIC(int) simcall_vm_get_state(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_start(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_migrate(sg_host_t vm, sg_host_t dst_pm); -XBT_PUBLIC(void *) simcall_vm_get_pm(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_set_bound(sg_host_t vm, double bound); -XBT_PUBLIC(void) simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask); -XBT_PUBLIC(void) simcall_vm_resume(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm); -XBT_PUBLIC(void) simcall_vm_save(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_restore(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_suspend(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_destroy(sg_host_t vm); -XBT_PUBLIC(void) simcall_vm_shutdown(sg_host_t vm); + double priority, double bound); +XBT_PUBLIC(smx_activity_t) +simcall_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double amount, double rate, double timeout); +XBT_PUBLIC(void) simcall_execution_cancel(smx_activity_t execution); +XBT_PUBLIC(void) simcall_execution_set_priority(smx_activity_t execution, double priority); +XBT_PUBLIC(void) simcall_execution_set_bound(smx_activity_t execution, double bound); +XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_activity_t execution); /**************************** Process simcalls ********************************/ /* Constructor and Destructor */ -XBT_PUBLIC(smx_process_t) simcall_process_create(const char *name, +XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name, xbt_main_func_t code, void *data, - const char *hostname, - double kill_time, + sg_host_t host, int argc, char **argv, xbt_dict_t properties, int auto_restart); -XBT_PUBLIC(void) simcall_process_kill(smx_process_t process); +XBT_PUBLIC(void) simcall_process_kill(smx_actor_t process); XBT_PUBLIC(void) simcall_process_killall(int reset_pid); -XBT_PUBLIC(void) SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, const char *msg); +XBT_PUBLIC(void) SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char *msg); /* Process handling */ -XBT_PUBLIC(void) simcall_process_cleanup(smx_process_t process); -XBT_PUBLIC(void) simcall_process_suspend(smx_process_t process); -XBT_PUBLIC(void) simcall_process_resume(smx_process_t process); +XBT_PUBLIC(void) simcall_process_cleanup(smx_actor_t process); +XBT_PUBLIC(void) simcall_process_suspend(smx_actor_t process); +XBT_PUBLIC(void) simcall_process_resume(smx_actor_t process); /* Getters and Setters */ XBT_PUBLIC(int) simcall_process_count(); -XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process); -XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data); -XBT_PUBLIC(void) simcall_process_set_host(smx_process_t process, sg_host_t dest); -XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process); -XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host); -XBT_PUBLIC(void) simcall_process_set_kill_time(smx_process_t process, double kill_time); -XBT_PUBLIC(double) simcall_process_get_kill_time(smx_process_t process); -XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data); -XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart); -XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process); -XBT_PUBLIC(void) simcall_process_join(smx_process_t process, double timeout); +XBT_PUBLIC(void) simcall_process_set_data(smx_actor_t process, void *data); +XBT_PUBLIC(void) simcall_process_set_host(smx_actor_t process, sg_host_t dest); +XBT_PUBLIC(int) simcall_process_is_suspended(smx_actor_t process); +XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_actor_t host); +XBT_PUBLIC(void) simcall_process_set_kill_time(smx_actor_t process, double kill_time); +XBT_PUBLIC(double) simcall_process_get_kill_time(smx_actor_t process); +XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data); +XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart); +XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process); +XBT_PUBLIC(void) simcall_process_join(smx_actor_t process, double timeout); /* Sleep control */ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration); /************************** Comunication simcalls *****************************/ -/***** Rendez-vous points *****/ - -XBT_PUBLIC(smx_mailbox_t) simcall_mbox_create(const char *name); -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_mailbox_t mbox, double task_size, +XBT_PUBLIC(void) simcall_comm_send(smx_actor_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), + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout); -XBT_PUBLIC(smx_synchro_t) simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, +XBT_PUBLIC(smx_activity_t) simcall_comm_isend(smx_actor_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), + int (*match_fun)(void *, void *, smx_activity_t), void (*clean_fun)(void *), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, int detached); -XBT_PUBLIC(void) simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, +XBT_PUBLIC(void) simcall_comm_recv(smx_actor_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), + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout, double rate); -XBT_PUBLIC(smx_synchro_t) simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, +XBT_PUBLIC(smx_activity_t) simcall_comm_irecv(smx_actor_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), + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double rate); -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); +XBT_PUBLIC(smx_activity_t) simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, + int (*match_fun)(void *, void *, smx_activity_t), void *data); +XBT_PUBLIC(void) simcall_comm_cancel(smx_activity_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms, double timeout); -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(smx_synchro_t* comms, size_t count); +XBT_PUBLIC(void) simcall_comm_wait(smx_activity_t comm, double timeout); +XBT_PUBLIC(int) simcall_comm_test(smx_activity_t comm); +XBT_PUBLIC(int) simcall_comm_testany(smx_activity_t* comms, size_t count); /************************** Tracing handling **********************************/ -XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *category); +XBT_PUBLIC(void) simcall_set_category(smx_activity_t synchro, const char *category); /************************** Synchro simcalls **********************************/ XBT_PUBLIC(smx_mutex_t) simcall_mutex_init(); @@ -413,10 +382,6 @@ XBT_PUBLIC(xbt_dict_t) simcall_storage_get_content(smx_storage_t storage); XBT_PUBLIC(const char*) SIMIX_storage_get_name(smx_storage_t storage); XBT_PUBLIC(sg_size_t) SIMIX_storage_get_size(smx_storage_t storage); XBT_PUBLIC(const char*) SIMIX_storage_get_host(smx_storage_t storage); -/************************** AS router **********************************/ -XBT_PUBLIC(xbt_dict_t) SIMIX_asr_get_properties(const char *name); -/************************** AS router simcalls ***************************/ -XBT_PUBLIC(xbt_dict_t) simcall_asr_get_properties(const char *name); /************************** MC simcalls **********************************/ XBT_PUBLIC(int) simcall_mc_random(int min, int max);