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
This commit is contained in:
Valentin Shergin authored and Facebook Github Bot committed 2019-02-27 00:32:25 -08:00
1 parent 104ef96498
commit b9107084f7
6 files changed
+30 -9

No files matched your search

@@ -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();
}
@@ -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
+14 -2
View File
@@ -21,11 +21,23 @@ EventQueue::EventQueue(
}
void EventQueue::enqueueEvent(const RawEvent &rawEvent) const {
std::lock_guard<std::mutex> lock(queueMutex_);
queue_.push_back(rawEvent);
{
std::lock_guard<std::mutex> 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<RawEvent> queue;
{
+9 -1
View File
@@ -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> eventBeat_;
// Thread-safe, protected by `queueMutex_`.
@@ -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();
@@ -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