This is an archive of the discontinued LLVM Phabricator instance.

Fix debugserver build breakage on Mavericks caused by lldb commit svn 240728
ClosedPublic

Authored by dawn on Jul 13 2015, 2:44 PM.

Download Raw Diff

Details

Reviewers

clayborg
jasonmolenda

Summary

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.

Diff Detail

Repository: rL LLVM

Event Timeline

dawn updated this revision to Diff 29612.Jul 13 2015, 2:44 PM

dawn retitled this revision from to Fix debugserver build breakage on Mavericks caused by lldb commit svn 240728.

dawn updated this object.

dawn added reviewers: jasonmolenda, clayborg.

dawn set the repository for this revision to rL LLVM.

dawn added a subscriber: lldb-commits.

Looks good.

This revision is now accepted and ready to land.Jul 13 2015, 2:48 PM

Committed to lldb rev. 242114

Revision Contents

Path

Size

tools/

debugserver/

source/

MacOSX/

MachTask.mm

4 lines

Diff 29612

tools/debugserver/source/MacOSX/MachTask.mm

Context not available.

	if (scanType & eProfileMemory)	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;	static vm_size_t pagesize = vm_kernel_page_size;
	#else	#else
	static vm_size_t pagesize;	static vm_size_t pagesize;
Context not available.
	*/	*/
	#if defined (HOST_VM_INFO64_COUNT)	#if defined (HOST_VM_INFO64_COUNT)
	// This mimicks Activity Monitor.	// 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	#else
	uint64_t total_used_count = vminfo.wire_count + vminfo.inactive_count + vminfo.active_count;	uint64_t total_used_count = vminfo.wire_count + vminfo.inactive_count + vminfo.active_count;
	#endif	#endif
Context not available.