flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Implemented cWebAdmin:GetMemoryUsage() on Linux proper.

Browse Source 
Also the function now returns an int, number of KiB used, or -1 on failure.
This commit is contained in:
madmaxoft
2013-09-21 19:00:01 +02:00
parent 405d434c06
commit 6b61df3b73
5 changed files with 113 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MCServer/webadmin/template.lua
View File

@@ -58,7 +58,7 @@ function ShowPage(WebAdmin, TemplateRequest)
SiteContent = {}
local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
local Title = "MCServer"
local MemoryUsage = cWebAdmin:GetMemoryUsage()
local MemoryUsageKiB = cWebAdmin:GetMemoryUsage()
local NumChunks = cRoot:Get():GetTotalChunkCount()
local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
local PageContent = PluginPage.Content
@@ -456,7 +456,7 @@ function ShowPage(WebAdmin, TemplateRequest)
</div>
<!-- // #containerHolder -->
<p id="footer">MCServer is using: ]] .. MemoryUsage .. [[MB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
<p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
</div>
<!-- // #wrapper -->
</body>