feat timer support Start/Stop in thread
Some checks failed
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (push) Failing after 1m10s
linux-x64-gcc / linux-gcc (Release) (push) Failing after 1m18s
linux-x64-gcc / linux-gcc (Debug) (push) Failing after 1m27s
linux-mips64-gcc / linux-gcc-mips64el (Release) (push) Failing after 3m43s
linux-arm-gcc / linux-gcc-armhf (push) Failing after 4m7s
linux-mips64-gcc / linux-gcc-mips64el (Debug) (push) Failing after 6m8s

This commit is contained in:
tqcq 2024-05-01 14:37:40 +08:00
parent 3da9625ce2
commit 4656a7146d
2 changed files with 53 additions and 13 deletions

View File

@ -1,4 +1,5 @@
#include "sled/timer/timer.h" #include "sled/timer/timer.h"
#include "sled/log/log.h"
namespace sled { namespace sled {
namespace { namespace {
@ -9,6 +10,22 @@ MakeTimeoutId(TimerID timer_id, TimerGeneration generation)
} }
}// namespace }// namespace
TimerThreadDeleter::TimerThreadDeleter(TaskQueueBase *owner) : owner_(owner) {}
void
TimerThreadDeleter::operator()(Timer *timer)
{
if (!timer) { return; }
if (owner_) {
owner_->PostTask([timer]() {
timer->Stop();
delete timer;
});
} else {
delete timer;
}
}
Timer::Timer(TimerID id, Timer::Timer(TimerID id,
const std::string &name, const std::string &name,
OnExpired on_expired, OnExpired on_expired,
@ -53,6 +70,20 @@ Timer::Stop()
} }
} }
void
Timer::Start(TaskQueueBase *owner)
{
SLED_ASSERT(owner != nullptr, "owner must not be nullptr");
owner->BlockingCall([this]() { Start(); });
}
void
Timer::Stop(TaskQueueBase *owner)
{
SLED_ASSERT(owner != nullptr, "owner must not be nullptr");
owner->BlockingCall([this]() { Stop(); });
}
void void
Timer::Trigger(TimerGeneration generation) Timer::Trigger(TimerGeneration generation)
{ {

View File

@ -13,6 +13,16 @@ namespace sled {
typedef uint64_t TimerID; typedef uint64_t TimerID;
typedef uint32_t TimerGeneration; typedef uint32_t TimerGeneration;
class Timer;
struct TimerThreadDeleter {
TimerThreadDeleter(TaskQueueBase *owner);
inline void operator()(Timer *timer);
private:
TaskQueueBase *owner_;
};
class Timer { class Timer {
public: public:
using OnExpired = std::function<sled::optional<DurationMs>()>; using OnExpired = std::function<sled::optional<DurationMs>()>;
@ -22,9 +32,12 @@ public:
void Start(); void Start();
void Stop(); void Stop();
void Start(TaskQueueBase *owner);
void Stop(TaskQueueBase *owner);
void set_duration(DurationMs duration) { duration_ = duration; } void set_duration(DurationMs duration) { duration_ = duration; }
const DurationMs &duration() const { return duration_; } const DurationMs duration() const { return duration_; }
int expiration_count() const { return expiration_count_; } int expiration_count() const { return expiration_count_; }
@ -46,7 +59,7 @@ private:
const UnregisterHandler unregister_handler_; const UnregisterHandler unregister_handler_;
std::unique_ptr<Timeout> timeout_; std::unique_ptr<Timeout> timeout_;
DurationMs duration_; std::atomic<DurationMs> duration_;
TimerGeneration generation_ = TimerGeneration(0); TimerGeneration generation_ = TimerGeneration(0);
bool is_running_ = false; bool is_running_ = false;
@ -54,16 +67,12 @@ private:
}; };
class TimerManager { class TimerManager {
using TimeoutCreator = std::function<std::unique_ptr<Timeout>( using TimeoutCreator = std::function<std::unique_ptr<Timeout>(sled::TaskQueueBase::DelayPrecision)>;
sled::TaskQueueBase::DelayPrecision)>;
public: public:
explicit TimerManager(TimeoutCreator timeout_creator) explicit TimerManager(TimeoutCreator timeout_creator) : timeout_creator_(timeout_creator) {}
: timeout_creator_(timeout_creator)
{}
std::unique_ptr<Timer> CreateTimer(const std::string &name, std::unique_ptr<Timer> CreateTimer(const std::string &name, Timer::OnExpired on_expired);
Timer::OnExpired on_expired);
void HandleTimeout(TimeoutID timeout_id); void HandleTimeout(TimeoutID timeout_id);
private: private: