From b9107084f78335fbd0c6d2c4522c7db3a8672764 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Wed, 27 Feb 2019 00:29:19 -0800 Subject: [PATCH] Fabric: Small refactoring in EventQueue Summary: A couple of small changes: 1. `onEnqueue` was decoupled from `enqueueEvent` for easier and unified overiding in subclasses (other methods will call `onEnqueue` soon); 2. `flushEvents` was decoupled from `onBeat` (we will put more stuff into `onBeat` soon). Reviewed By: mdvacca Differential Revision: D14205769 fbshipit-source-id: 574c2b2caaa6432bc7782b2f3bc147fa1fb82bd3 --- .../fabric/core/events/BatchedEventQueue.cpp | 5 +++-- .../fabric/core/events/BatchedEventQueue.h | 2 +- ReactCommon/fabric/core/events/EventQueue.cpp | 16 ++++++++++++++-- ReactCommon/fabric/core/events/EventQueue.h | 10 +++++++++- .../fabric/core/events/UnbatchedEventQueue.cpp | 4 ++-- .../fabric/core/events/UnbatchedEventQueue.h | 2 +- 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ReactCommon/fabric/core/events/BatchedEventQueue.cpp b/ReactCommon/fabric/core/events/BatchedEventQueue.cpp index 415958e70e0..d7b411f058b 100644 --- a/ReactCommon/fabric/core/events/BatchedEventQueue.cpp +++ b/ReactCommon/fabric/core/events/BatchedEventQueue.cpp @@ -10,8 +10,9 @@ namespace facebook { namespace react { -void BatchedEventQueue::enqueueEvent(const RawEvent &rawEvent) const { - EventQueue::enqueueEvent(rawEvent); +void BatchedEventQueue::onEnqueue() const { + EventQueue::onEnqueue(); + eventBeat_->request(); } diff --git a/ReactCommon/fabric/core/events/BatchedEventQueue.h b/ReactCommon/fabric/core/events/BatchedEventQueue.h index 2c430051961..285133c8042 100644 --- a/ReactCommon/fabric/core/events/BatchedEventQueue.h +++ b/ReactCommon/fabric/core/events/BatchedEventQueue.h @@ -20,7 +20,7 @@ class BatchedEventQueue final : public EventQueue { public: using EventQueue::EventQueue; - void enqueueEvent(const RawEvent &rawEvent) const override; + void onEnqueue() const override; }; } // namespace react diff --git a/ReactCommon/fabric/core/events/EventQueue.cpp b/ReactCommon/fabric/core/events/EventQueue.cpp index 3eb775549f2..639a8e74510 100644 --- a/ReactCommon/fabric/core/events/EventQueue.cpp +++ b/ReactCommon/fabric/core/events/EventQueue.cpp @@ -21,11 +21,23 @@ EventQueue::EventQueue( } void EventQueue::enqueueEvent(const RawEvent &rawEvent) const { - std::lock_guard lock(queueMutex_); - queue_.push_back(rawEvent); + { + std::lock_guard lock(queueMutex_); + queue_.push_back(rawEvent); + } + + onEnqueue(); +} + +void EventQueue::onEnqueue() const { + // Default implementation does nothing. } void EventQueue::onBeat(jsi::Runtime &runtime) const { + flushEvents(runtime); +} + +void EventQueue::flushEvents(jsi::Runtime &runtime) const { std::vector queue; { diff --git a/ReactCommon/fabric/core/events/EventQueue.h b/ReactCommon/fabric/core/events/EventQueue.h index 8ebe3652a30..82932819f3c 100644 --- a/ReactCommon/fabric/core/events/EventQueue.h +++ b/ReactCommon/fabric/core/events/EventQueue.h @@ -32,11 +32,19 @@ class EventQueue { * Enqueues and (probably later) dispatch a given event. * Can be called on any thread. */ - virtual void enqueueEvent(const RawEvent &rawEvent) const; + void enqueueEvent(const RawEvent &rawEvent) const; protected: + /* + * Called on any enqueue operation. + * Override in subclasses to trigger beat `request` and/or beat `induce`. + * Default implementation does nothing. + */ + virtual void onEnqueue() const; void onBeat(jsi::Runtime &runtime) const; + void flushEvents(jsi::Runtime &runtime) const; + const EventPipe eventPipe_; const std::unique_ptr eventBeat_; // Thread-safe, protected by `queueMutex_`. diff --git a/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp b/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp index 9c3b20670c8..80dd5cca237 100644 --- a/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp +++ b/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp @@ -10,8 +10,8 @@ namespace facebook { namespace react { -void UnbatchedEventQueue::enqueueEvent(const RawEvent &rawEvent) const { - EventQueue::enqueueEvent(rawEvent); +void UnbatchedEventQueue::onEnqueue() const { + EventQueue::onEnqueue(); eventBeat_->request(); eventBeat_->induce(); diff --git a/ReactCommon/fabric/core/events/UnbatchedEventQueue.h b/ReactCommon/fabric/core/events/UnbatchedEventQueue.h index b1658ab09c7..f708de10db8 100644 --- a/ReactCommon/fabric/core/events/UnbatchedEventQueue.h +++ b/ReactCommon/fabric/core/events/UnbatchedEventQueue.h @@ -20,7 +20,7 @@ class UnbatchedEventQueue final : public EventQueue { public: using EventQueue::EventQueue; - void enqueueEvent(const RawEvent &rawEvent) const override; + void onEnqueue() const override; }; } // namespace react