Changeset 5758 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 3, 2014, 1:44:02 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (4 diffs)
• pppClient.h (modified) (2 diffs)
• pppThread.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -40 +40 @@
  * -----------------------------------------------------------------------*/
 
+#include <QThreadStorage>
 
 #include <iostream>
@@ -61 +62 @@
 using namespace std;
 
-// Global Variable
-//////////////////////////////////////////////////////////////////////////////
-t_pppClient* PPP_CLIENT = 0;
+// Global variable holding thread-specific pointers
+//////////////////////////////////////////////////////////////////////////////
+QThreadStorage<t_pppClient*> CLIENTS;
+
+// Static function returning thread-specific pointer
+//////////////////////////////////////////////////////////////////////////////
+t_pppClient* t_pppClient::instance() {
+  return CLIENTS.localData();
+}
 
 // Constructor
@@ -76 +83 @@
   _staRover = new t_station();
   _filter   = new t_filter();
+  CLIENTS.setLocalData(this);
 }
 
@@ -81 +89 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppClient::~t_pppClient() {
+  cout << "~t_pppClient" << endl;
   delete _log;
   delete _opt;

trunk/BNC/src/PPP/pppClient.h

@@ -40 +40 @@
   t_options*          _opt; 
 
+  static t_pppClient* instance();
+
  private:
   void initOutput(t_output* output);
@@ -67 +69 @@
 }; // namespace BNC
 
-/// Pointer to the main object
-extern BNC::t_pppClient* PPP_CLIENT;
+// Pointer to the main object (thread-specific)
+#define PPP_CLIENT (BNC::t_pppClient::instance())
 
-/// Log stream abbreviation
+// Log stream abbreviation
 #define LOG (*PPP_CLIENT->_log)
 
-/// Options abbreviation
+// Options abbreviation
 #define OPT (PPP_CLIENT->_opt)
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -110 +110 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppRun::~t_pppRun() {
-  delete _pppClient;
+  ////  delete _pppClient;
   cout << "~t_pppRun" << endl;
 }