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
Now the java implementation of the msg process don't use the os locks. The functions...
[simgrid.git]
/
src
/
include
/
simix
/
simix.h
diff --git
a/src/include/simix/simix.h
b/src/include/simix/simix.h
index
bb011dc
..
616db0a
100644
(file)
--- a/
src/include/simix/simix.h
+++ b/
src/include/simix/simix.h
@@
-118,13
+118,11
@@
XBT_PUBLIC(void) SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex);
XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration);
XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond);
XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond);
XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration);
XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond);
XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond);
-XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
-XBT_PUBLIC(void) SIMIX_unregister_condition_to_action(smx_action_t action, smx_cond_t cond);
XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond);
/************************** Action handling ************************************/
XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond);
/************************** Action handling ************************************/
-XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, char *name,
+XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, c
onst c
har *name,
double size, double rate);
XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,char *name, double amount);
XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount);
double size, double rate);
XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,char *name, double amount);
XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount);
@@
-132,14
+130,14
@@
XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action);
XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action);
XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
+XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action, smx_cond_t cond);
XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
-/*Not implemented yet */
XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name,
XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name,
- int
workstation
_nb,
-
void **workstation
_list,
+ int
host
_nb,
+
smx_host_t *host
_list,
double *computation_amount,
double *communication_amount,
double amount,
double *computation_amount,
double *communication_amount,
double amount,
@@
-150,10
+148,6
@@
void SIMIX_display_process_status(void);
/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
void SIMIX_process_set_jprocess(smx_process_t process, void *jp);
void* SIMIX_process_get_jprocess(smx_process_t process);
/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
void SIMIX_process_set_jprocess(smx_process_t process, void *jp);
void* SIMIX_process_get_jprocess(smx_process_t process);
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm);
-void* SIMIX_process_get_jmutex(smx_process_t process);
-void SIMIX_process_set_jcond(smx_process_t process, void *jc);
-void* SIMIX_process_get_jcond(smx_process_t process);
void SIMIX_process_set_jenv(smx_process_t process, void *je);
void* SIMIX_process_get_jenv(smx_process_t process);
void SIMIX_process_set_jenv(smx_process_t process, void *je);
void* SIMIX_process_get_jenv(smx_process_t process);