fix(event): template error
Some checks failed
android / build (push) Waiting to run
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Debug) (push) Waiting to run
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Release) (push) Waiting to run
linux-arm-gcc / linux-gcc-arm (Debug) (push) Waiting to run
linux-arm-gcc / linux-gcc-arm (Release) (push) Waiting to run
linux-arm-gcc / linux-gcc-armhf (Debug) (push) Waiting to run
linux-arm-gcc / linux-gcc-armhf (Release) (push) Waiting to run
linux-mips-gcc / linux-gcc-mipsel (Debug) (push) Waiting to run
linux-mips-gcc / linux-gcc-mipsel (Release) (push) Waiting to run
linux-mips64-gcc / linux-gcc-mips64el (Debug) (push) Waiting to run
linux-mips64-gcc / linux-gcc-mips64el (Release) (push) Waiting to run
linux-riscv64-gcc / linux-gcc-riscv64 (Debug) (push) Waiting to run
linux-riscv64-gcc / linux-gcc-riscv64 (Release) (push) Waiting to run
linux-x64-clang / linux-clang (Debug) (push) Waiting to run
linux-x64-clang / linux-clang (Release) (push) Waiting to run
linux-x64-gcc / linux-gcc (Debug) (push) Waiting to run
linux-x64-gcc / linux-gcc (Release) (push) Waiting to run
linux-x86-gcc / linux-gcc (Debug) (push) Waiting to run
linux-x86-gcc / linux-gcc (Release) (push) Waiting to run
android / build (pull_request) Failing after 29s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Debug) (pull_request) Failing after 6m45s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Release) (pull_request) Failing after 7m42s
linux-arm-gcc / linux-gcc-arm (Debug) (pull_request) Failing after 6m55s
linux-arm-gcc / linux-gcc-arm (Release) (pull_request) Failing after 7m47s
linux-arm-gcc / linux-gcc-armhf (Debug) (pull_request) Failing after 7m4s
linux-arm-gcc / linux-gcc-armhf (Release) (pull_request) Failing after 7m36s
linux-mips-gcc / linux-gcc-mipsel (Debug) (pull_request) Failing after 19s
linux-mips-gcc / linux-gcc-mipsel (Release) (pull_request) Failing after 36s
linux-mips64-gcc / linux-gcc-mips64el (Debug) (pull_request) Failing after 7m51s
linux-mips64-gcc / linux-gcc-mips64el (Release) (pull_request) Failing after 7m56s
linux-riscv64-gcc / linux-gcc-riscv64 (Debug) (pull_request) Failing after 8m46s
linux-riscv64-gcc / linux-gcc-riscv64 (Release) (pull_request) Failing after 7m18s
linux-x64-clang / linux-clang (Debug) (pull_request) Failing after 36s
linux-x64-clang / linux-clang (Release) (pull_request) Failing after 31s
linux-x64-gcc / linux-gcc (Debug) (pull_request) Failing after 10m59s
linux-x64-gcc / linux-gcc (Release) (pull_request) Failing after 3h2m29s
linux-x86-gcc / linux-gcc (Debug) (pull_request) Failing after 9m53s
linux-x86-gcc / linux-gcc (Release) (pull_request) Failing after 35m16s

This commit is contained in:
tqcq 2024-10-02 11:33:08 +08:00
parent dc02ceb9b0
commit 791125454a
3 changed files with 3 additions and 4 deletions

View File

@ -113,6 +113,7 @@ private:
}
private:
friend class ScopedLock;
CondVarProxy proxy_;
};
}// namespace cond_var

View File

@ -3,7 +3,6 @@
#pragma once
#include "tile/base/thread/cond_var.h"
#include "tile/base/thread/mutex.h"
#include "tile/base/thread/scoped_lock.h"
@ -30,7 +29,7 @@ public:
inline void Wait()
{
ScopedLock _(m_);
cv_.Wait(m_, [this] { return signaled_; });
cv_.Wait(_, [this] { return signaled_; });
ResetIfNeeded();
}
@ -49,7 +48,7 @@ public:
bool WaitUntil(const std::chrono::time_point<Clock, Duration> &timeout_time)
{
ScopedLock _(m_);
if (cv_.WaitUntil(m_, timeout_time, [this] { return signaled_; })) {
if (cv_.WaitUntil(_, timeout_time, [this] { return signaled_; })) {
ResetIfNeeded();
return true;
}

View File

@ -39,7 +39,6 @@
#include "tile/base/write_mostly.h"
// Sync
#include "tile/base/thread/cond_var.h"
#include "tile/base/thread/event.h"
#include "tile/base/thread/latch.h"
#include "tile/base/thread/mutex.h"