andrius
/
s20
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add mutex to message sending function.

This commit is contained in:
Andrius Štikonas 2015-03-08 11:29:33 +00:00
parent 8a92e808f3
commit dfd9399666
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
socket.cpp
View File

@ -19,6 +19,8 @@
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <QMutex>
#include <QThread> #include <QThread>
#include <QUdpSocket> #include <QUdpSocket>
@ -74,6 +76,10 @@ void Socket::sendDatagram ( Datagram d )
void Socket::run() void Socket::run()
{ {
QMutex mutex;
if (!mutex.tryLock())
return;
unsigned short retryCount = 0; unsigned short retryCount = 0;
QByteArray currentDatagram, previousDatagram = 0, recordLength; QByteArray currentDatagram, previousDatagram = 0, recordLength;
while ( commands.size() > 0 ) while ( commands.size() > 0 )
@ -85,7 +91,7 @@ void Socket::run()
{ {
std::cout << "Stop retrying: " << currentDatagram.toHex().toStdString() << std::endl; std::cout << "Stop retrying: " << currentDatagram.toHex().toStdString() << std::endl;
commands.dequeue(); commands.dequeue();
retryCount = 0; retryCount = 0;
} }
QDataStream stream(&recordLength, QIODevice::WriteOnly); QDataStream stream(&recordLength, QIODevice::WriteOnly);
stream.setByteOrder(QDataStream::BigEndian); stream.setByteOrder(QDataStream::BigEndian);
@ -93,9 +99,10 @@ void Socket::run()
stream << length; stream << length;
udpSocket->write ( magicKey + recordLength + currentDatagram ); udpSocket->write ( magicKey + recordLength + currentDatagram );
previousDatagram = currentDatagram; previousDatagram = currentDatagram;
QThread::msleep(100); QThread::msleep(100);
} }
mutex.unlock();
} }
void Socket::subscribe() void Socket::subscribe()
@ -202,7 +209,7 @@ bool Socket::parseReply ( QByteArray reply )
break; break;
case SocketData: case SocketData:
{ {
std::cout << reply.toHex().toStdString() << " " << datagram << std::endl; // for debugging purposes only // std::cout << reply.toHex().toStdString() << " " << datagram << std::endl; // for debugging purposes only
unsigned short int index = reply.indexOf ( rmac + twenties ); unsigned short int index = reply.indexOf ( rmac + twenties );
versionID = reply.mid ( index - 14, 2 ); versionID = reply.mid ( index - 14, 2 );
index += 12; // length of rmac + padding index += 12; // length of rmac + padding
@ -241,6 +248,7 @@ bool Socket::parseReply ( QByteArray reply )
break; break;
} }
case TimingData: case TimingData:
std::cout << reply.toHex().toStdString() << " " << datagram << std::endl; // for debugging purposes only
break; break;
case WriteSocketData: case WriteSocketData:
sendDatagram ( SocketData ); sendDatagram ( SocketData );