Changeset 3559 in ntrip

Timestamp:

Dec 24, 2011, 10:15:13 AM (12 years ago)

Author:

weber

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (4 diffs)
• bncgetthread.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -346 +346 @@
 ////////////////////////////////////////////////////////////////////////////
 GPSDecoder* bncGetThread::decoder() {
+  QMutexLocker locker(&_mutexDecoder);
+
   if (_decoders.contains(_staID) || initDecoder() == success) {
     return _decoders[_staID];
@@ -755 +757 @@
 //////////////////////////////////////////////////////////////////////////////
 void bncGetThread::slotNewEphGPS(gpsephemeris gpseph) {
+  QMutexLocker locker(&_mutexSlot);
 
   if (!decoder()) {
@@ -764 +767 @@
 
   if ( decoder2 ) {
-    QMutexLocker locker(&_mutex);
-  
     string storedPRN;
     vector<int> IODs;
@@ -783 +784 @@
 
   if ( decoder3 ) {
-    QMutexLocker locker(&_mutex);
-  
     if ( decoder3->storeEph(gpseph) ) {
 #ifdef DEBUG_RTCM3

trunk/BNC/bncgetthread.h

@@ -123 +123 @@
    QFile*                     _serialOutFile;
    t_serialNMEA               _serialNMEA;
-   QMutex                     _mutex;
+   QMutex                     _mutexSlot;
+   QMutex                     _mutexDecoder;
    bncPPPclient*              _PPPclient;
    bool                       _rawOutput;