A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
function to see the name of syscall types in debugging messages (and use it on SIMIX_...
[simgrid.git]
/
include
/
simix
/
simix.h
diff --git
a/include/simix/simix.h
b/include/simix/simix.h
index
fe8bd2f
..
3ef1f75
100644
(file)
--- a/
include/simix/simix.h
+++ b/
include/simix/simix.h
@@
-66,12
+66,6
@@
XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
-XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- int argc, char **argv,
- xbt_dict_t properties);
XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t);
XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t);
XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
@@
-164,10
+158,13
@@
XBT_PUBLIC(smx_action_t) SIMIX_req_rdv_get_head(smx_rdv_t rdv);
XBT_PUBLIC(smx_action_t) SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size,
double rate, void *src_buff,
size_t src_buff_size,
XBT_PUBLIC(smx_action_t) SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size,
double rate, void *src_buff,
size_t src_buff_size,
+ int (*match_fun)(void *, void *),
void *data);
XBT_PUBLIC(smx_action_t) SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff,
void *data);
XBT_PUBLIC(smx_action_t) SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff,
- size_t * dst_buff_size);
+ size_t * dst_buff_size,
+ int (*match_fun)(void *, void *),
+ void *data);
XBT_PUBLIC(void) SIMIX_req_comm_destroy(smx_action_t comm);
XBT_PUBLIC(void) SIMIX_req_comm_destroy(smx_action_t comm);
@@
-183,7
+180,8
@@
XBT_PUBLIC(int) SIMIX_req_comm_testany(xbt_dynar_t comms);
/* Getters and setters */
XBT_PUBLIC(double) SIMIX_req_comm_get_remains(smx_action_t comm);
XBT_PUBLIC(e_smx_state_t) SIMIX_req_comm_get_state(smx_action_t comm);
/* Getters and setters */
XBT_PUBLIC(double) SIMIX_req_comm_get_remains(smx_action_t comm);
XBT_PUBLIC(e_smx_state_t) SIMIX_req_comm_get_state(smx_action_t comm);
-XBT_PUBLIC(void *) SIMIX_req_comm_get_data(smx_action_t comm);
+XBT_PUBLIC(void *) SIMIX_req_comm_get_src_data(smx_action_t comm);
+XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_data(smx_action_t comm);
XBT_PUBLIC(void *) SIMIX_req_comm_get_src_buff(smx_action_t comm);
XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_buff(smx_action_t comm);
XBT_PUBLIC(size_t) SIMIX_req_comm_get_src_buff_size(smx_action_t comm);
XBT_PUBLIC(void *) SIMIX_req_comm_get_src_buff(smx_action_t comm);
XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_buff(smx_action_t comm);
XBT_PUBLIC(size_t) SIMIX_req_comm_get_src_buff_size(smx_action_t comm);
@@
-198,6
+196,11
@@
XBT_PUBLIC(void) SIMIX_req_comm_copy_buffer_callback(smx_action_t comm, size_t b
XBT_PUBLIC(int) SIMIX_req_comm_is_latency_bounded(smx_action_t comm);
#endif
XBT_PUBLIC(int) SIMIX_req_comm_is_latency_bounded(smx_action_t comm);
#endif
+#ifdef HAVE_TRACING
+/************************** Tracing handling **********************************/
+XBT_PUBLIC(void) SIMIX_req_set_category(smx_action_t action, const char *category);
+#endif
+
/************************** Synchro handling **********************************/
XBT_PUBLIC(smx_mutex_t) SIMIX_req_mutex_init(void);
/************************** Synchro handling **********************************/
XBT_PUBLIC(smx_mutex_t) SIMIX_req_mutex_init(void);
@@
-227,5
+230,11
@@
XBT_PUBLIC(void) SIMIX_req_sem_acquire_timeout(smx_sem_t sem,
XBT_PUBLIC(unsigned int) SIMIX_req_sem_acquire_any(xbt_dynar_t sems);
XBT_PUBLIC(int) SIMIX_req_sem_get_capacity(smx_sem_t sem);
XBT_PUBLIC(unsigned int) SIMIX_req_sem_acquire_any(xbt_dynar_t sems);
XBT_PUBLIC(int) SIMIX_req_sem_get_capacity(smx_sem_t sem);
+const char *SIMIX_request_name(int kind);
+
+/* functions to let the state machine context factory mess with simix flow */
+XBT_PUBLIC(void*) SIMIX_request_get_result(int id);
+XBT_PUBLIC(int) SIMIX_request_last_id(void);
+
SG_END_DECL()
#endif /* _SIMIX_SIMIX_H */
SG_END_DECL()
#endif /* _SIMIX_SIMIX_H */