Skip to content

Commit b4df57c

Browse files
committed
gameserver: test out this thirdparty library
1 parent 763afc7 commit b4df57c

File tree

4 files changed

+459
-15
lines changed

4 files changed

+459
-15
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3239,12 +3239,11 @@ bf:WriteString("1") -- ConVar value
32393239
gameserver.BroadcastMessage(5, "NET_SetConVar", bf) -- 5 = net_SetConVar / net message type.
32403240
```
32413241

3242-
#### number gameserver.CalculateCPUUsage()
3242+
#### number gameserver.GetCPUUsage()
32433243
Calculates and returns the CPU Usage.
32443244

3245-
#### number gameserver.ApproximateProcessMemoryUsage()
3246-
Approximates the memory usage of the server in bytes.
3247-
It isn't really related to the gameserver itself, but since it has CalculateCPUUsage I want to keep them close.
3245+
#### table gameserver.GetMemoryStats()
3246+
Returns a table contianing memory stats.
32483247

32493248
### CBaseClient
32503249
This class represents a client.

source/modules/gameserver.cpp

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@
1010
#include "sourcesdk/net_chan.h"
1111
#include <framesnapshot.h>
1212

13+
#if SYSTEM_LINUX
14+
#include "thirdparty/cpp-linux-system-stats/linux-system-usage.hpp"
15+
#endif
16+
1317
double net_time;
1418

1519
class CGameServerModule : public IModule
1620
{
1721
public:
1822
virtual void LuaInit(bool bServerInit) OVERRIDE;
1923
virtual void LuaShutdown() OVERRIDE;
24+
virtual void Think(bool bSimulating) OVERRIDE;
2025
virtual void InitDetour(bool bPreServer) OVERRIDE;
2126
virtual const char* Name() { return "gameserver"; };
2227
virtual int Compatibility() { return LINUX32; };
@@ -1246,23 +1251,61 @@ LUA_FUNCTION_STATIC(gameserver_BroadcastMessage)
12461251
return 0;
12471252
}
12481253

1249-
LUA_FUNCTION_STATIC(gameserver_CalculateCPUUsage)
1254+
#if SYSTEM_LINUX
1255+
static get_system_usage_linux::CPU_stats lastStat;
1256+
#endif
1257+
LUA_FUNCTION_STATIC(gameserver_GetCPUUsage)
12501258
{
1251-
if (!Util::server || !Util::server->IsActive())
1252-
return 0;
1253-
1254-
CBaseServer* pServer = (CBaseServer*)Util::server;
1255-
pServer->CalculateCPUUsage();
1256-
LUA->PushNumber(pServer->m_fCPUPercent);
1259+
#if SYSTEM_LINUX
1260+
get_system_usage_linux::CPU_stats currentStat = get_system_usage_linux::read_cpu_data();
1261+
LUA->PushNumber(100.0f * get_system_usage_linux::get_cpu_usage(lastStat, currentStat));
1262+
#else
1263+
LUA->PushNumber(0);
1264+
#endif
12571265
return 1;
12581266
}
12591267

1260-
LUA_FUNCTION_STATIC(gameserver_ApproximateProcessMemoryUsage)
1268+
LUA_FUNCTION_STATIC(gameserver_GetMemoryStats)
12611269
{
1262-
LUA->PushNumber(ApproximateProcessMemoryUsage());
1270+
LUA->PreCreateTable(0, 5);
1271+
1272+
#if SYSTEM_LINUX
1273+
get_system_usage_linux::Memory_stats stats = get_system_usage_linux::read_memory_data();
1274+
LUA->PushString("available_memory");
1275+
LUA->PushNumber(stats.available_memory);
1276+
LUA->RawSet(-3);
1277+
1278+
LUA->PushString("free_swap");
1279+
LUA->PushNumber(stats.free_swap);
1280+
LUA->RawSet(-3);
1281+
1282+
LUA->PushString("total_memory");
1283+
LUA->PushNumber(stats.total_memory);
1284+
LUA->RawSet(-3);
1285+
1286+
LUA->PushString("total_swap");
1287+
LUA->PushNumber(stats.total_swap);
1288+
LUA->RawSet(-3);
1289+
1290+
LUA->PushString("memory_usage");
1291+
LUA->PushNumber(stats.get_memory_usage());
1292+
LUA->RawSet(-3);
1293+
1294+
LUA->PushString("swap_usage");
1295+
LUA->PushNumber(stats.get_swap_usage());
1296+
LUA->RawSet(-3);
1297+
#endif
1298+
12631299
return 1;
12641300
}
12651301

1302+
void CGameServerModule::Think(bool bSimulating)
1303+
{
1304+
#if SYSTEM_LINUX
1305+
lastStat = get_system_usage_linux::read_cpu_data();
1306+
#endif
1307+
}
1308+
12661309
extern CGlobalVars* gpGlobals;
12671310
static ConVar* sv_stressbots;
12681311
void CGameServerModule::LuaInit(bool bServerInit)
@@ -1309,8 +1352,8 @@ void CGameServerModule::LuaInit(bool bServerInit)
13091352
Util::AddFunc(gameserver_SetPaused, "SetPaused");
13101353
Util::AddFunc(gameserver_SetPassword, "SetPassword");
13111354
Util::AddFunc(gameserver_BroadcastMessage, "BroadcastMessage");
1312-
Util::AddFunc(gameserver_CalculateCPUUsage, "CalculateCPUUsage");
1313-
Util::AddFunc(gameserver_ApproximateProcessMemoryUsage, "ApproximateProcessMemoryUsage");
1355+
Util::AddFunc(gameserver_GetCPUUsage, "GetCPUUsage");
1356+
Util::AddFunc(gameserver_GetMemoryStats, "GetMemoryStats");
13141357
Util::FinishTable("gameserver");
13151358
}
13161359

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

0 commit comments

Comments
 (0)