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

Stats delay for input/output can now be set separately, input delay by default 2 instead of 15.

Browse source
This commit is contained in:
Thulinma 2017-10-20 14:16:44 +02:00
parent 601617cb51
commit 01ffc42f9f
2 changed files with 51 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/defines.h
View file

@ -92,6 +92,7 @@ static inline void show_stackframe(){}
#ifndef STATS_DELAY #ifndef STATS_DELAY
#define STATS_DELAY 15 #define STATS_DELAY 15
#endif #endif
#define STATS_INPUT_DELAY 2
#ifndef INPUT_TIMEOUT #ifndef INPUT_TIMEOUT
#define INPUT_TIMEOUT STATS_DELAY #define INPUT_TIMEOUT STATS_DELAY

83
src/controller/controller_statistics.cpp
View file

@ -329,11 +329,13 @@ void Controller::SharedMemStats(void * config){
if (sessions.size()){ if (sessions.size()){
std::list<sessIndex> mustWipe; std::list<sessIndex> mustWipe;
unsigned long long cutOffPoint = Util::epoch() - STAT_CUTOFF; unsigned long long cutOffPoint = Util::epoch() - STAT_CUTOFF;
unsigned long long disconnectPoint = Util::epoch() - STATS_DELAY; unsigned long long disconnectPointIn = Util::epoch() - STATS_INPUT_DELAY;
unsigned long long disconnectPointOut = Util::epoch() - STATS_DELAY;
for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){ for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){
it->second.ping(it->first, disconnectPoint); unsigned long long dPoint = it->second.getSessType() == SESS_INPUT ? disconnectPointIn : disconnectPointOut;
it->second.ping(it->first, dPoint);
if (it->second.sync == 100){ if (it->second.sync == 100){
it->second.wipeOld(disconnectPoint); it->second.wipeOld(dPoint);
}else{ }else{
it->second.wipeOld(cutOffPoint); it->second.wipeOld(cutOffPoint);
} }
@ -1199,16 +1201,23 @@ void Controller::fillActive(JSON::Value & req, JSON::Value & rep, bool onlyNow){
//collect the data first //collect the data first
std::set<std::string> streams; std::set<std::string> streams;
std::map<std::string, unsigned long> clients; std::map<std::string, unsigned long> clients;
unsigned int t = Util::epoch() - STATS_DELAY; unsigned int tOut = Util::epoch() - STATS_DELAY;
unsigned int tIn = Util::epoch() - STATS_INPUT_DELAY;
//check all sessions //check all sessions
{ {
tthread::lock_guard<tthread::mutex> guard(statsMutex); tthread::lock_guard<tthread::mutex> guard(statsMutex);
if (sessions.size()){ if (sessions.size()){
for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){ for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){
if (!onlyNow || (it->second.hasDataFor(t) && it->second.isViewerOn(t))){ if (it->second.getSessType() == SESS_INPUT){
streams.insert(it->first.streamName); if (!onlyNow || (it->second.hasDataFor(tIn) && it->second.isViewerOn(tIn))){
if (it->second.getSessType() == SESS_VIEWER){ streams.insert(it->first.streamName);
clients[it->first.streamName]++; }
}else{
if (!onlyNow || (it->second.hasDataFor(tOut) && it->second.isViewerOn(tOut))){
streams.insert(it->first.streamName);
if (it->second.getSessType() == SESS_VIEWER){
clients[it->first.streamName]++;
}
} }
} }
} }
@ -1438,7 +1447,7 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
break; break;
} }
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION); H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.StartResponse("200", "OK", H, conn); H.StartResponse("200", "OK", H, conn, true);
//Collect core server stats //Collect core server stats
@ -1549,28 +1558,32 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
std::map<std::string, struct streamTotals> streams; std::map<std::string, struct streamTotals> streams;
std::map<std::string, uint32_t> outputs; std::map<std::string, uint32_t> outputs;
unsigned long totViewers = 0, totInputs = 0, totOutputs = 0; unsigned long totViewers = 0, totInputs = 0, totOutputs = 0;
unsigned int t = Util::epoch() - STATS_DELAY; unsigned int tOut = Util::epoch() - STATS_DELAY;
unsigned int tIn = Util::epoch() - STATS_INPUT_DELAY;
//check all sessions //check all sessions
if (sessions.size()){ if (sessions.size()){
for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){ for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){
if (it->second.hasDataFor(t) && it->second.isViewerOn(t)){ switch (it->second.getSessType()){
switch (it->second.getSessType()){ case SESS_UNSET:
case SESS_UNSET: case SESS_VIEWER:
case SESS_VIEWER: if (it->second.hasDataFor(tOut) && it->second.isViewerOn(tOut)){
streams[it->first.streamName].viewers++; streams[it->first.streamName].viewers++;
outputs[it->first.connector]++; outputs[it->first.connector]++;
totViewers++; totViewers++;
break; }
case SESS_INPUT: break;
case SESS_INPUT:
if (it->second.hasDataFor(tIn) && it->second.isViewerOn(tIn)){
streams[it->first.streamName].inputs++; streams[it->first.streamName].inputs++;
totInputs++; totInputs++;
break; }
case SESS_OUTPUT: break;
case SESS_OUTPUT:
if (it->second.hasDataFor(tOut) && it->second.isViewerOn(tOut)){
streams[it->first.streamName].outputs++; streams[it->first.streamName].outputs++;
totOutputs++; totOutputs++;
break; }
} break;
} }
} }
} }
@ -1639,28 +1652,32 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
std::map<std::string, struct streamTotals> streams; std::map<std::string, struct streamTotals> streams;
std::map<std::string, uint32_t> outputs; std::map<std::string, uint32_t> outputs;
unsigned long totViewers = 0, totInputs = 0, totOutputs = 0; unsigned long totViewers = 0, totInputs = 0, totOutputs = 0;
unsigned int t = Util::epoch() - STATS_DELAY; unsigned int tOut = Util::epoch() - STATS_DELAY;
unsigned int tIn = Util::epoch() - STATS_INPUT_DELAY;
//check all sessions //check all sessions
if (sessions.size()){ if (sessions.size()){
for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){ for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){
if (it->second.hasDataFor(t) && it->second.isViewerOn(t)){ switch (it->second.getSessType()){
switch (it->second.getSessType()){ case SESS_UNSET:
case SESS_UNSET: case SESS_VIEWER:
case SESS_VIEWER: if (it->second.hasDataFor(tOut) && it->second.isViewerOn(tOut)){
streams[it->first.streamName].viewers++; streams[it->first.streamName].viewers++;
outputs[it->first.connector]++; outputs[it->first.connector]++;
totViewers++; totViewers++;
break; }
case SESS_INPUT: break;
case SESS_INPUT:
if (it->second.hasDataFor(tIn) && it->second.isViewerOn(tIn)){
streams[it->first.streamName].inputs++; streams[it->first.streamName].inputs++;
totInputs++; totInputs++;
break; }
case SESS_OUTPUT: break;
case SESS_OUTPUT:
if (it->second.hasDataFor(tOut) && it->second.isViewerOn(tOut)){
streams[it->first.streamName].outputs++; streams[it->first.streamName].outputs++;
totOutputs++; totOutputs++;
break; }
} break;
} }
} }
} }