| OLD | NEW |
| 1 // Copyright 2014 The Crashpad Authors. All rights reserved. | 1 // Copyright 2015 The Crashpad Authors. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 // See the License for the specific language governing permissions and | 12 // See the License for the specific language governing permissions and |
| 13 // limitations under the License. | 13 // limitations under the License. |
| 14 | 14 |
| 15 #include "snapshot/mac/memory_snapshot_mac.h" | 15 #include "snapshot/win/memory_snapshot_win.h" |
| 16 | 16 |
| 17 #include "util/mach/task_memory.h" | 17 #include "base/memory/scoped_ptr.h" |
| 18 | 18 |
| 19 namespace crashpad { | 19 namespace crashpad { |
| 20 namespace internal { | 20 namespace internal { |
| 21 | 21 |
| 22 MemorySnapshotMac::MemorySnapshotMac() | 22 MemorySnapshotWin::MemorySnapshotWin() |
| 23 : MemorySnapshot(), | 23 : MemorySnapshot(), |
| 24 process_reader_(nullptr), | 24 process_reader_(nullptr), |
| 25 address_(0), | 25 address_(0), |
| 26 size_(0), | 26 size_(0), |
| 27 initialized_() { | 27 initialized_() { |
| 28 } | 28 } |
| 29 | 29 |
| 30 MemorySnapshotMac::~MemorySnapshotMac() { | 30 MemorySnapshotWin::~MemorySnapshotWin() { |
| 31 } | 31 } |
| 32 | 32 |
| 33 void MemorySnapshotMac::Initialize(ProcessReader* process_reader, | 33 void MemorySnapshotWin::Initialize(ProcessReaderWin* process_reader, |
| 34 uint64_t address, | 34 uint64_t address, |
| 35 uint64_t size) { | 35 uint64_t size) { |
| 36 INITIALIZATION_STATE_SET_INITIALIZING(initialized_); | 36 INITIALIZATION_STATE_SET_INITIALIZING(initialized_); |
| 37 process_reader_ = process_reader; | 37 process_reader_ = process_reader; |
| 38 address_ = address; | 38 address_ = address; |
| 39 size_ = size; | 39 DLOG_IF(WARNING, size >= std::numeric_limits<size_t>::max()) |
| 40 << "size overflow"; |
| 41 size_ = static_cast<size_t>(size); |
| 40 INITIALIZATION_STATE_SET_VALID(initialized_); | 42 INITIALIZATION_STATE_SET_VALID(initialized_); |
| 41 } | 43 } |
| 42 | 44 |
| 43 uint64_t MemorySnapshotMac::Address() const { | 45 uint64_t MemorySnapshotWin::Address() const { |
| 44 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 46 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 45 return address_; | 47 return address_; |
| 46 } | 48 } |
| 47 | 49 |
| 48 size_t MemorySnapshotMac::Size() const { | 50 size_t MemorySnapshotWin::Size() const { |
| 49 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 51 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 50 return size_; | 52 return size_; |
| 51 } | 53 } |
| 52 | 54 |
| 53 bool MemorySnapshotMac::Read(Delegate* delegate) const { | 55 bool MemorySnapshotWin::Read(Delegate* delegate) const { |
| 54 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 56 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 55 | 57 |
| 56 if (size_ == 0) { | 58 if (size_ == 0) { |
| 57 return delegate->MemorySnapshotDelegateRead(nullptr, size_); | 59 return delegate->MemorySnapshotDelegateRead(nullptr, size_); |
| 58 } | 60 } |
| 59 | 61 |
| 60 scoped_ptr<uint8_t[]> buffer(new uint8_t[size_]); | 62 scoped_ptr<uint8_t[]> buffer(new uint8_t[size_]); |
| 61 if (!process_reader_->Memory()->Read(address_, size_, buffer.get())) { | 63 if (!process_reader_->ReadMemory(address_, size_, buffer.get())) { |
| 62 return false; | 64 return false; |
| 63 } | 65 } |
| 64 return delegate->MemorySnapshotDelegateRead(buffer.get(), size_); | 66 return delegate->MemorySnapshotDelegateRead(buffer.get(), size_); |
| 65 } | 67 } |
| 66 | 68 |
| 67 } // namespace internal | 69 } // namespace internal |
| 68 } // namespace crashpad | 70 } // namespace crashpad |
| OLD | NEW |