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

Added statistics handling to MistPlayer. Still needed: VoD statistics handling in controller.

Browse source
This commit is contained in:
Thulinma 2012-09-03 16:53:10 +02:00
parent 0c4d501950
commit 1438b9e94b
1 changed files with 63 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/player.cpp
View file

@ -12,6 +12,45 @@
#include <mist/config.h> #include <mist/config.h>
#include <mist/socket.h> #include <mist/socket.h>
/// Copy of stats from buffer_user.cpp
class Stats{
public:
unsigned int up;
unsigned int down;
std::string host;
std::string connector;
unsigned int conntime;
Stats(){
up = 0; down = 0; conntime = 0;
};
/// Reads a stats string and parses it to the internal representation.
Stats(std::string s){
Buffer::Stats::Stats(std::string s){
size_t f = s.find(' ');
if (f != std::string::npos){
host = s.substr(0, f);
s.erase(0, f+1);
}
f = s.find(' ');
if (f != std::string::npos){
connector = s.substr(0, f);
s.erase(0, f+1);
}
f = s.find(' ');
if (f != std::string::npos){
conntime = atoi(s.substr(0, f).c_str());
s.erase(0, f+1);
}
f = s.find(' ');
if (f != std::string::npos){
up = atoi(s.substr(0, f).c_str());
s.erase(0, f+1);
down = atoi(s.c_str());
}
};
};
/// Gets the current system time in milliseconds. /// Gets the current system time in milliseconds.
long long int getNowMS(){ long long int getNowMS(){
timeval t; timeval t;
@ -32,7 +71,9 @@ int main(int argc, char** argv){
JSON::Value pausemark; JSON::Value pausemark;
pausemark["datatype"] = "pause_marker"; pausemark["datatype"] = "pause_marker";
pausemark["time"] = (long long int)0; pausemark["time"] = (long long int)0;
Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
//send the header //send the header
{ {
in_out.Send("DTSC"); in_out.Send("DTSC");
@ -45,6 +86,7 @@ int main(int argc, char** argv){
JSON::Value last_pack; JSON::Value last_pack;
long long now, timeDiff = 0, lastTime = 0; long long now, timeDiff = 0, lastTime = 0;
Stats sts;
while (in_out.connected()){ while (in_out.connected()){
if (in_out.spool()){ if (in_out.spool()){
@ -60,11 +102,24 @@ int main(int argc, char** argv){
in_out.close();//pushing to VoD makes no sense in_out.close();//pushing to VoD makes no sense
} break; } break;
case 'S':{ //Stats case 'S':{ //Stats
#if DEBUG >= 4 if (!StatsSocket.connected()){
//std::cerr << "Received stats - ignoring (" << cmd << ")" << std::endl; StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
#endif }
/// \todo Parse stats command properly. if (StatsSocket.connected()){
/* Stats(cmd.substr(2)); */ sts = Stats(cmd.substr(2));
JSON::Value json_sts;
json_sts["vod"]["down"] = (long long int)sts.down;
json_sts["vod"]["up"] = (long long int)sts.up;
json_sts["vod"]["time"] = (long long int)sts.conntime;
json_sts["vod"]["host"] = sts.host;
json_sts["vod"]["connector"] = sts.connector;
json_sts["vod"]["filename"] = conf.getString("filename");
json_sts["vod"]["now"] = (long long int)time(0);
json_sts["vod"]["meta"] = meta;
StatsSocket.Send(json_sys.toString());
StatsSocket.Send("\n\n");
StatsSocket.flush();
}
} break; } break;
case 's':{ //second-seek case 's':{ //second-seek
#if DEBUG >= 4 #if DEBUG >= 4
@ -146,5 +201,7 @@ int main(int argc, char** argv){
} }
usleep(10000);//sleep 10ms usleep(10000);//sleep 10ms
} }
StatsSocket.close();
return 0; return 0;
} }