Check to lock before calling context invoke sync function

Author: hyunuktak

src/platform/Tizen/DnssdImpl.cpp

@@ -276,42 +276,19 @@ void GetTextEntries(unsigned short txtLen, uint8_t * txtRecord, std::vector<chip
     }
 }
 
-static void HandleResolveTask(intptr_t context)
+gboolean OnResolveFinalize(gpointer userData)
 {
     ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
-    auto rCtx = reinterpret_cast<chip::Dnssd::ResolveContext *>(context);
-    if (!rCtx)
-    {
-        ChipLogError(DeviceLayer, "Null context in HandleResolveTask");
-        return;
-    }
+    auto rCtx = reinterpret_cast<chip::Dnssd::ResolveContext *>(userData);
 
     {
+        // Lock the stack mutex when calling the callback function, so that the callback
+        // function could safely perform message exchange (e.g. PASE session pairing).
         chip::DeviceLayer::StackLock lock;
         rCtx->Finalize(CHIP_NO_ERROR);
     }
 
     rCtx->mInstance->RemoveContext(rCtx);
-}
-
-gboolean OnResolveFinalize(gpointer userData)
-{
-    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
-    auto rCtx = reinterpret_cast<chip::Dnssd::ResolveContext *>(userData);
-    if (!rCtx)
-    {
-        ChipLogError(DeviceLayer, "Null context in OnResolveFinalize");
-        return G_SOURCE_REMOVE;
-    }
-
-    CHIP_ERROR err = chip::DeviceLayer::PlatformMgr().ScheduleWork(HandleResolveTask, reinterpret_cast<intptr_t>(rCtx));
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to schedule resolve task: %s", err.AsString());
-        rCtx->mInstance->RemoveContext(rCtx);
-        return G_SOURCE_REMOVE;
-    }
-
     return G_SOURCE_REMOVE;
 }
 

src/platform/Tizen/PlatformManagerImpl.cpp

@@ -162,8 +162,19 @@ void PlatformManagerImpl::_GLibMatterContextInvokeSync(LambdaBridge && bridge)
         },
         &invokeData, nullptr);
 
+    bool isChipStackLocked = PlatformMgr().IsChipStackLockedByCurrentThread() &&
+        (mState.load(std::memory_order_relaxed) == State::kRunning);
+    if (isChipStackLocked)
+    {
+        PlatformMgr().UnlockChipStack();
+    }
+
     std::unique_lock<std::mutex> lock(invokeData.mDoneMutex);
     invokeData.mDoneCond.wait(lock, [&invokeData]() { return invokeData.mDone; });
+    if (isChipStackLocked)
+    {
+        PlatformMgr().LockChipStack();
+    }
 }
 
 } // namespace DeviceLayer

src/platform/Tizen/PlatformManagerImpl.h

@@ -88,10 +88,6 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     CHIP_ERROR _InitChipStack();
     void _Shutdown();
 
-#if CHIP_STACK_LOCK_TRACKING_ENABLED
-    bool _IsChipStackLockedByCurrentThread() const { return true; };
-#endif
-
     // ===== Members for internal use by the following friends.
 
     friend PlatformManager & PlatformMgr();