Changeset 22 in chevmsgr

Timestamp:

11/28/15 20:57:41 (8 years ago)

Author:

cheese

Message:

client stability

Location:

trunk

Files:

• msgclnt.cpp (modified) (2 diffs)
• msvc14/testClient/test.cpp (modified) (1 diff)

trunk/msgclnt.cpp

@@ -152 +152 @@
 Protocol::Message MessageQ::pop(const std::string & requestType, bool isWait)
 {
+    Protocol::Message msg;
+
     do
     {
+        if (messageQ.size() == 0)
+            continue;
+
         mutex.lock();
-        if (messageQ.size() == 0)
-        {
-            mutex.unlock();
-            continue;
-        }
-
-        Protocol::Message message = messageQ.front();
-
-        if (message.type() == requestType)
-        {
-            messageQ.erase(messageQ.begin());
-            mutex.unlock();
-            return message;
+        if (messageQ.size() > 0)
+        {
+            if (messageQ.front().type() == requestType)
+            {
+                msg = messageQ.front();
+                messageQ.pop_front();
+                isWait = false;
+            }
         }
         mutex.unlock();
     } while (isWait);
 
-    return Protocol::Message(); // return dummy NONE
+    return msg;
 }
 
@@ -199 +199 @@
 {
     secureSocket.close();
-    listener.join();
-    caller.join();
 }
 

trunk/msvc14/testClient/test.cpp

@@ -77 +77 @@
     T(c.listen(cb));
 
-    sms = "633174";// CIN(sms);
+    sms = "545454";// CIN(sms);
     if (mode == "join")
     {