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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
sosp
/
ChunkedData.hpp
diff --git
a/src/mc/sosp/ChunkedData.hpp
b/src/mc/sosp/ChunkedData.hpp
index
2545954
..
c4a706f
100644
(file)
--- a/
src/mc/sosp/ChunkedData.hpp
+++ b/
src/mc/sosp/ChunkedData.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-20
23
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-12,8
+12,7
@@
#include "src/mc/remote/RemotePtr.hpp"
#include "src/mc/sosp/PageStore.hpp"
#include "src/mc/remote/RemotePtr.hpp"
#include "src/mc/sosp/PageStore.hpp"
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
/** A byte-string represented as a sequence of chunks from a PageStore
*
/** A byte-string represented as a sequence of chunks from a PageStore
*
@@
-46,9
+45,9
@@
public:
for (std::size_t const& pageno : pagenos_)
store_->ref_page(pageno);
}
for (std::size_t const& pageno : pagenos_)
store_->ref_page(pageno);
}
- ChunkedData(ChunkedData&& that)
: store_(that.store_),
pagenos_(std::move(that.pagenos_))
+ ChunkedData(ChunkedData&& that)
noexcept :
pagenos_(std::move(that.pagenos_))
{
{
-
that.store_ = nullptr
;
+
std::swap(store_, that.store_)
;
that.pagenos_.clear();
}
ChunkedData& operator=(ChunkedData const& that)
that.pagenos_.clear();
}
ChunkedData& operator=(ChunkedData const& that)
@@
-62,13
+61,15
@@
public:
}
return *this;
}
}
return *this;
}
- ChunkedData& operator=(ChunkedData&& that)
+ ChunkedData& operator=(ChunkedData&& that)
noexcept
{
{
- this->clear();
- store_ = that.store_;
- that.store_ = nullptr;
- pagenos_ = std::move(that.pagenos_);
- that.pagenos_.clear();
+ if (this != &that) {
+ this->clear();
+ store_ = that.store_;
+ that.store_ = nullptr;
+ pagenos_ = std::move(that.pagenos_);
+ that.pagenos_.clear();
+ }
return *this;
}
return *this;
}
@@
-81,13
+82,12
@@
public:
/** Get a view of the chunk indices */
const std::size_t* pagenos() const { return pagenos_.data(); }
/** Get a view of the chunk indices */
const std::size_t* pagenos() const { return pagenos_.data(); }
- /** Get a
a
pointer to a chunk */
+ /** Get a pointer to a chunk */
void* page(std::size_t i) const { return store_->get_page(pagenos_[i]); }
void* page(std::size_t i) const { return store_->get_page(pagenos_[i]); }
- ChunkedData(PageStore& store, AddressSpace& as, RemotePtr<void> addr, std::size_t page_count);
+ ChunkedData(PageStore& store,
const
AddressSpace& as, RemotePtr<void> addr, std::size_t page_count);
};
};
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
#endif
#endif