summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-07-29 10:59:10 +0200
committermadmaxoft <github@xoft.cz>2013-07-29 10:59:10 +0200
commit20e7221c7cc54af13d047306b8b1e6fc2d834f29 (patch)
treea908285520af56c2bb43fb36c9bba57367c8364a
parentFixed formatting in LuaScript.* (diff)
downloadcuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar.gz
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar.bz2
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar.lz
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar.xz
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.tar.zst
cuberite-20e7221c7cc54af13d047306b8b1e6fc2d834f29.zip
Diffstat (limited to '')
-rw-r--r--source/Bindings.cpp10
-rw-r--r--source/Bindings.h2
-rw-r--r--source/WebAdmin.cpp39
-rw-r--r--source/WebAdmin.h8
4 files changed, 16 insertions, 43 deletions
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index a313ce98d..910b48007 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 07/29/13 09:54:50.
+** Generated automatically by tolua++-1.0.92 on 07/29/13 10:58:05.
*/
#ifndef __cplusplus
@@ -18883,19 +18883,15 @@ static int tolua_AllToLua_cWebAdmin_GetMemoryUsage00(lua_State* tolua_S)
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
- !tolua_isusertype(tolua_S,1,"const cWebAdmin",0,&tolua_err) ||
+ !tolua_isusertable(tolua_S,1,"cWebAdmin",0,&tolua_err) ||
!tolua_isnoobj(tolua_S,2,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
- const cWebAdmin* self = (const cWebAdmin*) tolua_tousertype(tolua_S,1,0);
-#ifndef TOLUA_RELEASE
- if (!self) tolua_error(tolua_S,"invalid 'self' in function 'GetMemoryUsage'", NULL);
-#endif
{
- AString tolua_ret = (AString) self->GetMemoryUsage();
+ AString tolua_ret = (AString) cWebAdmin::GetMemoryUsage();
tolua_pushcppstring(tolua_S,(const char*)tolua_ret);
}
}
diff --git a/source/Bindings.h b/source/Bindings.h
index 256a8e257..67779643d 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 07/29/13 09:54:50.
+** Generated automatically by tolua++-1.0.92 on 07/29/13 10:58:06.
*/
/* Exported function */
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
diff --git a/source/WebAdmin.h b/source/WebAdmin.h
index 3e57bbf00..4b12b955e 100644
--- a/source/WebAdmin.h
+++ b/source/WebAdmin.h
@@ -63,13 +63,13 @@ public: // tolua_export
static void Request_Handler(webserver::http_request* r);
- int GetPort() { return m_Port; } // tolua_export
+ int GetPort() { return m_Port; } // tolua_export
- sWebAdminPage GetPage(const HTTPRequest& a_Request); // tolua_export
- AString GetBaseURL(const AString& a_URL); // tolua_export
+ sWebAdminPage GetPage(const HTTPRequest& a_Request); // tolua_export
+ AString GetBaseURL(const AString& a_URL); // tolua_export
AString GetBaseURL(const AStringVector& a_URLSplit);
- AString GetMemoryUsage() const; // tolua_export
+ static AString GetMemoryUsage(void); // tolua_export
private:
#ifdef _WIN32