mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-28 15:08:51 +00:00
Code Issues Releases Wiki Activity

Terminate run when testing TTFF

Browse Source
This commit is contained in:
Carles Fernandez 2016-10-01 18:43:58 +02:00
parent c9ef673afa
commit b80eba91c8
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/receiver/control_thread.cc
View File

@ -529,9 +529,10 @@ void ControlThread::sysv_queue_listener()
int msqid; int msqid;
key_t key = 1102; key_t key = 1102;
// wait for the queue to be created // wait for the queue to be created
while((msqid = msgget(key, 0644)) == -1){}
while(read_queue) while(read_queue)
{ {
while((msqid = msgget(key, 0644)) == -1){}
if (msgrcv(msqid, &msg, msgrcv_size, 1, 0) != -1) if (msgrcv(msqid, &msg, msgrcv_size, 1, 0) != -1)
{ {

15
src/tests/system-tests/ttff_gps_l1.cc
View File

@ -72,7 +72,7 @@ void receive_msg()
{ {
ttff_msgbuf msg; ttff_msgbuf msg;
ttff_msgbuf msg_stop; ttff_msgbuf msg_stop;
msg_stop.mtype = 2; msg_stop.mtype = 1;
msg_stop.ttff = 200; msg_stop.ttff = 200;
double ttff_msg = 0.0; double ttff_msg = 0.0;
int msgrcv_size = sizeof(msg.ttff); int msgrcv_size = sizeof(msg.ttff);
@ -303,22 +303,15 @@ int main(int argc, char **argv)
// Create Sys V message queue to read TFFF measurements // Create Sys V message queue to read TFFF measurements
key_t sysv_msg_key; key_t sysv_msg_key;
key_t sysv_stop_key;
int sysv_msqid; int sysv_msqid;
int sysv_msqid_stop;
sysv_msg_key = 1101; sysv_msg_key = 1101;
sysv_stop_key = 1102;
int msgflg = IPC_CREAT | 0666; int msgflg = IPC_CREAT | 0666;
if ((sysv_msqid = msgget(sysv_msg_key, msgflg )) == -1) if ((sysv_msqid = msgget(sysv_msg_key, msgflg )) == -1)
{ {
std::cout<<"GNSS-SDR can not create message queues!" << std::endl; std::cout<<"GNSS-SDR can not create message queues!" << std::endl;
throw new std::exception(); throw new std::exception();
} }
if ((sysv_msqid_stop = msgget(sysv_stop_key, msgflg )) == -1)
{
std::cout<<"GNSS-SDR can not create message queues!" << std::endl;
throw new std::exception();
}
// Start queue thread // Start queue thread
std::thread receive_msg_thread(receive_msg); std::thread receive_msg_thread(receive_msg);
@ -335,16 +328,12 @@ int main(int argc, char **argv)
// Terminate the queue thread // Terminate the queue thread
ttff_msgbuf msg; ttff_msgbuf msg;
//ttff_msgbuf msg_stop;
msg.mtype = 1; msg.mtype = 1;
msg.ttff = -1; msg.ttff = -1;
//msg_stop.mtype = 1;
//msg_stop.ttff = 200;
int msgsend_size; int msgsend_size;
msgsend_size = sizeof(msg.ttff); msgsend_size = sizeof(msg.ttff);
msgsnd(sysv_msqid, &msg, msgsend_size, IPC_NOWAIT); msgsnd(sysv_msqid, &msg, msgsend_size, IPC_NOWAIT);
receive_msg_thread.join(); receive_msg_thread.join();
//msgsnd(sysv_msqid_stop, &msg_stop, msgsend_size, IPC_NOWAIT);
google::ShutDownCommandLineFlags(); google::ShutDownCommandLineFlags();
return res; return res;
} }