[Lldb-commits] [lldb] r182523 - <rdar://problem/13963648>
Han Ming Ong
hanming at apple.com
Wed May 22 14:32:43 PDT 2013
Author: hanming
Date: Wed May 22 16:32:42 2013
New Revision: 182523
URL: http://llvm.org/viewvc/llvm-project?rev=182523&view=rev
Log:
<rdar://problem/13963648>
Collect 'anonymous memory' info, if possible
Modified:
lldb/trunk/tools/debugserver/source/DNBDefs.h
lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp
lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp
lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.h
Modified: lldb/trunk/tools/debugserver/source/DNBDefs.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBDefs.h?rev=182523&r1=182522&r2=182523&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBDefs.h (original)
+++ lldb/trunk/tools/debugserver/source/DNBDefs.h Wed May 22 16:32:42 2013
@@ -356,6 +356,7 @@ enum DNBProfileDataScanType
eProfileMemory = (1 << 6), // By default, excludes eProfileMemoryDirtyPage.
eProfileMemoryDirtyPage = (1 << 7), // Assume eProfileMemory, get Dirty Page size as well.
+ eProfileMemoryAnonymous = (1 << 8), // Assume eProfileMemory, get Anonymous memory as well.
eProfileAll = 0xffffffff
};
Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp?rev=182523&r1=182522&r2=182523&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp Wed May 22 16:32:42 2013
@@ -364,7 +364,9 @@ MachTask::GetProfileData (DNBProfileData
mach_vm_size_t vprvt = 0;
mach_vm_size_t vsize = 0;
mach_vm_size_t dirty_size = 0;
- if (m_vm_memory.GetMemoryProfile(scanType, task, task_info, m_process->GetCPUType(), m_process->ProcessID(), vm_stats, physical_memory, rprvt, rsize, vprvt, vsize, dirty_size))
+ mach_vm_size_t purgeable = 0;
+ mach_vm_size_t anonymous = 0;
+ if (m_vm_memory.GetMemoryProfile(scanType, task, task_info, m_process->GetCPUType(), m_process->ProcessID(), vm_stats, physical_memory, rprvt, rsize, vprvt, vsize, dirty_size, purgeable, anonymous))
{
std::ostringstream profile_data_stream;
@@ -439,6 +441,12 @@ MachTask::GetProfileData (DNBProfileData
if (scanType & eProfileMemoryDirtyPage)
profile_data_stream << "dirty:" << dirty_size << ';';
+
+ if (scanType & eProfileMemoryAnonymous)
+ {
+ profile_data_stream << "purgeable:" << purgeable << ';';
+ profile_data_stream << "anonymous:" << anonymous << ';';
+ }
}
profile_data_stream << "--end--;";
Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp?rev=182523&r1=182522&r2=182523&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp Wed May 22 16:32:42 2013
@@ -17,6 +17,7 @@
#include <mach/mach_vm.h>
#include <mach/shared_region.h>
#include <sys/sysctl.h>
+#include <dlfcn.h>
MachVMMemory::MachVMMemory() :
m_page_size (kInvalidPageSize),
@@ -281,14 +282,7 @@ MachVMMemory::GetRegionSizes(task_t task
}
}
- static vm_size_t pagesize;
- static bool calculated = false;
- if (!calculated)
- {
- calculated = true;
- pagesize = PageSize (task);
- }
-
+ vm_size_t pagesize = PageSize (task);
rsize = pages_resident * pagesize;
dirty_size = pages_dirtied * pagesize;
}
@@ -333,14 +327,7 @@ MachVMMemory::GetMemorySizes(task_t task
mach_vm_size_t aliased = 0;
bool global_shared_text_data_mapped = false;
-
- static vm_size_t pagesize;
- static bool calculated = false;
- if (!calculated)
- {
- calculated = true;
- pagesize = PageSize (task);
- }
+ vm_size_t pagesize = PageSize (task);
for (mach_vm_address_t addr=0, size=0; ; addr += size)
{
@@ -430,8 +417,68 @@ MachVMMemory::GetMemorySizes(task_t task
rprvt += aliased;
}
+#if defined (TASK_VM_INFO) && TASK_VM_INFO >= 22
+
+// cribbed from sysmond
+static uint64_t
+SumVMPurgeableInfo(const vm_purgeable_info_t info)
+{
+ uint64_t sum = 0;
+ int i;
+
+ for (i = 0; i < 8; i++)
+ {
+ sum += info->fifo_data[i].size;
+ }
+ sum += info->obsolete_data.size;
+ for (i = 0; i < 8; i++)
+ {
+ sum += info->lifo_data[i].size;
+ }
+
+ return sum;
+}
+
+#endif
+
+static void
+GetPurgeableAndAnonymous(task_t task, uint64_t &purgeable, uint64_t &anonymous)
+{
+#if defined (TASK_VM_INFO) && TASK_VM_INFO >= 22
+
+ kern_return_t kr;
+ task_purgable_info_t purgeable_info;
+ uint64_t purgeable_sum = 0;
+ mach_msg_type_number_t info_count;
+ task_vm_info_data_t vm_info;
+
+ if (dlsym(RTLD_NEXT, "task_purgable_info") != NULL )
+ {
+ kr = task_purgable_info(task, &purgeable_info);
+ if (kr == KERN_SUCCESS) {
+ purgeable_sum = SumVMPurgeableInfo(&purgeable_info);
+ purgeable = purgeable_sum;
+ }
+ }
+
+ info_count = TASK_VM_INFO_COUNT;
+ kr = task_info(task, TASK_VM_INFO, (task_info_t)&vm_info, &info_count);
+ if (kr == KERN_SUCCESS)
+ {
+ if (purgeable_sum < vm_info.internal)
+ {
+ anonymous = vm_info.internal - purgeable_sum;
+ }
+ else
+ {
+ anonymous = 0;
+ }
+ }
+#endif
+}
+
nub_bool_t
-MachVMMemory::GetMemoryProfile(DNBProfileDataScanType scanType, task_t task, struct task_basic_info ti, cpu_type_t cputype, nub_process_t pid, vm_statistics_data_t &vm_stats, uint64_t &physical_memory, mach_vm_size_t &rprvt, mach_vm_size_t &rsize, mach_vm_size_t &vprvt, mach_vm_size_t &vsize, mach_vm_size_t &dirty_size)
+MachVMMemory::GetMemoryProfile(DNBProfileDataScanType scanType, task_t task, struct task_basic_info ti, cpu_type_t cputype, nub_process_t pid, vm_statistics_data_t &vm_stats, uint64_t &physical_memory, mach_vm_size_t &rprvt, mach_vm_size_t &rsize, mach_vm_size_t &vprvt, mach_vm_size_t &vsize, mach_vm_size_t &dirty_size, mach_vm_size_t &purgeable, mach_vm_size_t &anonymous)
{
if (scanType & eProfileHostMemory)
physical_memory = GetPhysicalMemory();
@@ -453,6 +500,11 @@ MachVMMemory::GetMemoryProfile(DNBProfil
// This uses vmmap strategy. We don't use the returned rsize for now. We prefer to match top's version since that's what we do for the rest of the metrics.
GetRegionSizes(task, rsize, dirty_size);
}
+
+ if (scanType & eProfileMemoryAnonymous)
+ {
+ GetPurgeableAndAnonymous(task, purgeable, anonymous);
+ }
}
return true;
Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.h?rev=182523&r1=182522&r2=182523&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.h Wed May 22 16:32:42 2013
@@ -28,7 +28,7 @@ public:
nub_size_t Write(task_t task, nub_addr_t address, const void *data, nub_size_t data_count);
nub_size_t PageSize(task_t task);
nub_bool_t GetMemoryRegionInfo(task_t task, nub_addr_t address, DNBRegionInfo *region_info);
- nub_bool_t GetMemoryProfile(DNBProfileDataScanType scanType, task_t task, struct task_basic_info ti, cpu_type_t cputype, nub_process_t pid, vm_statistics_data_t &vm_stats, uint64_t &physical_memory, mach_vm_size_t &rprvt, mach_vm_size_t &rsize, mach_vm_size_t &vprvt, mach_vm_size_t &vsize, mach_vm_size_t &dirty_size);
+ nub_bool_t GetMemoryProfile(DNBProfileDataScanType scanType, task_t task, struct task_basic_info ti, cpu_type_t cputype, nub_process_t pid, vm_statistics_data_t &vm_stats, uint64_t &physical_memory, mach_vm_size_t &rprvt, mach_vm_size_t &rsize, mach_vm_size_t &vprvt, mach_vm_size_t &vsize, mach_vm_size_t &dirty_size, mach_vm_size_t &purgable, mach_vm_size_t &anonymous);
protected:
nub_size_t MaxBytesLeftInPage(task_t task, nub_addr_t addr, nub_size_t count);
More information about the lldb-commits
mailing list