hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHM statistics in prometheus output

Browse source
This commit is contained in:
Thulinma 2016-05-23 14:32:01 +02:00
parent 3d5f0ff5ba
commit 5fbf4dd23b
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/controller/controller_statistics.cpp
View file

@ -1,6 +1,7 @@
#include <cstdio> #include <cstdio>
#include <list> #include <list>
#include <fstream> #include <fstream>
#include <sys/statvfs.h>//for fstatvfs
#include <mist/config.h> #include <mist/config.h>
#include <mist/shared_memory.h> #include <mist/shared_memory.h>
#include <mist/dtsc.h> #include <mist/dtsc.h>
@ -1175,6 +1176,16 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
} }
} }
} }
long long shm_total = 0, shm_free = 0;
{
struct statvfs shmd;
IPC::sharedPage tmpConf(SHM_CONF, DEFAULT_CONF_PAGE_SIZE, false, false);
if (tmpConf.mapped && tmpConf.handle){
fstatvfs(tmpConf.handle, &shmd);
shm_free = (shmd.f_bfree*shmd.f_frsize)/1024;
shm_total = (shmd.f_blocks*shmd.f_frsize)/1024;
}
}
if (mode == PROMETHEUS_TEXT){ if (mode == PROMETHEUS_TEXT){
@ -1191,6 +1202,12 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
response << "# HELP mist_mem_used Total memory in use in KiB.\n"; response << "# HELP mist_mem_used Total memory in use in KiB.\n";
response << "# TYPE mist_mem_used gauge\n"; response << "# TYPE mist_mem_used gauge\n";
response << "mist_mem_used " << (mem_total - mem_free - mem_bufcache) << "\n\n"; response << "mist_mem_used " << (mem_total - mem_free - mem_bufcache) << "\n\n";
response << "# HELP mist_shm_total Total shared memory available in KiB.\n";
response << "# TYPE mist_shm_total gauge\n";
response << "mist_shm_total " << shm_total << "\n\n";
response << "# HELP mist_shm_used Total shared memory in use in KiB.\n";
response << "# TYPE mist_shm_used gauge\n";
response << "mist_shm_used " << (shm_total - shm_free) << "\n\n";
{//Scope for shortest possible blocking of statsMutex {//Scope for shortest possible blocking of statsMutex
tthread::lock_guard<tthread::mutex> guard(statsMutex); tthread::lock_guard<tthread::mutex> guard(statsMutex);
@ -1265,6 +1282,8 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
resp["cpu"] = cpu_use; resp["cpu"] = cpu_use;
resp["mem_total"] = mem_total; resp["mem_total"] = mem_total;
resp["mem_used"] = (mem_total - mem_free - mem_bufcache); resp["mem_used"] = (mem_total - mem_free - mem_bufcache);
resp["shm_total"] = shm_total;
resp["shm_used"] = (shm_total - shm_free);
resp["logs"] = (long long)Controller::logCounter; resp["logs"] = (long long)Controller::logCounter;
{//Scope for shortest possible blocking of statsMutex {//Scope for shortest possible blocking of statsMutex
tthread::lock_guard<tthread::mutex> guard(statsMutex); tthread::lock_guard<tthread::mutex> guard(statsMutex);
@ -1320,6 +1339,9 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
resp["streams"][it->first]["bw"].append((long long)it->second.downBytes); resp["streams"][it->first]["bw"].append((long long)it->second.downBytes);
} }
} }
H.Chunkify(resp.toString(), conn); H.Chunkify(resp.toString(), conn);
} }