[Lldb-commits] [PATCH] D11162: Fix debugserver build breakage on Mavericks caused by lldb commit svn 240728

[Dawn Perchik]

dawn created this revision.
dawn added reviewers: jasonmolenda, clayborg.
dawn added a subscriber: lldb-commits.
dawn set the repository for this revision to rL LLVM.

vm_kernel_page_size appears to not be defined on OSX Mavericks, so the build fails with:
    ...
    ../tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm:452:41: error: use of undeclared identifier 'vm_kernel_page_size'
             static vm_size_t pagesize = vm_kernel_page_size;
                                         ^
     ../tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm:470:60: error: use of undeclared identifier 'vm_kernel_page_size'
             uint64_t total_used_count = (physical_memory / vm_kernel_page_size) - (vminfo.free_count - vminfo.speculative_count) - vminfo.external_page_count - vminfo.purgeable_count;
    ...

This patch fixes the build by calculating the pagesize if _VM_PAGE_SIZE_H_ is not defined.

Repository:
  rL LLVM

http://reviews.llvm.org/D11162

Files:
  tools/debugserver/source/MacOSX/MachTask.mm

Index: tools/debugserver/source/MacOSX/MachTask.mm
===================================================================
--- tools/debugserver/source/MacOSX/MachTask.mm
+++ tools/debugserver/source/MacOSX/MachTask.mm
@@ -448,7 +448,7 @@
         
         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 @@
              */
 #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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D11162.29612.patch
Type: text/x-patch
Size: 1107 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150713/f2d3fc4c/attachment.bin>