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
add the Storage::read_async and Storage::write_async methods
[simgrid.git]
/
src
/
simix
/
popping_accessors.hpp
diff --git
a/src/simix/popping_accessors.hpp
b/src/simix/popping_accessors.hpp
index
ff804ef
..
5b2d81f
100644
(file)
--- a/
src/simix/popping_accessors.hpp
+++ b/
src/simix/popping_accessors.hpp
@@
-924,6
+924,18
@@
static inline void simcall_cond_wait_timeout__set__timeout(smx_simcall_t simcall
{
simgrid::simix::marshal<double>(simcall->args[2], arg);
}
+static inline int simcall_cond_wait_timeout__get__result(smx_simcall_t simcall)
+{
+ return simgrid::simix::unmarshal<int>(simcall->result);
+}
+static inline int simcall_cond_wait_timeout__getraw__result(smx_simcall_t simcall)
+{
+ return simgrid::simix::unmarshal_raw<int>(simcall->result);
+}
+static inline void simcall_cond_wait_timeout__set__result(smx_simcall_t simcall, int result)
+{
+ simgrid::simix::marshal<int>(simcall->result, result);
+}
static inline smx_sem_t simcall_sem_acquire__get__sem(smx_simcall_t simcall)
{
@@
-962,77
+974,42
@@
static inline void simcall_sem_acquire_timeout__set__timeout(smx_simcall_t simca
{
simgrid::simix::marshal<double>(simcall->args[1], arg);
}
-
-static inline surf_storage_t simcall_storage_read__get__st(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal<surf_storage_t>(simcall->args[0]);
-}
-static inline surf_storage_t simcall_storage_read__getraw__st(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal_raw<surf_storage_t>(simcall->args[0]);
-}
-static inline void simcall_storage_read__set__st(smx_simcall_t simcall, surf_storage_t arg)
-{
- simgrid::simix::marshal<surf_storage_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_storage_read__get__size(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
-}
-static inline sg_size_t simcall_storage_read__getraw__size(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->args[1]);
-}
-static inline void simcall_storage_read__set__size(smx_simcall_t simcall, sg_size_t arg)
-{
- simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
-}
-static inline sg_size_t simcall_storage_read__get__result(smx_simcall_t simcall)
+static inline int simcall_sem_acquire_timeout__get__result(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal<
sg_size_
t>(simcall->result);
+ return simgrid::simix::unmarshal<
in
t>(simcall->result);
}
-static inline
sg_size_t simcall_storage_read
__getraw__result(smx_simcall_t simcall)
+static inline
int simcall_sem_acquire_timeout
__getraw__result(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal_raw<
sg_size_
t>(simcall->result);
+ return simgrid::simix::unmarshal_raw<
in
t>(simcall->result);
}
-static inline void simcall_s
torage_read__set__result(smx_simcall_t simcall, sg_size_
t result)
+static inline void simcall_s
em_acquire_timeout__set__result(smx_simcall_t simcall, in
t result)
{
- simgrid::simix::marshal<
sg_size_
t>(simcall->result, result);
+ simgrid::simix::marshal<
in
t>(simcall->result, result);
}
-static inline surf_storage_t simcall_storage_write__get__st(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal<surf_storage_t>(simcall->args[0]);
-}
-static inline surf_storage_t simcall_storage_write__getraw__st(smx_simcall_t simcall)
-{
- return simgrid::simix::unmarshal_raw<surf_storage_t>(simcall->args[0]);
-}
-static inline void simcall_storage_write__set__st(smx_simcall_t simcall, surf_storage_t arg)
-{
- simgrid::simix::marshal<surf_storage_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_storage_write__get__size(smx_simcall_t simcall)
+static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+simcall_io_wait__get__io(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal<
sg_size_t>(simcall->args[1
]);
+ return simgrid::simix::unmarshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0
]);
}
-static inline s
g_size_t simcall_storage_write__getraw__size
(smx_simcall_t simcall)
+static inline s
imgrid::kernel::activity::ActivityImpl* simcall_io_wait__getraw__io
(smx_simcall_t simcall)
{
- return simgrid::simix::unmarshal_raw<s
g_size_t>(simcall->args[1
]);
+ return simgrid::simix::unmarshal_raw<s
imgrid::kernel::activity::ActivityImpl*>(simcall->args[0
]);
}
-static inline void simcall_storage_write__set__size(smx_simcall_t simcall, sg_size_t arg)
+static inline void simcall_io_wait__set__io(smx_simcall_t simcall,
+ boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> arg)
{
- simgrid::simix::marshal<
sg_size_t>(simcall->args[1
], arg);
+ simgrid::simix::marshal<
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0
], arg);
}
-static inline sg_size_t simcall_
storage_write
__get__result(smx_simcall_t simcall)
+static inline sg_size_t simcall_
io_wait
__get__result(smx_simcall_t simcall)
{
return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
}
-static inline sg_size_t simcall_
storage_write
__getraw__result(smx_simcall_t simcall)
+static inline sg_size_t simcall_
io_wait
__getraw__result(smx_simcall_t simcall)
{
return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->result);
}
-static inline void simcall_
storage_write
__set__result(smx_simcall_t simcall, sg_size_t result)
+static inline void simcall_
io_wait
__set__result(smx_simcall_t simcall, sg_size_t result)
{
simgrid::simix::marshal<sg_size_t>(simcall->result, result);
}
@@
-1125,6
+1102,6
@@
XBT_PRIVATE void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t con
XBT_PRIVATE void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout);
XBT_PRIVATE void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem);
XBT_PRIVATE void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout);
-XBT_PRIVATE void simcall_HANDLER_
storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size);
-
XBT_PRIVATE void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size
);
+XBT_PRIVATE void simcall_HANDLER_
io_wait(smx_simcall_t simcall,
+
boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> io
);
XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
\ No newline at end of file