waitWhile-Methoden f?r Connection hinzugef?gt

1 files changed, 26 insertions, 11 deletions

diff --git a/src/madc.cpp b/src/madc.cpp
index a902144..8499232 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -31,17 +31,25 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include <boost/thread/condition_variable.hpp>
+
+
 using namespace Mad;
 
 
 static bool commandRunning = false;
+static boost::mutex commandMutex;
+static boost::condition_variable commandNotify;
 
 static void usage(const std::string &cmd) {
   std::cerr << "Usage: " << cmd << " address" << std::endl;
 }
 
 static void commandFinished() {
+  boost::lock_guard<boost::mutex> lock(commandMutex);
   commandRunning = false;
+
+  commandNotify.notify_one();
 }
 
 int main(int argc, char *argv[]) {
@@ -62,15 +70,17 @@ int main(int argc, char *argv[]) {
 
     std::cerr << "Connecting to " << argv[1] << "..." << std::flush;
 
-    while(connection->isConnecting())
-      usleep(100000);
+    connection->waitWhileConnecting();
 
     Common::RequestManager::get()->registerConnection(connection);
 
-    commandRunning = true;
-    Common::RequestManager::get()->sendRequest<Common::Requests::IdentifyRequest>(connection, boost::bind(&commandFinished));
-    while(commandRunning) {
-      usleep(100000);
+    {
+      boost::unique_lock<boost::mutex> lock(commandMutex);
+      commandRunning = true;
+      Common::RequestManager::get()->sendRequest<Common::Requests::IdentifyRequest>(connection, boost::bind(&commandFinished));
+      while(commandRunning) {
+        commandNotify.wait(lock);
+      }
     }
 
     std::cerr << " connected." << std::endl;
@@ -86,23 +96,28 @@ int main(int argc, char *argv[]) {
     Client::CommandParser::get()->setConnection(connection);
     Client::CommandManager::get()->signalFinished().connect(&commandFinished);
 
-    while(connection->isConnected()) {
+    while(connection->isConnected() && !Client::CommandManager::get()->willDisconnect()) {
       char *cmd = readline("mad> ");
 
+      boost::unique_lock<boost::mutex> lock(commandMutex);
+
       if(!cmd) {
-        commandRunning = true;
         Client::CommandParser::get()->requestDisconnect();
       }
       else if(*cmd) {
-        commandRunning = true;
         Client::CommandParser::get()->parse(cmd);
         add_history(cmd);
       }
+      else continue;
 
-      while(Client::CommandManager::get()->requestsActive())
-        usleep(100000);
+      commandRunning = Client::CommandManager::get()->requestsActive();
+
+      while(commandRunning)
+        commandNotify.wait(lock);
     }
 
+    connection->waitWhileConnected();
+
     Common::RequestManager::get()->unregisterConnection(connection);
   }
   catch(Net::Exception &e) {