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
c65710d
..
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)
{
@@
-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);
}
@@
-1023,12
+1022,12
@@
smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_
/**
* \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);
}
/**
}
/**