Changeset 12 in chevmsgr for trunk/msgclnt.cpp

Timestamp:

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

Author:

cheese

Message:

add dialogs

File:

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

trunk/msgclnt.cpp

@@ -9 +9 @@
 // --------------------------------------------------------------
 
-typedef struct SWorkerArg
+typedef struct SMessageQWorkerArg
 {
     cf::network::tcp * socket;
     MessageQ * messageQ;
-} SWorkerArg;
-
-int worker(void * arg)
-{
-    SWorkerArg * inst = (SWorkerArg *) arg;
-
-    Protocol::Message parser;
+} SMessageQWorkerArg;
+
+typedef struct SCallbackWorkerArg
+{
+    MessageQ * messageQ;
+    SCallback callback;
+} SCallbackWorkerArg;
+
+static int messageQworekr(void * arg)
+{
+    SMessageQWorkerArg * inst = (SMessageQWorkerArg *)arg;
+
+    Protocol::Message message;
     cf::bin raw;
 
@@ -27 +33 @@
         {
             raw = inst->socket->receive();
-            parser.parse(raw.toString());
+            message.parse(raw.toString());
         }
         catch (cf::exception & e)
@@ -38 +44 @@
         }
 
-        inst->messageQ->push(parser);
+        inst->messageQ->push(message);
     }
 
@@ -46 +52 @@
 }
 
+static inline SConversation toCnversation(const Protocol::Message & message)
+{
+    SConversation c;
+
+    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);
+
+    return c;
+}
+
+static inline SOpenSession toOpenSession(const Protocol::Message & message)
+{
+    SOpenSession o;
+
+    o.sessid = message.get<std::string>(ProtocolType::SESSION_ID);
+    o.idList = message.getList<std::string>(ProtocolType::ID_LIST);
+
+    return o;
+}
+
+static int callbackWorker(void * arg)
+{
+    SCallbackWorkerArg * inst = (SCallbackWorkerArg *)arg;
+
+    Protocol::Message message;
+
+    while (true)
+    {
+        message = inst->messageQ->pop(ProtocolType::CHAT, false);
+        if (message.type() != ProtocolType::NONE)
+            inst->callback.onChat(toCnversation(message));
+
+        message = inst->messageQ->pop(ProtocolType::OPEN_SESSION, false);
+        if (message.type() != ProtocolType::NONE)
+            inst->callback.onOpenSession(toOpenSession(message));
+    }
+
+    free(inst);
+
+    return 0;
+}
+
 // --------------------------------------------------------------
 
-void MessageQ::push(const Protocol::Message & parser)
+void MessageQ::push(const Protocol::Message & message)
 {
     mutex.lock();
-    messageQ.push_back(parser);
+    messageQ.push_back(message);
     mutex.unlock();
 }
 
-Protocol::Message MessageQ::pop(const std::string & requestType)
-{
-    while (true)
+Protocol::Message MessageQ::pop(const std::string & requestType, bool isWait)
+{
+    while (isWait)
     {
         SYNCHRONIZED(mutex)
         {
-            Protocol::Message parser = messageQ.front();
-
-            if (parser.type() == requestType)
+            Protocol::Message message = messageQ.front();
+
+            if (message.type() == requestType)
             {
                 messageQ.erase(messageQ.begin());
 
-                return parser;
+                return message;
             }
         }
     }
+
+    return Protocol::Message(); // return dummy NONE
 }
 
@@ -76 +130 @@
 
 chev::chev()
-    : listener(worker)
+    : listener(messageQworekr),
+      caller(callbackWorker)
 {
 }
@@ -96 +151 @@
         socket.connect(host, port);
 
-        SWorkerArg * arg = (SWorkerArg *)malloc(sizeof(SWorkerArg));
+        SMessageQWorkerArg * arg = (SMessageQWorkerArg *)malloc(sizeof(SMessageQWorkerArg));
         if (!arg)
             return false;
@@ -203 +258 @@
     try
     {
+        idList.insert(idList.begin(), request.getUserID());
+
         if (idList.size() == 2)
             std::sort(idList.begin(), idList.end());
 
-        std::string concat = idList[0];
-
-        for (int iter = 1; iter < idList.size(); iter++)
-            concat += DELIMITER + idList[iter];
+        std::string concat = joinStrings(idList);
 
         if (sessionMap.find(concat) == sessionMap.end())
@@ -251 +305 @@
 }
 
-SConversation chev::listen()
-{
-    SConversation c;
-    Protocol::Message message = messageQ.pop(ProtocolType::CHAT);
-
-    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);
-
-    return c;
-}
+bool chev::listen(const SCallback & callback)
+{
+    SCallbackWorkerArg * arg = (SCallbackWorkerArg *)malloc(sizeof(SCallbackWorkerArg));
+    if (!arg)
+        return false;
+
+    arg->messageQ = &messageQ;
+    arg->callback = callback;
+
+    caller.start(arg);
+
+    return true;
+}