From 20e7221c7cc54af13d047306b8b1e6fc2d834f29 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Jul 2013 10:59:10 +0200
Subject: WebAdmin: Removed the duplicate memory usage querying

---
 source/WebAdmin.cpp | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

(limited to 'source/WebAdmin.cpp')

diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index 11a5bd379..3d04ce8f3 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -243,36 +243,13 @@ void cWebAdmin::Request_Handler(webserver::http_request* r)
 				Content += "\n<p><a href='" + BaseURL + "'>Go back</a></p>";
 			}
 
-			// mem usage
-#ifndef _WIN32
-			rusage resource_usage;
-			if (getrusage(RUSAGE_SELF, &resource_usage) != 0)
-			{
-				ReplaceString( Template, AString("{MEM}"), "Error :(" );
-			}
-			else
-			{
-				AString MemUsage;
-				Printf(MemUsage, "%0.2f", ((double)resource_usage.ru_maxrss / 1024 / 1024) );
-				ReplaceString(Template, AString("{MEM}"), MemUsage);
-			}
-#else
-			HANDLE hProcess = GetCurrentProcess();
-			PROCESS_MEMORY_COUNTERS pmc;
-			if( GetProcessMemoryInfo( hProcess, &pmc, sizeof(pmc) ) )
-			{
-				AString MemUsage;
-				Printf(MemUsage, "%0.2f", (pmc.WorkingSetSize / 1024.f / 1024.f) );
-				ReplaceString( Template, "{MEM}", MemUsage );
-			}
-#endif
-			// end mem usage
-
-			ReplaceString( Template, "{USERNAME}",    r->username_ );
-			ReplaceString( Template, "{MENU}",        Menu );
-			ReplaceString( Template, "{PLUGIN_NAME}", FoundPlugin );
-			ReplaceString( Template, "{CONTENT}",     Content );
-			ReplaceString( Template, "{TITLE}",       "MCServer" );
+			AString MemUsage = GetMemoryUsage();
+			ReplaceString(Template, "{MEM}",         MemUsage);
+			ReplaceString(Template, "{USERNAME}",    r->username_);
+			ReplaceString(Template, "{MENU}",        Menu);
+			ReplaceString(Template, "{PLUGIN_NAME}", FoundPlugin);
+			ReplaceString(Template, "{CONTENT}",     Content);
+			ReplaceString(Template, "{TITLE}",       "MCServer");
 
 			AString NumChunks;
 			Printf(NumChunks, "%d", cRoot::Get()->GetTotalChunkCount());
@@ -436,7 +413,7 @@ AString cWebAdmin::GetBaseURL( const AStringVector& a_URLSplit )
 
 
 
-AString cWebAdmin::GetMemoryUsage() const
+AString cWebAdmin::GetMemoryUsage(void)
 {
 	AString MemUsage;
 #ifndef _WIN32
-- 
cgit v1.2.3