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
rename a method
[simgrid.git]
/
src
/
mc
/
ChunkedData.cpp
diff --git
a/src/mc/ChunkedData.cpp
b/src/mc/ChunkedData.cpp
index
4e8499e
..
b60f938
100644
(file)
--- a/
src/mc/ChunkedData.cpp
+++ b/
src/mc/ChunkedData.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
@@
-9,27
+8,24
@@
#include <vector>
#include <vector>
-#include
<xbt/misc.h> // xbt_pagesize and friends
-#include
<xbt/asserts.h>
+#include
"xbt/asserts.h"
+#include
"xbt/misc.h"
#include "src/mc/AddressSpace.hpp"
#include "src/mc/ChunkedData.hpp"
#include "src/mc/AddressSpace.hpp"
#include "src/mc/ChunkedData.hpp"
-
-#define SOFT_DIRTY_BIT_NUMBER 55
-#define SOFT_DIRTY (((uint64_t)1) << SOFT_DIRTY_BIT_NUMBER)
+#include "src/mc/PageStore.hpp"
namespace simgrid {
namespace mc {
/** Take a per-page snapshot of a region
*
namespace simgrid {
namespace mc {
/** Take a per-page snapshot of a region
*
- * @param
data
The start of the region (must be at the beginning of a page)
- * @param pag
_count
Number of pages of the region
+ * @param
addr
The start of the region (must be at the beginning of a page)
+ * @param pag
e_count
Number of pages of the region
* @return Snapshot page numbers of this new snapshot
*/
ChunkedData::ChunkedData(PageStore& store, AddressSpace& as,
* @return Snapshot page numbers of this new snapshot
*/
ChunkedData::ChunkedData(PageStore& store, AddressSpace& as,
- RemotePtr<void> addr, std::size_t page_count,
- const std::size_t* ref_page_numbers, const std::uint64_t* pagemap)
+ RemotePtr<void> addr, std::size_t page_count)
{
store_ = &store;
this->pagenos_.resize(page_count);
{
store_ = &store;
this->pagenos_.resize(page_count);
@@
-37,13
+33,6
@@
ChunkedData::ChunkedData(PageStore& store, AddressSpace& as,
for (size_t i = 0; i != page_count; ++i) {
for (size_t i = 0; i != page_count; ++i) {
- // We don't have to compare soft-clean pages:
- if (ref_page_numbers && pagemap && !(pagemap[i] & SOFT_DIRTY)) {
- pagenos_[i] = ref_page_numbers[i];
- store_->ref_page(ref_page_numbers[i]);
- continue;
- }
-
RemotePtr<void> page = remote((void*)
simgrid::mc::mmu::join(i, addr.address()));
xbt_assert(simgrid::mc::mmu::split(page.address()).second == 0,
RemotePtr<void> page = remote((void*)
simgrid::mc::mmu::join(i, addr.address()));
xbt_assert(simgrid::mc::mmu::split(page.address()).second == 0,