diff options
| author | Comment <tim@gray.(none)> | 2012-12-05 22:10:04 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2012-12-05 22:10:04 +0000 |
| commit | 8fe8572729f186269b02ac2bb149fe9a25671cae (patch) | |
| tree | fb30ccab57f4c3ed50c6fc76fd28db4c63255cc0 /vfg/src/Asterisk.cpp | |
| parent | 7e99d4291172f4dadb59b81cf525817dd8a210e5 (diff) | |
asterisk with thread
Diffstat (limited to 'vfg/src/Asterisk.cpp')
| -rwxr-xr-x | vfg/src/Asterisk.cpp | 86 |
1 files changed, 52 insertions, 34 deletions
diff --git a/vfg/src/Asterisk.cpp b/vfg/src/Asterisk.cpp index 12b3d92..b78678e 100755 --- a/vfg/src/Asterisk.cpp +++ b/vfg/src/Asterisk.cpp @@ -14,17 +14,58 @@ std::vector<std::string> &split(const std::string &s, char delim, std::vector<st }
-Asterisk::Asterisk()
+Asterisk::~Asterisk()
{
+ stopThread();
+ pclose(file);
+}
+
+/*
+Use a thread to track status with a blocking popen()
+
+
+gameQ has 1 calls (max unlimited) in 'rrmemory' strategy (8s holdtime, 50s talktime), W:0, C:38, A:26, SL:36.8% within 0s
+ Members:
+ Game AGI (Local/9999@default) with penalty 1 (In use) has taken 31 calls (last was 5333 secs ago)
+ Callers:
+ 1. SIP/sip_proxy-00000045 (wait: 0:06, prio: 0)
+*/
+
+
+void Asterisk::threadedFunction(){
+ while( isThreadRunning() != 0 ){
+ FILE *f = popen("ssh 80.93.22.22 'sudo /usr/sbin/asterisk -rx \"queue show gameQ\"'", "re");
+ int fn=fileno(f);
+ char buf[1000];
+ ssize_t r = read(fn, buf, 1000);
+ pclose(f);
+ string msg=string(buf);
+ //received data is always a command ACKNOWLEDGEMENT
+ if (msg.compare(0,5,"gameQ")==0) {
+ vector<std::string> lines;
+ split(msg,'\n',lines);
+ queued=0;
+ for (int i=4;i<lines.size();i++) {
+ if (lines[i].compare(0,6," ")==0&&lines[i].compare(7,1,".")==0) queued++;
+ }
+ }
+ else {
+ printf("status err: %s\n",buf);
+ }
+
+ ofSleepMillis(statusPollMillis);
+ }
}
-void Asterisk::setup(string passcode){
+void Asterisk::setup(string passcode,int millis){
udpConnection.Create();
udpConnection.Bind(5000);
udpConnection.SetNonBlocking(true);
cmd("ssh 80.93.22.22 'sudo /usr/sbin/asterisk -rx \"database put GAME passcode "+passcode+"\"'");
state=WAITING; //for acknowledge
isPlaying=false;
+ statusPollMillis=millis;
+ if (statusPollMillis>0) startThread(true, false); // blocking, verbose
}
void Asterisk::startGame(){
if (!isPlaying&&queued) {
@@ -45,57 +86,39 @@ void Asterisk::endGame(string score){ }
}
void Asterisk::cmd(string s) {
+ //non blocking command for anync messages
file = popen(s.c_str(), "re");
filenum=fileno(file);
- fcntl(filenum, F_SETFL, O_NONBLOCK);
-}
-
-/*
-gameQ has 1 calls (max unlimited) in 'rrmemory' strategy (8s holdtime, 50s talktime), W:0, C:38, A:26, SL:36.8% within 0s
- Members:
- Game AGI (Local/9999@default) with penalty 1 (In use) has taken 31 calls (last was 5333 secs ago)
- Callers:
- 1. SIP/sip_proxy-00000045 (wait: 0:06, prio: 0)
-*/
-
-void Asterisk::requestStatus(){
- cmd("ssh 80.93.22.22 'sudo /usr/sbin/asterisk -rx \"queue show gameQ\"'");
- state=WAITING;
+ fcntl(filenum, F_SETFL, O_NONBLOCK);
}
int Asterisk::update(){
//capture stdin response from popen
- if (state==WAITING||state==STARTING||state==IDLE) {
- char buf[1000];
+ if (state==WAITING||state==STARTING) {
+ char buf[100];
ssize_t r = read(filenum, buf, 1000);
//if (r == -1 && errno == EAGAIN)
//no data yet
- //else
+ //else
if (r > 0) {
pclose(file);
string msg=string(buf);
state=IDLE;
//received data is always a command ACKNOWLEDGEMENT
+ //can never issue a new one until last one returns?
if (msg.compare(0,8,"Changing")==0) {
printf("player dequeued\n");
+ state==PLAYING;
isPlaying=true;
}
- else if (msg.compare(0,5,"gameQ")==0) {
- vector<std::string> lines;
- split(msg,'\n',lines);
- queued=0;
- for (int i=4;i<lines.size();i++) {
- if (lines[i].compare(0,6," ")==0&&lines[i].compare(7,1,".")==0) queued++;
- }
- }
else {
printf("stdin says: %s\n",buf);
-
+
}
}
}
-
+
//check udp messages, return new keypresses
char udpMessage[10000];
udpConnection.Receive(udpMessage,10000);
@@ -119,8 +142,3 @@ int Asterisk::update(){ else return 0;
}
-Asterisk::~Asterisk()
-{
- pclose(file);
- //dtor
-}
|