Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(969)

Unified Diff: base/files/memory_mapped_file.cc

Issue 394313002: Add support for loading pak files from arbitrary file regions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ah, remove <algorithm> Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/files/memory_mapped_file.cc
diff --git a/base/files/memory_mapped_file.cc b/base/files/memory_mapped_file.cc
index ace4e112628519137e7f56fbfb36f6176c2e8e83..afa818a299480e49e781367184dae07f9209cc3e 100644
--- a/base/files/memory_mapped_file.cc
+++ b/base/files/memory_mapped_file.cc
@@ -6,6 +6,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
+#include "base/sys_info.h"
namespace base {
@@ -24,7 +25,7 @@ bool MemoryMappedFile::Initialize(const FilePath& file_name) {
return false;
}
- if (!MapFileToMemory()) {
+ if (!MapFileRegionToMemory(File::Region::kWholeFile)) {
CloseHandles();
return false;
}
@@ -33,12 +34,16 @@ bool MemoryMappedFile::Initialize(const FilePath& file_name) {
}
bool MemoryMappedFile::Initialize(File file) {
+ return Initialize(file.Pass(), File::Region::kWholeFile);
+}
+
+bool MemoryMappedFile::Initialize(File file, const File::Region& region) {
if (IsValid())
return false;
file_ = file.Pass();
- if (!MapFileToMemory()) {
+ if (!MapFileRegionToMemory(region)) {
CloseHandles();
return false;
}
@@ -50,4 +55,17 @@ bool MemoryMappedFile::IsValid() const {
return data_ != NULL;
}
+// static
+void MemoryMappedFile::CalculateVMAlignedBoundaries(int64 start,
+ int64 size,
+ int64* aligned_start,
+ int64* aligned_size,
+ int32* offset) {
+ // Sadly, on Windows, the mmap alignment is not just equal to the page size.
+ const int64 mask = static_cast<int64>(SysInfo::VMAllocationGranularity()) - 1;
willchan no longer on Chromium 2014/07/25 21:21:23 Can you DCHECK to make sure that this mask is neve
Primiano Tucci (use gerrit) 2014/07/28 12:52:11 Done. Even if an allocation granularity of 2/4 gig
+ *offset = start & mask;
+ *aligned_start = start & ~mask;
+ *aligned_size = (size + *offset + mask) & ~mask;
+}
+
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698