Merge "Assure associate callback is called in msgTask"

core/LocDualContext.cpp

@@ -74,6 +74,8 @@ const MsgTask* LocDualContext::getMsgTask(MsgTask::tAssociate tAssociate,
 {
     if (NULL == mMsgTask) {
         mMsgTask = new MsgTask(tAssociate, name);
+    } else if (tAssociate) {
+        mMsgTask->associate(tAssociate);
     }
     return mMsgTask;
 }

core/MsgTask.cpp

@@ -69,6 +69,21 @@ MsgTask::~MsgTask() {
     msg_q_unblock((void*)mQ);
 }
 
+void MsgTask::associate(tAssociate tAssociator) const {
+    struct LocAssociateMsg : public LocMsg {
+        tAssociate mAssociator;
+        inline LocAssociateMsg(tAssociate associator) :
+            LocMsg(), mAssociator(associator) {}
+        inline virtual void proc() const {
+            if (mAssociator) {
+                LOC_LOGD("MsgTask::associate");
+                mAssociator();
+            }
+        }
+    };
+    sendMsg(new LocAssociateMsg(tAssociator));
+}
+
 void MsgTask::createPThread(const char* threadName) {
     pthread_attr_t attr;
     pthread_attr_init(&attr);

core/MsgTask.h

@@ -52,6 +52,7 @@ public:
     MsgTask(tAssociate tAssociator, const char* threadName);
     ~MsgTask();
     void sendMsg(const LocMsg* msg) const;
+    void associate(tAssociate tAssociator) const;
 
 private:
     const void* mQ;