X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..cd69f8c66886ae218c6a9b38125b27fe157e6bb2:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 2b0b20007f..8b54e3742d 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -373,6 +373,8 @@ XBT_PUBLIC(void) simcall_process_create(smx_process_t *process, XBT_PUBLIC(void) simcall_process_kill(smx_process_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); + /* Process handling */ XBT_PUBLIC(void) simcall_process_cleanup(smx_process_t process); @@ -414,14 +416,15 @@ XBT_PUBLIC(xbt_dict_t) SIMIX_get_rdv_points(void); /***** Communication simcalls *****/ -XBT_PUBLIC(void) simcall_comm_send(smx_rdv_t rdv, double task_size, +XBT_PUBLIC(void) simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_action_t), void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, double timeout); -XBT_PUBLIC(smx_action_t) simcall_comm_isend(smx_rdv_t rdv, double task_size, +XBT_PUBLIC(smx_action_t) simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, + double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *, smx_action_t), @@ -441,7 +444,7 @@ XBT_PUBLIC(smx_action_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, void (*copy_data_fun)(smx_action_t, void*, size_t), void *data, double rate); -XBT_PUBLIC(smx_action_t) simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, +XBT_PUBLIC(smx_action_t) simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data); XBT_PUBLIC(void) simcall_comm_cancel(smx_action_t comm); @@ -501,11 +504,11 @@ XBT_PUBLIC(sg_size_t) simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_ XBT_PUBLIC(sg_size_t) simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host); XBT_PUBLIC(smx_file_t) simcall_file_open(const char* fullpath, smx_host_t host); XBT_PUBLIC(int) simcall_file_close(smx_file_t fd, smx_host_t host); -XBT_PUBLIC(int) simcall_file_unlink(smx_file_t fd); +XBT_PUBLIC(int) simcall_file_unlink(smx_file_t fd, smx_host_t host); XBT_PUBLIC(sg_size_t) simcall_file_get_size(smx_file_t fd); XBT_PUBLIC(xbt_dynar_t) simcall_file_get_info(smx_file_t fd); XBT_PUBLIC(sg_size_t) simcall_file_tell(smx_file_t fd); -XBT_PUBLIC(int) simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin); +XBT_PUBLIC(int) simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin); XBT_PUBLIC(int) simcall_file_move(smx_file_t fd, const char* fullpath); /***************************** Storage **********************************/ XBT_PUBLIC(sg_size_t) simcall_storage_get_free_size (smx_storage_t storage); @@ -528,10 +531,5 @@ 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); -/************************** New API simcalls **********************************/ -/* TUTORIAL: New API */ -/******************************************************************************/ -XBT_PUBLIC(int) simcall_new_api_fct(const char* param1, double param2); - SG_END_DECL() #endif /* _SIMIX_SIMIX_H */