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

Added stats entry for RTSP pull input

Browse source
This commit is contained in:
Thulinma 2020-02-03 16:34:05 +01:00
parent 3b3377ae92
commit e9832ac723
1 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/input/input_rtsp.cpp
View file

@ -180,16 +180,44 @@ namespace Mist{
} }
std::string InputRTSP::streamMainLoop(){ std::string InputRTSP::streamMainLoop(){
IPC::sharedClient statsPage = IPC::sharedClient(SHM_STATISTICS, STAT_EX_SIZE, true);
uint64_t startTime = Util::epoch();
uint64_t lastPing = Util::bootSecs(); uint64_t lastPing = Util::bootSecs();
uint64_t lastSecs = 0;
while (config->is_active && nProxy.userClient.isAlive() && parsePacket()){ while (config->is_active && nProxy.userClient.isAlive() && parsePacket()){
handleUDP(); handleUDP();
// keep going // keep going
nProxy.userClient.keepAlive(); nProxy.userClient.keepAlive();
if (Util::bootSecs() - lastPing > 30){ uint64_t currSecs = Util::bootSecs();
if (currSecs - lastPing > 30){
sendCommand("GET_PARAMETER", url.getUrl(), ""); sendCommand("GET_PARAMETER", url.getUrl(), "");
lastPing = Util::bootSecs(); lastPing = Util::bootSecs();
} }
if (lastSecs != currSecs){
if (!statsPage.getData()){
statsPage = IPC::sharedClient(SHM_STATISTICS, STAT_EX_SIZE, true);
} }
if (statsPage.getData()){
if (!statsPage.isAlive()){
config->is_active = false;
statsPage.finish();
return "received shutdown request from controller";
}
uint64_t now = Util::epoch();
IPC::statExchange tmpEx(statsPage.getData());
tmpEx.now(now);
tmpEx.crc(getpid());
tmpEx.streamName(streamName);
tmpEx.connector("INPUT");
tmpEx.up(tcpCon.dataUp());
tmpEx.down(tcpCon.dataDown());
tmpEx.time(now - startTime);
tmpEx.lastSecond(0);
statsPage.keepAlive();
}
}
}
statsPage.finish();
if (!tcpCon){return "TCP connection closed";} if (!tcpCon){return "TCP connection closed";}
if (!config->is_active){return "received deactivate signal";} if (!config->is_active){return "received deactivate signal";}
if (!nProxy.userClient.isAlive()){return "buffer shutdown";} if (!nProxy.userClient.isAlive()){return "buffer shutdown";}