diff options
| author | Dawn Perchik <dawn@burble.org> | 2015-07-14 03:50:10 +0000 |
|---|---|---|
| committer | Dawn Perchik <dawn@burble.org> | 2015-07-14 03:50:10 +0000 |
| commit | 323d5ed8bdf2bf017d9a8137020b94a4061fb7ef (patch) | |
| tree | 282a04a048a4a2b1d86bc134ed630f33325539ee | |
| parent | b1ba50c085dfe1e30bf297277e75deccae9eae18 (diff) | |
Fix debugserver build breakage on Mavericks after lldb commit svn 240728
vm_kernel_page_size appears to not be defined on OSX Mavericks, so the
build fails. This patch fixes the build by calculating the pagesize if
_VM_PAGE_SIZE_H_ is not defined.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@242114 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/debugserver/source/MacOSX/MachTask.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/debugserver/source/MacOSX/MachTask.mm b/tools/debugserver/source/MacOSX/MachTask.mm index ae9b8730a..cdef0256f 100644 --- a/tools/debugserver/source/MacOSX/MachTask.mm +++ b/tools/debugserver/source/MacOSX/MachTask.mm @@ -448,7 +448,7 @@ MachTask::GetProfileData (DNBProfileDataScanType scanType) if (scanType & eProfileMemory) { -#if defined (HOST_VM_INFO64_COUNT) +#if defined (HOST_VM_INFO64_COUNT) && defined (_VM_PAGE_SIZE_H_) static vm_size_t pagesize = vm_kernel_page_size; #else static vm_size_t pagesize; @@ -467,7 +467,7 @@ MachTask::GetProfileData (DNBProfileDataScanType scanType) */ #if defined (HOST_VM_INFO64_COUNT) // This mimicks Activity Monitor. - uint64_t total_used_count = (physical_memory / vm_kernel_page_size) - (vminfo.free_count - vminfo.speculative_count) - vminfo.external_page_count - vminfo.purgeable_count; + uint64_t total_used_count = (physical_memory / pagesize) - (vminfo.free_count - vminfo.speculative_count) - vminfo.external_page_count - vminfo.purgeable_count; #else uint64_t total_used_count = vminfo.wire_count + vminfo.inactive_count + vminfo.active_count; #endif |