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
remove the last include of private header from installed headers
[simgrid.git]
/
src
/
mc
/
AddressSpace.hpp
diff --git
a/src/mc/AddressSpace.hpp
b/src/mc/AddressSpace.hpp
index
5c4f515
..
758d12c
100644
(file)
--- a/
src/mc/AddressSpace.hpp
+++ b/
src/mc/AddressSpace.hpp
@@
-17,7
+17,7
@@
#include <vector>
#include "src/mc/mc_forward.hpp"
#include <vector>
#include "src/mc/mc_forward.hpp"
-#include "src/mc/RemotePtr.hpp"
+#include "src/mc/
remote/
RemotePtr.hpp"
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-50,7
+50,7
@@
class ReadOptions {
public:
constexpr ReadOptions() : value_(0) {}
public:
constexpr ReadOptions() : value_(0) {}
- constexpr operator bool() const { return value_ != 0; }
+
explicit
constexpr operator bool() const { return value_ != 0; }
constexpr bool operator!() const { return value_ == 0; }
constexpr ReadOptions operator|(ReadOptions const& that) const
constexpr bool operator!() const { return value_ == 0; }
constexpr ReadOptions operator|(ReadOptions const& that) const
@@
-109,16
+109,17
@@
public:
*/
class AddressSpace {
private:
*/
class AddressSpace {
private:
- Process* process_;
+ RemoteClient* process_;
+
public:
public:
-
AddressSpace(Process
* process) : process_(process) {}
- virtual ~AddressSpace();
+
explicit AddressSpace(RemoteClient
* process) : process_(process) {}
+ virtual ~AddressSpace()
= default
;
- /** The process of this addres space
+ /** The process of this addres
s
space
*
* This is where we can get debug informations, memory layout, etc.
*/
*
* This is where we can get debug informations, memory layout, etc.
*/
- simgrid::mc::
Process
* process() const { return process_; }
+ simgrid::mc::
RemoteClient
* process() const { return process_; }
/** Read data from the address space
*
/** Read data from the address space
*
@@
-160,11
+161,10
@@
public:
/** Read a string of known size */
std::string read_string(RemotePtr<char> address, std::size_t len) const
{
/** Read a string of known size */
std::string read_string(RemotePtr<char> address, std::size_t len) const
{
- // TODO, use std::vector with .data() in C++17 to avoid useless copies
- std::vector<char> buffer(len);
- buffer[len] = '\0';
- this->read_bytes(buffer.data(), len, address);
- return std::string(buffer.data(), buffer.size());
+ std::string res;
+ res.resize(len);
+ this->read_bytes(&res[0], len, address);
+ return res;
}
};
}
};