PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: thread: Support selective message dispatch to thread

Browse Source 
Extend the current dispatchMessages() to support dispatching of
selective messsages according to the Message::Type passed in
the function argument. dispatchMessages() can now be called
explicitly to force deliver selected type's message to the
thread for processing (typically when event loop is not
running).

Signed-off-by: Umang Jain <email@uajain.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Umang Jain
2020-07-31 18:14:14 +00:00
committed by Laurent Pinchart
parent 6042ded8e7
commit 3fe7c1cdb4
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/libcamera/internal/thread.h
View File

@@ -14,6 +14,7 @@
#include <libcamera/signal.h>
#include "libcamera/internal/message.h"
#include "libcamera/internal/utils.h"
namespace libcamera {
@@ -47,7 +48,7 @@ public:
EventDispatcher *eventDispatcher();
void setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher);
void dispatchMessages();
void dispatchMessages(Message::Type type = Message::Type::None);
protected:
int exec();

35
src/libcamera/thread.cpp
View File

@@ -552,25 +552,42 @@ void Thread::removeMessages(Object *receiver)
}
/**
* \brief Dispatch all posted messages for this thread
* \brief Dispatch posted messages for this thread
* \param[in] type The message type
*
* This function immediately dispatches all the messages previously posted for
* this thread with postMessage() that match the message \a type. If the \a type
* is Message::Type::None, all messages are dispatched.
*/
void Thread::dispatchMessages()
void Thread::dispatchMessages(Message::Type type)
{
MutexLocker locker(data_->messages_.mutex_);
while (!data_->messages_.list_.empty()) {
std::unique_ptr<Message> msg = std::move(data_->messages_.list_.front());
data_->messages_.list_.pop_front();
if (!msg)
std::list<std::unique_ptr<Message>> &messages = data_->messages_.list_;
for (auto iter = messages.begin(); iter != messages.end(); ) {
std::unique_ptr<Message> &msg = *iter;
if (!msg) {
iter = data_->messages_.list_.erase(iter);
continue;
}
Object *receiver = msg->receiver_;
if (type != Message::Type::None && msg->type() != type) {
++iter;
continue;
}
std::unique_ptr<Message> message = std::move(msg);
iter = data_->messages_.list_.erase(iter);
Object *receiver = message->receiver_;
ASSERT(data_ == receiver->thread()->data_);
receiver->pendingMessages_--;
locker.unlock();
receiver->message(msg.get());
receiver->message(message.get());
message.reset();
locker.lock();
}
}