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
[mc] Fix MC with the class-hierarchification of simgrid::simix::Synchro
[simgrid.git]
/
src
/
mc
/
AddressSpace.hpp
diff --git
a/src/mc/AddressSpace.hpp
b/src/mc/AddressSpace.hpp
index
0ff146a
..
75fbcae
100644
(file)
--- a/
src/mc/AddressSpace.hpp
+++ b/
src/mc/AddressSpace.hpp
@@
-7,12
+7,13
@@
#ifndef SIMGRID_MC_ADDRESS_SPACE_H
#define SIMGRID_MC_ADDRESS_SPACE_H
#ifndef SIMGRID_MC_ADDRESS_SPACE_H
#define SIMGRID_MC_ADDRESS_SPACE_H
+#include <cassert>
#include <cstddef>
#include <cstdint>
#include <type_traits>
#include "src/mc/mc_forward.hpp"
#include <cstddef>
#include <cstdint>
#include <type_traits>
#include "src/mc/mc_forward.hpp"
-#include "src/mc/
remote_p
tr.hpp"
+#include "src/mc/
RemoteP
tr.hpp"
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-90,6
+91,17
@@
public:
static constexpr ReadOptions lazy() { return ReadOptions(1); }
};
static constexpr ReadOptions lazy() { return ReadOptions(1); }
};
+/** A value read from another process */
+template<class T>
+class Remote {
+private:
+ char buffer[sizeof(T)];
+public:
+ void* data() { return buffer; }
+ const void* data() const { return buffer; }
+ constexpr std::size_t size() const { return sizeof(T); }
+};
+
/** A given state of a given process (abstract base class)
*
* Currently, this might either be:
/** A given state of a given process (abstract base class)
*
* Currently, this might either be:
@@
-116,19
+128,25
@@
public:
* @param options
*/
virtual const void* read_bytes(void* buffer, std::size_t size,
* @param options
*/
virtual const void* read_bytes(void* buffer, std::size_t size,
-
remote_p
tr<void> address, int process_index = ProcessIndexAny,
+
RemoteP
tr<void> address, int process_index = ProcessIndexAny,
ReadOptions options = ReadOptions::none()) const = 0;
/** Read a given data structure from the address space */
template<class T> inline
ReadOptions options = ReadOptions::none()) const = 0;
/** Read a given data structure from the address space */
template<class T> inline
- void read(T *buffer,
remote_p
tr<T> ptr, int process_index = ProcessIndexAny)
+ void read(T *buffer,
RemoteP
tr<T> ptr, int process_index = ProcessIndexAny)
{
this->read_bytes(buffer, sizeof(T), ptr, process_index);
}
{
this->read_bytes(buffer, sizeof(T), ptr, process_index);
}
+ template<class T> inline
+ void read(Remote<T>& buffer, RemotePtr<T> ptr, int process_index = ProcessIndexAny)
+ {
+ this->read_bytes(buffer.data(), sizeof(T), ptr, process_index);
+ }
+
/** Read a given data structure from the address space */
template<class T> inline
/** Read a given data structure from the address space */
template<class T> inline
- T read(
remote_p
tr<T> ptr, int process_index = ProcessIndexMissing)
+ T read(
RemoteP
tr<T> ptr, int process_index = ProcessIndexMissing)
{
static_assert(std::is_trivial<T>::value, "Cannot read a non-trivial type");
T res;
{
static_assert(std::is_trivial<T>::value, "Cannot read a non-trivial type");
T res;