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
try to avoid == for double.
[simgrid.git]
/
src
/
simix
/
libsmx.cpp
diff --git
a/src/simix/libsmx.cpp
b/src/simix/libsmx.cpp
index
9ac65fd
..
8cf08c4
100644
(file)
--- a/
src/simix/libsmx.cpp
+++ b/
src/simix/libsmx.cpp
@@
-217,7
+217,7
@@
void* simcall_vm_create(const char *name, sg_host_t phys_host)
*/
void simcall_vm_start(sg_host_t vm)
{
*/
void simcall_vm_start(sg_host_t vm)
{
-
return
simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
}
/**
}
/**
@@
-263,7
+263,7
@@
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
-
return
simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
}
/**
@@
-642,8
+642,7
@@
smx_mailbox_t simcall_mbox_get_by_name(const char *name)
*/
smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
{
*/
smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
{
-
- return mbox->comm_queue->empty()? nullptr:mbox->comm_queue->front();
+ return mbox->comm_queue.empty() ? nullptr : mbox->comm_queue.front();
}
void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
}
void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
@@
-766,19
+765,19
@@
void simcall_comm_cancel(smx_synchro_t synchro)
/**
* \ingroup simix_comm_management
*/
/**
* \ingroup simix_comm_management
*/
-unsigned int simcall_comm_waitany(xbt_dynar_t comms)
+unsigned int simcall_comm_waitany(xbt_dynar_t comms
, double timeout
)
{
{
- return simcall_BODY_comm_waitany(comms);
+ return simcall_BODY_comm_waitany(comms
, timeout
);
}
/**
* \ingroup simix_comm_management
*/
}
/**
* \ingroup simix_comm_management
*/
-int simcall_comm_testany(
xbt_dynar_t comms
)
+int simcall_comm_testany(
smx_synchro_t* comms, size_t count
)
{
{
- if (
xbt_dynar_is_empty(comms)
)
+ if (
count == 0
)
return -1;
return -1;
- return simcall_BODY_comm_testany(comms);
+ return simcall_BODY_comm_testany(comms
, count
);
}
/**
}
/**