Semaphore wait keeps uninterrupted, while add wait_interruptible

Signed-off-by: Coldwings <coldwings@me.com>
Coldwings · Feb 28, 2024 · 799437b · 799437b
1 parent f4a2f7e
commit 799437b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/thread/test/test.cpp b/thread/test/test.cpp
@@ -1933,7 +1933,7 @@ TEST(interrupt, semaphore) {
         // any errno except 0 is able to stop waiting
         photon::thread_interrupt(th, reason);
     });
-    auto ret = sem.wait(1); // nobody
+    auto ret = sem.wait_interruptible(1); // nobody
     ERRNO err;
     EXPECT_EQ(-1, ret);
     EXPECT_EQ(reason, err.no);

diff --git a/thread/thread.cpp b/thread/thread.cpp
@@ -1672,7 +1672,7 @@ R"(
     {
         return cvar_do_wait((thread_list*)&q, m, timeout, spinlock_lock, spinlock_unlock);
     }
-    int semaphore::wait(uint64_t count, Timeout timeout)
+    int semaphore::wait_interruptible(uint64_t count, Timeout timeout)
     {
         if (count == 0) return 0;
         splock.lock();

diff --git a/thread/thread.h b/thread/thread.h
@@ -398,15 +398,14 @@ namespace photon
     {
     public:
         explicit semaphore(uint64_t count = 0) : m_count(count) { }
-        int wait(uint64_t count, Timeout timeout = {});
-        int wait_uninterruptible(uint64_t count, Timeout timeout = {}) {
+        int wait(uint64_t count, Timeout timeout = {}) {
             int ret = 0;
             do {
-                ret = wait(count, timeout);
-            } while (!timeout.expired() &&
-                     (ret == 0 || (ret < 0 && errno == ESHUTDOWN)));
+                ret = wait_interruptible(count, timeout);
+            } while (ret < 0 && (errno != ESHUTDOWN && errno != ETIMEDOUT));
             return ret;
         }
+        int wait_interruptible(uint64_t count, Timeout timeout = {});
         int signal(uint64_t count)
         {
             if (count == 0) return 0;