Changeset 14 in chevmsgr for trunk/msgclnt.cpp

Timestamp:

08/30/15 21:31:39 (9 years ago)

Author:

cheese

Message:

테스트 코드 추가
UI 모양 작업
채팅되는 상태까지 확인

File:

• trunk/msgclnt.cpp (modified) (11 diffs)

trunk/msgclnt.cpp

@@ -6 +6 @@
 
 #include <stdlib.h>
+
+#include "cf/codec.h"
 
 // --------------------------------------------------------------
@@ -21 +23 @@
 } SCallbackWorkerArg;
 
-static int messageQworekr(void * arg)
+static int messageQworker(void * arg)
 {
     SMessageQWorkerArg * inst = (SMessageQWorkerArg *)arg;
 
     Protocol::Message message;
-    cf::bin raw;
+    cf::size_t size;
 
     while (true)
@@ -32 +34 @@
         try
         {
-            raw = inst->socket->receive();
+            size = 0;
+
+            cf::bin raw = inst->socket->receive();
+            size = raw.size();
+
             message.parse(raw.toString());
         }
@@ -40 +46 @@
 
             // closed
-            if (raw.size() == 0)
+            if (size == 0)
+            {
+                // dummy logout
+                message.parse(Protocol::Request().logout());
+                inst->messageQ->push(message);
                 break;
+            }
         }
 
@@ -52 +63 @@
 }
 
-static inline SConversation toCnversation(const Protocol::Message & message)
+static inline SConversation toConversation(const Protocol::Message & message)
 {
     SConversation c;
+    std::string chat = message.get<std::string>(ProtocolType::MESSAGE);
+
+    if (chat.length() > 0)
+        c.message = cf::codec::hex::getInstance()->decode(chat).toString();
 
     c.sessid = message.get<std::string>(ProtocolType::SESSION_ID);
-    c.message = message.get<std::string>(ProtocolType::MESSAGE);
     c.sensitive = message.get<int>(ProtocolType::SENSITIVE);
-    c.isError = message.get<bool>(ProtocolType::RESULT);
 
     c.from = message.get<std::string>(ProtocolType::FROM);
@@ -84 +97 @@
     while (true)
     {
-        message = inst->messageQ->pop(ProtocolType::CHAT, false);
+        message = inst->messageQ->pop(ProtocolType::LISTEN, false);
         if (message.type() != ProtocolType::NONE)
-            inst->callback.onChat(toCnversation(message));
+            inst->callback.onListen(toConversation(message));
 
         message = inst->messageQ->pop(ProtocolType::OPEN_SESSION, false);
         if (message.type() != ProtocolType::NONE)
             inst->callback.onOpenSession(toOpenSession(message));
+
+        message = inst->messageQ->pop(ProtocolType::LOGOUT, false);
+        if (message.type() != ProtocolType::NONE)
+            break;
     }
 
@@ -109 +126 @@
 Protocol::Message MessageQ::pop(const std::string & requestType, bool isWait)
 {
-    while (isWait)
-    {
-        SYNCHRONIZED(mutex)
-        {
-            Protocol::Message message = messageQ.front();
-
-            if (message.type() == requestType)
-            {
-                messageQ.erase(messageQ.begin());
-
-                return message;
-            }
-        }
-    }
+    do
+    {
+        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;
+        }
+        mutex.unlock();
+    } while (isWait);
 
     return Protocol::Message(); // return dummy NONE
@@ -130 +152 @@
 
 chev::chev()
-    : listener(messageQworekr),
+    : listener(messageQworker),
       caller(callbackWorker)
 {
@@ -138 +160 @@
 {
     socket.close();
+    listener.join();
+    caller.join();
 }
 
@@ -254 +278 @@
 }
 
-std::string chev::getSessionID(std::vector<std::string> & idList)
-{
-    try
-    {
-        idList.insert(idList.begin(), request.getUserID());
-
-        if (idList.size() == 2)
-            std::sort(idList.begin(), idList.end());
-
-        std::string concat = joinStrings(idList);
+std::string chev::getSessionID(const std::vector<std::string> & idList)
+{
+    try
+    {
+        std::vector<std::string> toList = idList;
+        toList.insert(toList.begin(), request.getUserID());
+
+        std::string concat = joinStrings(toList);
 
         if (sessionMap.find(concat) == sessionMap.end())
         {
-            socket.send(request.openSession(concat));
-
-            Protocol::Message message = messageQ.pop(ProtocolType::SESSION_ID);
-
-            if (!message.get<bool>(ProtocolType::RESULT))
-                THROW_EXCEPTION("failed to open session id");
+            socket.send(request.openSession(toList));
+
+            Protocol::Message message = messageQ.pop(ProtocolType::OPEN_SESSION);
 
             sessionMap[concat] = message.get<std::string>(ProtocolType::SESSION_ID);
@@ -291 +310 @@
     try
     {
-        const SConversation & c = conversation;
-
-        socket.send(request.chat(c.sessid, c.message, c.sensitive));
-
-        return messageQ.pop(ProtocolType::CHAT).get<bool>(ProtocolType::RESULT);
+        SConversation c = conversation;
+
+        if (c.message.length() > 0)
+            c.message = cf::codec::hex::getInstance()->encode(c.message);
+
+        socket.send(request.tell(c.sessid, c.message, c.sensitive));
+
+        return messageQ.pop(ProtocolType::TELL).get<bool>(ProtocolType::RESULT);
     }
     catch (cf::exception & e)