source/xmrig-proxy
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig-proxy.git synced 2026-02-09 02:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add memory information to "GET /1/summary"

Browse Source
This commit is contained in:
XMRig
2018-11-02 21:53:41 +07:00
parent 5c1235181a
commit 6e4e45010f
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/ApiRouter.cpp
View File

@@ -110,6 +110,7 @@ void ApiRouter::get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) cons
getIdentify(doc);
getMiner(doc);
getHashrate(doc);
getMemory(doc);
getMinersSummary(doc, req.match("/1/summary"));
getResults(doc);
@@ -211,6 +212,21 @@ void ApiRouter::getIdentify(rapidjson::Document &doc) const
}
void ApiRouter::getMemory(rapidjson::Document &doc) const
{
auto &allocator = doc.GetAllocator();
size_t rss = 0;
uv_resident_set_memory(&rss);
rapidjson::Value memory(rapidjson::kObjectType);
memory.AddMember("total", uv_get_total_memory(), allocator);
memory.AddMember("res", static_cast<uint64_t>(rss), allocator);
doc.AddMember("memory", memory, allocator);
}
void ApiRouter::getMiner(rapidjson::Document &doc) const
{
auto &allocator = doc.GetAllocator();
@@ -317,7 +333,7 @@ void ApiRouter::getResources(rapidjson::Document &doc) const
uv_resident_set_memory(&rss);
doc.AddMember("total_memory", uv_get_total_memory(), allocator);
doc.AddMember("resident_set_memory", (uint64_t) rss, allocator);
doc.AddMember("resident_set_memory", static_cast<uint64_t>(rss), allocator);
}

7
src/api/ApiRouter.h
View File

@@ -21,8 +21,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __APIROUTER_H__
#define __APIROUTER_H__
#ifndef XMRIG_APIROUTER_H
#define XMRIG_APIROUTER_H
#include "common/interfaces/IControllerListener.h"
@@ -57,6 +57,7 @@ private:
void genId(const char *id);
void getHashrate(rapidjson::Document &doc) const;
void getIdentify(rapidjson::Document &doc) const;
void getMemory(rapidjson::Document &doc) const;
void getMiner(rapidjson::Document &doc) const;
void getMiners(rapidjson::Document &doc) const;
void getMinersSummary(rapidjson::Document &doc, bool advanced) const;
@@ -71,4 +72,4 @@ private:
xmrig::Controller *m_controller;
};
#endif /* __APIROUTER_H__ */
#endif /* XMRIG_APIROUTER_H */