Skip to content

GitLab

T
tangled
Commit 5e16e69c authored by mark@chromium.org's avatar mark@chromium.org
Browse files
Options

Fix iOS after r269483. 

TBR=rsesek

Review URL: https://codereview.chromium.org/271353003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269492 0039d316-1c4b-4281-b951-d872f2087c98
parent 56fc0555
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
base/memory/discardable_memory_mac.cc
View file @ 5e16e69c
...@@ -33,15 +33,15 @@ class DiscardableMemoryMac : public DiscardableMemory { ...@@ -33,15 +33,15 @@ class DiscardableMemoryMac : public DiscardableMemory {
bool Initialize() { bool Initialize() {
DCHECK_EQ(memory_.size(), 0u); DCHECK_EQ(memory_.size(), 0u);
mach_vm_address_t address = 0; vm_address_t address = 0;
kern_return_t ret = mach_vm_allocate(mach_task_self(), kern_return_t ret = vm_allocate(mach_task_self(),
&address, &address,
size_, size_,
VM_FLAGS_PURGABLE | VM_FLAGS_PURGABLE |
VM_FLAGS_ANYWHERE | VM_FLAGS_ANYWHERE |
kDiscardableMemoryTag); kDiscardableMemoryTag);
if (ret != KERN_SUCCESS) { if (ret != KERN_SUCCESS) {
MACH_DLOG(ERROR, ret) << "mach_vm_allocate"; MACH_DLOG(ERROR, ret) << "vm_allocate";
return false; return false;
} }
...@@ -55,16 +55,16 @@ class DiscardableMemoryMac : public DiscardableMemory { ...@@ -55,16 +55,16 @@ class DiscardableMemoryMac : public DiscardableMemory {
virtual DiscardableMemoryLockStatus Lock() OVERRIDE { virtual DiscardableMemoryLockStatus Lock() OVERRIDE {
kern_return_t ret; kern_return_t ret;
MACH_DCHECK((ret = mach_vm_protect(mach_task_self(), MACH_DCHECK((ret = vm_protect(mach_task_self(),
memory_.address(), memory_.address(),
memory_.size(), memory_.size(),
FALSE, FALSE,
VM_PROT_DEFAULT)) == KERN_SUCCESS, ret); VM_PROT_DEFAULT)) == KERN_SUCCESS, ret);
int state = VM_PURGABLE_NONVOLATILE; int state = VM_PURGABLE_NONVOLATILE;
ret = mach_vm_purgable_control(mach_task_self(), ret = vm_purgable_control(mach_task_self(),
memory_.address(), memory_.address(),
VM_PURGABLE_SET_STATE, VM_PURGABLE_SET_STATE,
&state); &state);
if (ret != KERN_SUCCESS) if (ret != KERN_SUCCESS)
return DISCARDABLE_MEMORY_LOCK_STATUS_FAILED; return DISCARDABLE_MEMORY_LOCK_STATUS_FAILED;
...@@ -74,16 +74,16 @@ class DiscardableMemoryMac : public DiscardableMemory { ...@@ -74,16 +74,16 @@ class DiscardableMemoryMac : public DiscardableMemory {
virtual void Unlock() OVERRIDE { virtual void Unlock() OVERRIDE {
int state = VM_PURGABLE_VOLATILE | VM_VOLATILE_GROUP_DEFAULT; int state = VM_PURGABLE_VOLATILE | VM_VOLATILE_GROUP_DEFAULT;
kern_return_t ret = mach_vm_purgable_control(mach_task_self(), kern_return_t ret = vm_purgable_control(mach_task_self(),
memory_.address(), memory_.address(),
VM_PURGABLE_SET_STATE, VM_PURGABLE_SET_STATE,
&state); &state);
MACH_DLOG_IF(ERROR, ret != KERN_SUCCESS, ret) << "mach_vm_purgable_control"; MACH_DLOG_IF(ERROR, ret != KERN_SUCCESS, ret) << "vm_purgable_control";
MACH_DCHECK((ret = mach_vm_protect(mach_task_self(), MACH_DCHECK((ret = vm_protect(mach_task_self(),
memory_.address(), memory_.address(),
memory_.size(), memory_.size(),
FALSE, FALSE,
VM_PROT_NONE)) == KERN_SUCCESS, ret); VM_PROT_NONE)) == KERN_SUCCESS, ret);
} }
virtual void* Memory() const OVERRIDE { virtual void* Memory() const OVERRIDE {
...@@ -159,7 +159,7 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType( ...@@ -159,7 +159,7 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
// static // static
void DiscardableMemory::PurgeForTesting() { void DiscardableMemory::PurgeForTesting() {
int state = 0; int state = 0;
mach_vm_purgable_control(mach_task_self(), 0, VM_PURGABLE_PURGE_ALL, &state); vm_purgable_control(mach_task_self(), 0, VM_PURGABLE_PURGE_ALL, &state);
internal::DiscardableMemoryEmulated::PurgeForTesting(); internal::DiscardableMemoryEmulated::PurgeForTesting();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment