Changeset 46:e57735492bf8 in xplra

Timestamp:

02/16/13 09:16:54 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Fixed the shutdown sequence and removed some unnecessary printouts

Location:

src/plugin/src/xplra

Files:

• HotkeyHandler.cc (modified) (2 diffs)
• ListenThread.h (modified) (1 diff)
• MessageWindow.cc (modified) (1 diff)
• ServerThread.cc (modified) (3 diffs)
• plugin.cc (modified) (1 diff)

src/plugin/src/xplra/HotkeyHandler.cc

@@ -75 +75 @@
 {
     for(size_t i = 0; i<numHotkeys; ++i) {
-        Util::debug("handleKey: %04x\n", hotkeys[i]);
-
         if (hotkeys[i]==code) {
             pressed[i] = 1;
@@ -144 +142 @@
     if ( (flags&xplm_ControlFlag)!=0 ) code |= Protocol::HOTKEY_MODIFIER_CONTROL;
 
-    Util::debug("code=0x%04x\n", code);
-
     bool handled = false;
 

src/plugin/src/xplra/ListenThread.h

@@ -105 +105 @@
 
 inline ListenThread::ListenThread(Globals& globals) :
-    Thread(true),
     globals(globals),
     quitEvent(&waiter)

src/plugin/src/xplra/MessageWindow.cc

@@ -83 +83 @@
     int screenHeight = XPLMGetDatai(heightDataRef);
 
-    Util::debug("hu.varadiistvan.xplra.MessageWindow: screenWidth=%d, screenHeight=%d\n",
-                screenWidth, screenHeight);
+    // Util::debug("hu.varadiistvan.xplra.MessageWindow: screenWidth=%d, screenHeight=%d\n",
+    //             screenWidth, screenHeight);
 
     left = 50; right = screenWidth - left;

src/plugin/src/xplra/ServerThread.cc

@@ -69 +69 @@
     instancesMutex.lock();
     for(instances_t::iterator i = instances.begin(); i!=instances.end(); ++i) {
-        (*i)->quit();
-    }
+        ServerThread* thread = *i;
+        thread->quit();
+        thread->join();
+        delete thread;
+    }
+    instances.clear();
     instancesMutex.unlock();
 }
@@ -91 +95 @@
 ServerThread::ServerThread(ListenThread& listenThread,
                            RequestQueue& requestQueue, LocalAcceptor& acceptor) :
-    Thread(true),
     listenThread(listenThread),
     requestQueue(requestQueue),
@@ -122 +125 @@
         delete i->second;
     }
-
-    instancesMutex.lock();
-    instances.erase(this);
-    instancesMutex.unlock();
 }
 

src/plugin/src/xplra/plugin.cc

@@ -116 +116 @@
     if (listenThread!=0) {
         listenThread->quit();
+        listenThread->join();
+        delete listenThread;
         listenThread = 0;
     }