Merge remote-tracking branch 'origin/main'

# Conflicts:
#	common/executor/test/CMakeLists.txt

Author: Coldwings

common/executor/executor.cpp

@@ -19,6 +19,7 @@ class Executor::ExecutorImpl {
     using CBList =
         common::RingChannel<LockfreeMPMCRingQueue<Delegate<void>, 32UL * 1024>>;
     std::unique_ptr<std::thread> th;
+    std::atomic<bool> running{false};
     photon::thread *pth = nullptr;
     CBList queue;
     photon::ThreadPoolBase *pool;
@@ -34,10 +35,18 @@ class Executor::ExecutorImpl {
 
     ~ExecutorImpl() {
         queue.send({});
-        if (th)
-            th->join();
-        else
+        if (th) {
+            if (std::this_thread::get_id() == th->get_id()) {
+                // Self-destruction: called from within the worker thread.
+                th->detach();
+                while (running) photon::thread_yield();
+            } else {
+                th->join();
+            }
+        } else {
             while (pool) photon::thread_yield();
+        }
+
     }
 
     struct CallArg {
@@ -68,6 +77,8 @@ class Executor::ExecutorImpl {
     }
 
     void do_loop() {
+        running = true;
+        DEFER(running = false);
         pth = photon::CURRENT;
         pool = photon::new_thread_pool(32);
         LOG_INFO("worker start");

common/executor/test/CMakeLists.txt

@@ -15,3 +15,4 @@ photon_add_test(test-executor-async test_async.cpp LIBS ${GOOGLETEST_GTEST_MAIN_
 photon_add_test(test-executor-export_as_executor test_export_as_executor.cpp LIBS ${GOOGLETEST_GTEST_MAIN_LIBRARIES})
 photon_add_test(test-executor-std test_std.cpp LIBS ${GOOGLETEST_GTEST_MAIN_LIBRARIES})
 photon_add_test(test-executor-burst-drain test_burst_drain.cpp LIBS ${GOOGLETEST_GTEST_MAIN_LIBRARIES})
+photon_add_test(test-executor-self-join test_self_join.cpp LIBS ${GOOGLETEST_GTEST_MAIN_LIBRARIES})

common/executor/test/test_self_join.cpp

@@ -0,0 +1,49 @@
+/*
+Copyright 2022 The Photon Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Verify ~ExecutorImpl won't self-join (EDEADLK → terminate) when
+// destroyed from its own worker thread. Related: #967, #969.
+
+#include <photon/common/executor/executor.h>
+#include <photon/common/alog.h>
+#include <photon/photon.h>
+#include "../../../test/gtest.h"
+
+#include <memory>
+#include <atomic>
+#include <future>
+
+using namespace photon;
+
+// Task releases the last shared_ptr ref on the worker thread,
+// triggering ~ExecutorImpl from within → must detach, not join.
+TEST(executor, destroy_from_worker_thread) {
+    std::promise<void> done;
+    auto fut = done.get_future();
+
+    {
+        auto exec = std::make_shared<Executor>(
+            photon::INIT_EVENT_DEFAULT, photon::INIT_IO_NONE);
+
+        exec->async_perform(new auto([&exec, &done] {
+            exec.reset();       // ~Executor on worker thread
+            done.set_value();   // reachable only if no crash
+        }));
+    }
+
+    fut.wait();
+    LOG_INFO("executor destroyed from worker thread without crash");
+}