From adf84a05fa768a098bf383e00862f5fa91655fdd Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Sat, 21 Sep 2013 18:21:37 -0600 Subject: Implemented Apple-specific GetMemoryUsage. --- source/WebAdmin.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp index 3931c8c89..65d50dbd9 100644 --- a/source/WebAdmin.cpp +++ b/source/WebAdmin.cpp @@ -21,7 +21,7 @@ #elif defined(__linux__) #include #elif defined(__APPLE__) - // Apple-specific includes go here + #include #endif @@ -451,7 +451,16 @@ int cWebAdmin::GetMemoryUsage(void) } return -1; #elif defined (__APPLE__) - // TODO: Apple-specific + struct task_basic_info t_info; + mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT; + + if (KERN_SUCCESS == task_info(mach_task_self(), + TASK_BASIC_INFO, (task_info_t)&t_info, + &t_info_count)) + { + return (int)(t_info.resident_size/1024); + } + return -1; #else LOGINFO("%s: Unknown platform, cannot query memory usage", __FUNCTION__); return -1; -- cgit v1.2.3