Changeset 3207 in ntrip for trunk

Timestamp:

Mar 30, 2011, 7:02:18 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncrtnetdecoder.cpp (modified) (1 diff)
• bncuploadcaster.cpp (modified) (3 diffs)
• bncuploadcaster.h (modified) (2 diffs)

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -72 +72 @@
 bncRtnetDecoder::~bncRtnetDecoder() {
   for (int ic = 0; ic < _casters.size(); ic++) {
-    delete _casters[ic];
+    _casters[ic]->deleteSafely();
   }
 }

trunk/BNC/upload/bncuploadcaster.cpp

@@ -48 +48 @@
   _outSocket  = 0;
   _sOpenTrial = 0;
+
+  _isToBeDeleted = false;
 
   // Raw Output
@@ -186 +188 @@
 }
 
+// Safe Desctructor
+////////////////////////////////////////////////////////////////////////////
+void bncUploadCaster::deleteSafely() {
+  QMutexLocker locker(&_mutex);
+  _isToBeDeleted = true;
+}
+
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
@@ -337 +346 @@
 
   QMutexLocker locker(&_mutex);
+
+  // Safely stop and delete
+  // ----------------------
+  if (_isToBeDeleted) {
+    QThread::quit();
+    deleteLater();
+    return;
+  }
 
   // Prepare list of lines with satellite positions in SP3-like format

trunk/BNC/upload/bncuploadcaster.h

@@ -20 +20 @@
                   const QString& rnxFileName,
                   const QString& outFileName);
+ protected:
   virtual ~bncUploadCaster();
+ public:
+  void deleteSafely();
   virtual void run();
   void decodeRtnetStream(char* buffer, int bufLen,
@@ -40 +43 @@
 
   QMap<QString, t_eph*>* _ephMap;
+  bool                   _isToBeDeleted;
   QMutex                 _mutex;  
   QString                _rtnetStreamBuffer;