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

Added support for clients and lastms requests in active_streams API call

Browse source
This commit is contained in:
Thulinma 2015-11-27 10:00:57 +01:00
parent 7168a3ffbd
commit 22467d603e
1 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/controller/controller_statistics.cpp
View file

@ -1,5 +1,7 @@
#include <cstdio>
#include <mist/config.h>
#include <mist/shared_memory.h>
#include <mist/dtsc.h>
#include "controller_statistics.h"
#include "controller_limits.h"
@ -594,17 +596,54 @@ void Controller::fillClients(JSON::Value & req, JSON::Value & rep){
void Controller::fillActive(JSON::Value & req, JSON::Value & rep){
//collect the data first
std::set<std::string> streams;
std::map<std::string, unsigned long> clients;
unsigned int t = Util::epoch() - 5;
//check all sessions
if (sessions.size()){
for (std::map<sessIndex, statSession>::iterator it = sessions.begin(); it != sessions.end(); it++){
streams.insert(it->first.streamName);
if (it->second.hasDataFor(t)){
clients[it->first.streamName]++;
}
}
}
//Good, now output what we found...
rep.null();
for (std::set<std::string>::iterator it = streams.begin(); it != streams.end(); it++){
if (req.isArray()){
rep[*it].null();
jsonForEach(req, j){
if (j->asStringRef() == "clients"){
rep[*it].append((long long)clients[*it]);
}
if (j->asStringRef() == "lastms"){
char pageId[NAME_BUFFER_SIZE];
IPC::sharedPage streamIndex;
snprintf(pageId, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, it->c_str());
streamIndex.init(pageId, DEFAULT_META_PAGE_SIZE, false, false);
if (streamIndex.mapped){
IPC::semaphore metaLocker(std::string("liveMeta@" + (*it)).c_str(), O_CREAT | O_RDWR, (S_IRWXU|S_IRWXG|S_IRWXO), 1);
metaLocker.wait();
DTSC::Scan strm = DTSC::Packet(streamIndex.mapped, streamIndex.len, true).getScan();
long long lms = 0;
DTSC::Scan trcks = strm.getMember("tracks");
unsigned int trcks_ctr = trcks.getSize();
for (unsigned int i = 0; i < trcks_ctr; ++i){
if (trcks.getIndice(i).getMember("lastms").asInt() > lms){
lms = trcks.getIndice(i).getMember("lastms").asInt();
}
}
rep[*it].append(lms);
metaLocker.post();
}else{
rep[*it].append(-1ll);
}
}
}
}else{
rep.append(*it);
}
}
//all done! return is by reference, so no need to return anything here.
}