Changeset 46:e57735492bf8 in xplra for src/plugin/src/xplra/ServerThread.cc

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed the shutdown sequence and removed some unnecessary printouts

File:

• src/plugin/src/xplra/ServerThread.cc (modified) (3 diffs)

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();
 }