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
make my previous commit also compile under MC (sorry)
[simgrid.git]
/
src
/
simix
/
smx_user.c
diff --git
a/src/simix/smx_user.c
b/src/simix/smx_user.c
index
61ffbfe
..
16e1f6a
100644
(file)
--- a/
src/simix/smx_user.c
+++ b/
src/simix/smx_user.c
@@
-7,7
+7,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
-#include "mc/mc.h"
+#include "mc/mc
_interface
.h"
#include "xbt/ex.h"
#include <math.h> /* isfinite() */
#include "xbt/ex.h"
#include <math.h> /* isfinite() */
@@
-197,7
+197,6
@@
int simcall_host_get_nb_pstates(smx_host_t host)
*
* \param host A SIMIX host
* \param pstate_index The pstate to which the CPU power will be set
*
* \param host A SIMIX host
* \param pstate_index The pstate to which the CPU power will be set
- * \return void
*/
void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
{
*/
void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
{
@@
-239,7
+238,7
@@
smx_action_t simcall_host_execute(const char *name, smx_host_t host,
/* checking for infinite values */
xbt_assert(isfinite(computation_amount), "computation_amount is not finite!");
xbt_assert(isfinite(priority), "priority is not finite!");
/* checking for infinite values */
xbt_assert(isfinite(computation_amount), "computation_amount is not finite!");
xbt_assert(isfinite(priority), "priority is not finite!");
-
+
return simcall_BODY_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
}
return simcall_BODY_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
}
@@
-271,14
+270,14
@@
smx_action_t simcall_host_parallel_execute(const char *name,
for (i = 0 ; i < host_nb ; ++i) {
xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
for (j = 0 ; j < host_nb ; ++j) {
for (i = 0 ; i < host_nb ; ++i) {
xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
for (j = 0 ; j < host_nb ; ++j) {
- xbt_assert(isfinite(communication_amount[i + host_nb * j]),
+ xbt_assert(isfinite(communication_amount[i + host_nb * j]),
"communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
"communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
- }
- }
-
+ }
+ }
+
xbt_assert(isfinite(amount), "amount is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
xbt_assert(isfinite(amount), "amount is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
-
+
return simcall_BODY_host_parallel_execute(name, host_nb, host_list,
computation_amount,
communication_amount,
return simcall_BODY_host_parallel_execute(name, host_nb, host_list,
computation_amount,
communication_amount,
@@
-346,7
+345,7
@@
void simcall_host_execution_set_priority(smx_action_t execution, double priority
{
/* checking for infinite values */
xbt_assert(isfinite(priority), "priority is not finite!");
{
/* checking for infinite values */
xbt_assert(isfinite(priority), "priority is not finite!");
-
+
simcall_BODY_host_execution_set_priority(execution, priority);
}
simcall_BODY_host_execution_set_priority(execution, priority);
}
@@
-437,7
+436,7
@@
int simcall_vm_get_state(smx_host_t vm)
*/
void *simcall_vm_get_pm(smx_host_t vm)
{
*/
void *simcall_vm_get_pm(smx_host_t vm)
{
- /* will jump to SIMIX_pre_vm_
migrate
in src/simix/smx_smurf_private.h */
+ /* will jump to SIMIX_pre_vm_
get_pm
in src/simix/smx_smurf_private.h */
return simcall_BODY_vm_get_pm(vm);
}
return simcall_BODY_vm_get_pm(vm);
}
@@
-629,6
+628,11
@@
void simcall_process_change_host(smx_process_t process, smx_host_t dest)
simcall_BODY_process_change_host(process, dest);
}
simcall_BODY_process_change_host(process, dest);
}
+void simcall_process_join(smx_process_t process, double timeout)
+{
+ simcall_BODY_process_join(process, timeout);
+}
+
/**
* \ingroup simix_process_management
* \brief Suspends a process.
/**
* \ingroup simix_process_management
* \brief Suspends a process.
@@
-814,7
+818,7
@@
xbt_dict_t simcall_process_get_properties(smx_process_t process)
* \brief Add an on_exit function
* Add an on_exit function which will be executed when the process exits/is killed.
*/
* \brief Add an on_exit function
* Add an on_exit function which will be executed when the process exits/is killed.
*/
-XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data)
+XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_
pvoid_
t fun, void *data)
{
simcall_BODY_process_on_exit(process, fun, data);
}
{
simcall_BODY_process_on_exit(process, fun, data);
}
@@
-928,51
+932,53
@@
smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
/**
* \ingroup simix_comm_management
*/
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate,
+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,
void *src_buff, size_t src_buff_size,
- int (*match_fun)(void *, void *, smx_action_t), void *data,
+ int (*match_fun)(void *, void *, smx_action_t),
+ void (*copy_data_fun)(smx_action_t, void*, size_t), void *data,
double timeout)
{
/* checking for infinite values */
xbt_assert(isfinite(task_size), "task_size is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
xbt_assert(isfinite(timeout), "timeout is not finite!");
double timeout)
{
/* checking for infinite values */
xbt_assert(isfinite(task_size), "task_size is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
xbt_assert(isfinite(timeout), "timeout is not finite!");
-
+
xbt_assert(rdv, "No rendez-vous point defined for send");
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
xbt_assert(rdv, "No rendez-vous point defined for send");
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
- comm = simcall_comm_isend(rdv, task_size, rate,
- src_buff, src_buff_size, match_fun, NULL, data, 0);
+ comm = simcall_comm_isend(
src,
rdv, task_size, rate,
+ src_buff, src_buff_size, match_fun, NULL,
copy_data_fun,
data, 0);
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
- simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size,
- match_fun, data, timeout);
+ simcall_BODY_comm_send(
src,
rdv, task_size, rate, src_buff, src_buff_size,
+ match_fun,
copy_data_fun,
data, timeout);
}
}
/**
* \ingroup simix_comm_management
*/
}
}
/**
* \ingroup simix_comm_management
*/
-smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate,
+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),
void (*clean_fun)(void *),
void *src_buff, size_t src_buff_size,
int (*match_fun)(void *, void *, smx_action_t),
void (*clean_fun)(void *),
+ void (*copy_data_fun)(smx_action_t, void*, size_t),
void *data,
int detached)
{
/* checking for infinite values */
xbt_assert(isfinite(task_size), "task_size is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
void *data,
int detached)
{
/* checking for infinite values */
xbt_assert(isfinite(task_size), "task_size is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
-
+
xbt_assert(rdv, "No rendez-vous point defined for isend");
xbt_assert(rdv, "No rendez-vous point defined for isend");
- return simcall_BODY_comm_isend(rdv, task_size, rate, src_buff,
+ return simcall_BODY_comm_isend(
src,
rdv, task_size, rate, src_buff,
src_buff_size, match_fun,
src_buff_size, match_fun,
- clean_fun, data, detached);
+ clean_fun,
copy_data_fun,
data, detached);
}
/**
}
/**
@@
-980,6
+986,7
@@
smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate,
*/
void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
int (*match_fun)(void *, void *, smx_action_t),
*/
void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
int (*match_fun)(void *, void *, smx_action_t),
+ void (*copy_data_fun)(smx_action_t, void*, size_t),
void *data, double timeout, double rate)
{
xbt_assert(isfinite(timeout), "timeout is not finite!");
void *data, double timeout, double rate)
{
xbt_assert(isfinite(timeout), "timeout is not finite!");
@@
-989,13
+996,13
@@
void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
/* the model-checker wants two separate simcalls */
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
/* the model-checker wants two separate simcalls */
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
- match_fun, data, rate);
+ match_fun,
copy_data_fun,
data, rate);
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
- match_fun, data, timeout, rate);
+ match_fun,
copy_data_fun,
data, timeout, rate);
}
}
/**
}
}
/**
@@
-1003,23
+1010,24
@@
void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
*/
smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
int (*match_fun)(void *, void *, smx_action_t),
*/
smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
int (*match_fun)(void *, void *, smx_action_t),
+ void (*copy_data_fun)(smx_action_t, void*, size_t),
void *data, double rate)
{
xbt_assert(rdv, "No rendez-vous point defined for irecv");
return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size,
void *data, double rate)
{
xbt_assert(rdv, "No rendez-vous point defined for irecv");
return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size,
- match_fun, data, rate);
+ match_fun,
copy_data_fun,
data, rate);
}
/**
* \ingroup simix_comm_management
*/
}
/**
* \ingroup simix_comm_management
*/
-smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag,
+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_assert(rdv, "No rendez-vous point defined for iprobe");
int (*match_fun)(void *, void *, smx_action_t), void *data)
{
xbt_assert(rdv, "No rendez-vous point defined for iprobe");
- return simcall_BODY_comm_iprobe(rdv, src, tag, match_fun, data);
+ return simcall_BODY_comm_iprobe(rdv,
type,
src, tag, match_fun, data);
}
/**
}
/**
@@
-1134,7
+1142,7
@@
smx_process_t simcall_comm_get_src_proc(smx_action_t comm)
*/
smx_process_t simcall_comm_get_dst_proc(smx_action_t comm)
{
*/
smx_process_t simcall_comm_get_dst_proc(smx_action_t comm)
{
- return simcall_BODY_comm_get_dst_proc(comm);
+ return simcall_BODY_comm_get_dst_proc(comm);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
@@
-1172,7
+1180,7
@@
void simcall_mutex_destroy(smx_mutex_t mutex)
*/
void simcall_mutex_lock(smx_mutex_t mutex)
{
*/
void simcall_mutex_lock(smx_mutex_t mutex)
{
- simcall_BODY_mutex_lock(mutex);
+ simcall_BODY_mutex_lock(mutex);
}
/**
}
/**
@@
-1181,7
+1189,7
@@
void simcall_mutex_lock(smx_mutex_t mutex)
*/
int simcall_mutex_trylock(smx_mutex_t mutex)
{
*/
int simcall_mutex_trylock(smx_mutex_t mutex)
{
- return simcall_BODY_mutex_trylock(mutex);
+ return simcall_BODY_mutex_trylock(mutex);
}
/**
}
/**
@@
-1190,7
+1198,7
@@
int simcall_mutex_trylock(smx_mutex_t mutex)
*/
void simcall_mutex_unlock(smx_mutex_t mutex)
{
*/
void simcall_mutex_unlock(smx_mutex_t mutex)
{
- simcall_BODY_mutex_unlock(mutex);
+ simcall_BODY_mutex_unlock(mutex);
}
/**
}
/**
@@
-1256,7
+1264,7
@@
void simcall_cond_broadcast(smx_cond_t cond)
*/
smx_sem_t simcall_sem_init(int capacity)
{
*/
smx_sem_t simcall_sem_init(int capacity)
{
- return simcall_BODY_sem_init(capacity);
+ return simcall_BODY_sem_init(capacity);
}
/**
}
/**
@@
-1274,7
+1282,7
@@
void simcall_sem_destroy(smx_sem_t sem)
*/
void simcall_sem_release(smx_sem_t sem)
{
*/
void simcall_sem_release(smx_sem_t sem)
{
- simcall_BODY_sem_release(sem);
+ simcall_BODY_sem_release(sem);
}
/**
}
/**
@@
-1318,55
+1326,47
@@
int simcall_sem_get_capacity(smx_sem_t sem)
* \ingroup simix_file_management
*
*/
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size)
+sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size
, smx_host_t host
)
{
{
- return simcall_BODY_file_read(fd, size);
+ return simcall_BODY_file_read(fd, size
, host
);
}
/**
* \ingroup simix_file_management
*
*/
}
/**
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size)
+sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size
, smx_host_t host
)
{
{
- return simcall_BODY_file_write(fd, size);
+ return simcall_BODY_file_write(fd, size
, host
);
}
/**
* \ingroup simix_file_management
* \brief
*/
}
/**
* \ingroup simix_file_management
* \brief
*/
-smx_file_t simcall_file_open(const char* fullpath)
+smx_file_t simcall_file_open(const char* fullpath
, smx_host_t host
)
{
{
- return simcall_BODY_file_open(fullpath);
+ return simcall_BODY_file_open(fullpath
, host
);
}
/**
* \ingroup simix_file_management
*
*/
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_close(smx_file_t fd)
+int simcall_file_close(smx_file_t fd
, smx_host_t host
)
{
{
- return simcall_BODY_file_close(fd);
+ return simcall_BODY_file_close(fd
, host
);
}
/**
* \ingroup simix_file_management
*
*/
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_unlink(smx_file_t fd)
+int simcall_file_unlink(smx_file_t fd
, smx_host_t host
)
{
{
- return simcall_BODY_file_unlink(fd);
+ return simcall_BODY_file_unlink(fd
, host
);
}
}
-/**
- * \ingroup simix_file_management
- *
- */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
- return simcall_BODY_file_ls(mount, path);
-}
/**
* \ingroup simix_file_management
*
/**
* \ingroup simix_file_management
*
@@
-1396,37
+1396,38
@@
xbt_dynar_t simcall_file_get_info(smx_file_t fd)
* \ingroup simix_file_management
*
*/
* \ingroup simix_file_management
*
*/
-int simcall_file_seek(smx_file_t fd, sg_
size
_t offset, int origin){
+int simcall_file_seek(smx_file_t fd, sg_
offset
_t offset, int origin){
return simcall_BODY_file_seek(fd, offset, origin);
}
/**
* \ingroup simix_file_management
return simcall_BODY_file_seek(fd, offset, origin);
}
/**
* \ingroup simix_file_management
+ * \brief Move a file to another location on the *same mount point*.
*
*/
*
*/
-
void simcall_storage_file_rename(smx_storage_t storage, const char* src, const char* dest
)
+
int simcall_file_move(smx_file_t fd, const char* fullpath
)
{
{
- return simcall_BODY_
storage_file_rename(storage, src, dest
);
+ return simcall_BODY_
file_move(fd, fullpath
);
}
/**
* \ingroup simix_storage_management
* \brief Returns the free space size on a given storage element.
}
/**
* \ingroup simix_storage_management
* \brief Returns the free space size on a given storage element.
- * \param storage
nam
e
+ * \param storage
a storag
e
* \return Return the free space size on a given storage element (as sg_size_t)
*/
* \return Return the free space size on a given storage element (as sg_size_t)
*/
-sg_size_t simcall_storage_get_free_size (
const char* nam
e){
- return simcall_BODY_storage_get_free_size(
nam
e);
+sg_size_t simcall_storage_get_free_size (
smx_storage_t storag
e){
+ return simcall_BODY_storage_get_free_size(
storag
e);
}
/**
* \ingroup simix_storage_management
* \brief Returns the used space size on a given storage element.
}
/**
* \ingroup simix_storage_management
* \brief Returns the used space size on a given storage element.
- * \param storage
nam
e
+ * \param storage
a storag
e
* \return Return the used space size on a given storage element (as sg_size_t)
*/
* \return Return the used space size on a given storage element (as sg_size_t)
*/
-sg_size_t simcall_storage_get_used_size (
const char* nam
e){
- return simcall_BODY_storage_get_used_size(
nam
e);
+sg_size_t simcall_storage_get_used_size (
smx_storage_t storag
e){
+ return simcall_BODY_storage_get_used_size(
storag
e);
}
/**
}
/**
@@
-1482,7
+1483,7
@@
void *simcall_mc_snapshot(void)
return simcall_BODY_mc_snapshot();
}
return simcall_BODY_mc_snapshot();
}
-int simcall_mc_compare_snapshots(void *s1, void *s2){
+int simcall_mc_compare_snapshots(void *s1, void *s2){
return simcall_BODY_mc_compare_snapshots(s1, s2);
}
return simcall_BODY_mc_compare_snapshots(s1, s2);
}