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 branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
popping_accessors.hpp
diff --git
a/src/simix/popping_accessors.hpp
b/src/simix/popping_accessors.hpp
index
0e08a06
..
e4dc4f0
100644
(file)
--- a/
src/simix/popping_accessors.hpp
+++ b/
src/simix/popping_accessors.hpp
@@
-98,8
+98,7
@@
static inline simgrid::kernel::activity::ExecImpl* simcall_execution_wait__getra
{
return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->args[0]);
}
-static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall,
- simgrid::kernel::activity::ExecImpl* arg)
+static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* arg)
{
simgrid::simix::marshal<simgrid::kernel::activity::ExecImpl*>(simcall->args[0], arg);
}
@@
-124,8
+123,7
@@
static inline simgrid::kernel::activity::ExecImpl* simcall_execution_test__getra
{
return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->args[0]);
}
-static inline void simcall_execution_test__set__execution(smx_simcall_t simcall,
- simgrid::kernel::activity::ExecImpl* arg)
+static inline void simcall_execution_test__set__execution(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* arg)
{
simgrid::simix::marshal<simgrid::kernel::activity::ExecImpl*>(simcall->args[0], arg);
}
@@
-383,17
+381,17
@@
static inline void simcall_comm_isend__set__data(smx_simcall_t simcall, void* ar
{
simgrid::simix::marshal<void*>(simcall->args[9], arg);
}
-static inline
int
simcall_comm_isend__get__detached(smx_simcall_t simcall)
+static inline
bool
simcall_comm_isend__get__detached(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal<
int
>(simcall->args[10]);
+ return simgrid::simix::unmarshal<
bool
>(simcall->args[10]);
}
-static inline
int
simcall_comm_isend__getraw__detached(smx_simcall_t simcall)
+static inline
bool
simcall_comm_isend__getraw__detached(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal_raw<
int
>(simcall->args[10]);
+ return simgrid::simix::unmarshal_raw<
bool
>(simcall->args[10]);
}
-static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall,
int
arg)
+static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall,
bool
arg)
{
- simgrid::simix::marshal<
int
>(simcall->args[10], arg);
+ simgrid::simix::marshal<
bool
>(simcall->args[10], arg);
}
static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_comm_isend__get__result(smx_simcall_t simcall)
{
@@
-626,19
+624,17
@@
static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, boost:
simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
}
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>*
-simcall_comm_waitany__get__comms(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::CommImpl** simcall_comm_waitany__get__comms(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
*>(simcall->args[0]);
+ return simgrid::simix::unmarshal<
simgrid::kernel::activity::CommImpl*
*>(simcall->args[0]);
}
-static inline simgrid::kernel::activity::
Activity
Impl** simcall_comm_waitany__getraw__comms(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::
Comm
Impl** simcall_comm_waitany__getraw__comms(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::
Activity
Impl**>(simcall->args[0]);
+ return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::
Comm
Impl**>(simcall->args[0]);
}
-static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall,
- boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>* arg)
+static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl** arg)
{
- simgrid::simix::marshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
*>(simcall->args[0], arg);
+ simgrid::simix::marshal<
simgrid::kernel::activity::CommImpl*
*>(simcall->args[0], arg);
}
static inline size_t simcall_comm_waitany__get__count(smx_simcall_t simcall)
{
@@
-727,17
+723,17
@@
static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int res
simgrid::simix::marshal<int>(simcall->result, result);
}
-static inline
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
* simcall_comm_testany__get__comms(smx_simcall_t simcall)
+static inline
simgrid::kernel::activity::CommImpl*
* simcall_comm_testany__get__comms(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
*>(simcall->args[0]);
+ return simgrid::simix::unmarshal<
simgrid::kernel::activity::CommImpl*
*>(simcall->args[0]);
}
-static inline simgrid::kernel::activity::
Activity
Impl** simcall_comm_testany__getraw__comms(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::
Comm
Impl** simcall_comm_testany__getraw__comms(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::
Activity
Impl**>(simcall->args[0]);
+ return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::
Comm
Impl**>(simcall->args[0]);
}
-static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall,
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
* arg)
+static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall,
simgrid::kernel::activity::CommImpl*
* arg)
{
- simgrid::simix::marshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
*>(simcall->args[0], arg);
+ simgrid::simix::marshal<
simgrid::kernel::activity::CommImpl*
*>(simcall->args[0], arg);
}
static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall)
{
@@
-1035,16
+1031,13
@@
XBT_PRIVATE void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double dur
XBT_PRIVATE void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execution);
XBT_PRIVATE void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execution);
XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout);
-XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data,
int
detached);
+XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data,
bool
detached);
XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate);
XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
-XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall,
- boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>* comms,
- size_t count, double timeout);
-XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm,
- double timeout);
+XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl** comms, size_t count, double timeout);
+XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm, double timeout);
XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm);
-XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall,
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
* comms, size_t count);
+XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall,
simgrid::kernel::activity::CommImpl*
* comms, size_t count);
XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex);
XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex);
XBT_PRIVATE void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex);