summaryrefslogtreecommitdiffstats
path: root/source/WebAdmin.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-10-08 20:12:34 +0200
committermadmaxoft <github@xoft.cz>2013-10-08 20:12:34 +0200
commita120507be027ba18d5443e76061b47e0c624f229 (patch)
tree6a4379b153bd4785b430cdc044c9947f2ac6c302 /source/WebAdmin.cpp
parentCleaned up cEntity's enums. (diff)
downloadcuberite-a120507be027ba18d5443e76061b47e0c624f229.tar
cuberite-a120507be027ba18d5443e76061b47e0c624f229.tar.gz
cuberite-a120507be027ba18d5443e76061b47e0c624f229.tar.bz2
cuberite-a120507be027ba18d5443e76061b47e0c624f229.tar.lz
cuberite-a120507be027ba18d5443e76061b47e0c624f229.tar.xz
cuberite-a120507be027ba18d5443e76061b47e0c624f229.tar.zst
cuberite-a120507be027ba18d5443e76061b47e0c624f229.zip
Diffstat (limited to 'source/WebAdmin.cpp')
-rw-r--r--source/WebAdmin.cpp54
1 files changed, 2 insertions, 52 deletions
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index c917ec658..08817139a 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -17,14 +17,6 @@
#include "HTTPServer/HTTPMessage.h"
#include "HTTPServer/HTTPConnection.h"
-#ifdef _WIN32
- #include <psapi.h>
-#elif defined(__linux__)
- #include <fstream>
-#elif defined(__APPLE__)
- #include <mach/mach.h>
-#endif
-
@@ -392,50 +384,8 @@ AString cWebAdmin::GetBaseURL( const AStringVector& a_URLSplit )
int cWebAdmin::GetMemoryUsage(void)
{
- #ifdef _WIN32
- PROCESS_MEMORY_COUNTERS pmc;
- if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)))
- {
- return (int)(pmc.WorkingSetSize / 1024);
- }
- return -1;
- #elif defined(__linux__)
- // Code adapted from http://stackoverflow.com/questions/63166/how-to-determine-cpu-and-memory-consumption-from-inside-a-process
- std::ifstream StatFile("/proc/self/status");
- if (!StatFile.good())
- {
- return -1;
- }
- while (StatFile.good())
- {
- AString Line;
- std::getline(StatFile, Line);
- if (strncmp(Line.c_str(), "VmSize:", 7) == 0)
- {
- int res = atoi(Line.c_str() + 8);
- return (res == 0) ? -1 : res; // If parsing failed, return -1
- }
- }
- return -1;
- #elif defined (__APPLE__)
- // Code adapted from http://stackoverflow.com/questions/63166/how-to-determine-cpu-and-memory-consumption-from-inside-a-process
- 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;
- #endif
+ LOGWARNING("%s: This function is obsolete, use cRoot::GetPhysicalRAMUsage() or cRoot::GetVirtualRAMUsage() instead", __FUNCTION__);
+ return cRoot::GetPhysicalRAMUsage();
}