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

Unified Diff: runtime/bin/file_android.cc

Issue 2405393002: Use a single file for app snapshots. (Closed)
Patch Set: okay Created 4 years, 2 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: runtime/bin/file_android.cc
diff --git a/runtime/bin/file_android.cc b/runtime/bin/file_android.cc
index 9bcf44c8334e8c8361d8fc764398ba133705257d..8163dfa1e1a54a80f11d225ed828be263dee6092 100644
--- a/runtime/bin/file_android.cc
+++ b/runtime/bin/file_android.cc
@@ -78,17 +78,21 @@ bool File::IsClosed() {
}
-void* File::MapExecutable(intptr_t* len) {
+void* File::Map(MapType type, int64_t position, int64_t length) {
ASSERT(handle_->fd() >= 0);
-
- intptr_t length = Length();
- void* addr = mmap(0, length,
- PROT_READ | PROT_EXEC, MAP_PRIVATE,
- handle_->fd(), 0);
+ int prot = PROT_NONE;
+ switch (type) {
+ case kReadOnly:
+ prot = PROT_READ;
+ break;
+ case kReadExecute:
+ prot = PROT_READ | PROT_EXEC;
+ break;
siva 2016/10/13 01:59:00 default: return NULL; Also in other host files.
rmacnak 2016/10/13 21:17:33 Done.
+ }
+ void* addr = mmap(NULL, length, prot, MAP_PRIVATE,
+ handle_->fd(), position);
if (addr == MAP_FAILED) {
- *len = -1;
- } else {
- *len = length;
+ return NULL;
}
return addr;
}
« no previous file with comments | « runtime/bin/file.h ('k') | runtime/bin/file_fuchsia.cc » ('j') | runtime/bin/file_fuchsia.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698