X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/acd555b41f9a71f6e3ed538f00d1e84fe6d19024..cb384017166c74fdfd75b07c8a80b1af46c9447d:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index dae571e079..4d551932c5 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -11,7 +11,7 @@ #include "simgrid/host.h" #include "xbt/ex.h" #include "xbt/parmap.h" - +#include /* ******************************** Host ************************************ */ /** @brief Host datatype @ingroup simix_host_management @@ -65,16 +65,14 @@ typedef enum { /* Process creation/destruction callbacks */ typedef void (*void_pfn_smxprocess_t) (smx_actor_t); -extern int smx_context_stack_size; +extern unsigned smx_context_stack_size; extern int smx_context_stack_size_was_set; -extern int smx_context_guard_size; +extern unsigned smx_context_guard_size; extern int smx_context_guard_size_was_set; SG_BEGIN_DECL() -XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(); XBT_PUBLIC(smx_actor_t) SIMIX_process_from_PID(aid_t PID); -XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(); /* parallelism */ XBT_PUBLIC(int) SIMIX_context_is_parallel(); @@ -140,12 +138,9 @@ 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_actor_t) SIMIX_process_attach( - const char* name, - void *data, - const char* hostname, - xbt_dict_t properties, - smx_actor_t parent_process); +XBT_PUBLIC(smx_actor_t) +SIMIX_process_attach(const char* name, void* data, const char* hostname, std::map* properties, + smx_actor_t parent_process); XBT_PUBLIC(void) SIMIX_process_detach(); /*********************************** Host *************************************/ @@ -159,8 +154,6 @@ 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_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); @@ -193,7 +186,7 @@ XBT_PUBLIC(smx_activity_t) simcall_execution_start(const char *name, 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); + double* bytes_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); @@ -204,9 +197,8 @@ SG_BEGIN_DECL() /* Constructor and Destructor */ XBT_PUBLIC(smx_actor_t) simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, char** argv, - xbt_dict_t properties); + std::map* properties); -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_actor_t process, xbt_errcat_t cat, int value, const char *msg); @@ -214,17 +206,12 @@ XBT_PUBLIC(void) SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int /* Process handling */ 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_set_data(smx_actor_t process, void *data); -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); @@ -254,8 +241,8 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate); XBT_PUBLIC(smx_activity_t) -simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data); +simcall_comm_iprobe(smx_mailbox_t mbox, int type, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + 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 */ @@ -284,19 +271,13 @@ XBT_PUBLIC(void) simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex); XBT_PUBLIC(void) simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double max_duration); XBT_PUBLIC(void) simcall_cond_broadcast(smx_cond_t cond); -XBT_PUBLIC(smx_sem_t) simcall_sem_init(int capacity); XBT_PUBLIC(void) SIMIX_sem_destroy(smx_sem_t sem); -XBT_PUBLIC(void) simcall_sem_release(smx_sem_t sem); -XBT_PUBLIC(int) simcall_sem_would_block(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); -XBT_PUBLIC(int) simcall_sem_get_capacity(smx_sem_t sem); /***************************** File **********************************/ -XBT_PUBLIC(sg_size_t) simcall_file_read(surf_file_t fd, sg_size_t size, sg_host_t host); -XBT_PUBLIC(sg_size_t) simcall_file_write(surf_file_t fd, sg_size_t size, sg_host_t host); -XBT_PUBLIC(surf_file_t) simcall_file_open(const char* mount, const char* path, sg_storage_t st); -XBT_PUBLIC(int) simcall_file_close(surf_file_t fd, sg_host_t host); +XBT_PUBLIC(sg_size_t) simcall_file_read(surf_file_t fd, sg_size_t size); +XBT_PUBLIC(sg_size_t) simcall_file_write(surf_file_t fd, sg_size_t size); /************************** MC simcalls **********************************/ XBT_PUBLIC(int) simcall_mc_random(int min, int max);