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
Merge s4u wait_any
[simgrid.git]
/
src
/
simix
/
libsmx.cpp
diff --git
a/src/simix/libsmx.cpp
b/src/simix/libsmx.cpp
index
e731708
..
8cf08c4
100644
(file)
--- a/
src/simix/libsmx.cpp
+++ b/
src/simix/libsmx.cpp
@@
-17,13
+17,14
@@
#include <xbt/functional.hpp>
#include <xbt/functional.hpp>
+#include <simgrid/simix/blocking_simcall.hpp>
+
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
#include "xbt/ex.h"
#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
#include "xbt/ex.h"
#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
-
#include "src/simix/SynchroComm.hpp"
#include <simgrid/simix.hpp>
#include "src/simix/SynchroComm.hpp"
#include <simgrid/simix.hpp>
@@
-205,7
+206,7
@@
e_smx_state_t simcall_execution_wait(smx_synchro_t execution)
*/
void* simcall_vm_create(const char *name, sg_host_t phys_host)
{
*/
void* simcall_vm_create(const char *name, sg_host_t phys_host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
+ return simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_create, name, phys_host));
}
/**
}
/**
@@
-216,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::kernel
(std::bind(SIMIX_vm_start, vm));
+
simgrid::simix::kernelImmediate
(std::bind(SIMIX_vm_start, vm));
}
/**
}
/**
@@
-228,7
+229,7
@@
void simcall_vm_start(sg_host_t vm)
*/
int simcall_vm_get_state(sg_host_t vm)
{
*/
int simcall_vm_get_state(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
+ return simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_get_state, vm));
}
/**
}
/**
@@
-240,17
+241,17
@@
int simcall_vm_get_state(sg_host_t vm)
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
+ return simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_get_pm, vm));
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
+ simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_set_bound, vm, bound));
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
+ simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
/**
}
/**
@@
-262,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::kernel
(std::bind(SIMIX_vm_migrate, vm, host));
+
simgrid::simix::kernelImmediate
(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
}
/**
@@
-328,7
+329,7
@@
void simcall_vm_shutdown(sg_host_t vm)
*/
void simcall_vm_destroy(sg_host_t vm)
{
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm));
+ simgrid::simix::kernel
Immediate
(std::bind(SIMIX_vm_destroy, vm));
}
/**
}
/**
@@
-347,7
+348,7
@@
void simcall_vm_destroy(sg_host_t vm)
*/
void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
{
*/
void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
{
- simgrid::simix::kernel(std::bind(
+ simgrid::simix::kernel
Immediate
(std::bind(
SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
@@
-440,7
+441,7
@@
void simcall_process_resume(smx_process_t process)
*/
int simcall_process_count(void)
{
*/
int simcall_process_count(void)
{
- return simgrid::simix::kernel(SIMIX_process_count);
+ return simgrid::simix::kernel
Immediate
(SIMIX_process_count);
}
/**
}
/**
@@
-486,7
+487,7
@@
void* simcall_process_get_data(smx_process_t process)
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
- simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
+ simgrid::simix::kernel
Immediate
(std::bind(SIMIX_process_set_data, process, data));
}
/**
}
/**
@@
-641,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)
@@
-756,7
+756,7
@@
smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag
*/
void simcall_comm_cancel(smx_synchro_t synchro)
{
*/
void simcall_comm_cancel(smx_synchro_t synchro)
{
- simgrid::simix::kernel([synchro]{
+ simgrid::simix::kernel
Immediate
([synchro]{
simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
comm->cancel();
});
simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
comm->cancel();
});
@@
-765,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
);
}
/**
}
/**
@@
-1090,7
+1090,12
@@
xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
void simcall_run_kernel(std::function<void()> const& code)
{
void simcall_run_kernel(std::function<void()> const& code)
{
- return simcall_BODY_run_kernel(&code);
+ simcall_BODY_run_kernel(&code);
+}
+
+void simcall_run_blocking(std::function<void()> const& code)
+{
+ simcall_BODY_run_blocking(&code);
}
int simcall_mc_random(int min, int max) {
}
int simcall_mc_random(int min, int max) {
@@
-1103,3
+1108,15
@@
int simcall_mc_random(int min, int max) {
const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
return simcall_names[kind];
}
const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
return simcall_names[kind];
}
+
+namespace simgrid {
+namespace simix {
+
+void unblock(smx_process_t process)
+{
+ xbt_assert(SIMIX_is_maestro());
+ SIMIX_simcall_answer(&process->simcall);
+}
+
+}
+}
\ No newline at end of file