The libcamera internal headers are located in src/libcamera/include/. The directory is added to the compiler headers search path with a meson include_directories() directive, and internal headers are included with (e.g. for the internal semaphore.h header) #include "semaphore.h" All was well, until libcxx decided to implement the C++20 synchronization library. The __threading_support header gained a #include <semaphore.h> to include the pthread's semaphore support. As include_directories() adds src/libcamera/include/ to the compiler search path with -I, the internal semaphore.h is included instead of the pthread version. Needless to say, the compiler isn't happy. Three options have been considered to fix this issue: - Use -iquote instead of -I. The -iquote option instructs gcc to only consider the header search path for headers included with the "" version. Meson unfortunately doesn't support this option. - Rename the internal semaphore.h header. This was deemed to be the beginning of a long whack-a-mole game, where namespace clashes with system libraries would appear over time (possibly dependent on particular system configurations) and would need to be constantly fixed. - Move the internal headers to another directory to create a unique namespace through path components. This causes lots of churn in all the existing source files through the all project. The first option would be best, but isn't available to us due to missing support in meson. Even if -iquote support was added, we would need to fix the problem before a new version of meson containing the required support would be released. The third option is thus the only practical solution available. Bite the bullet, and do it, moving headers to include/libcamera/internal/. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Jacopo Mondi <jacopo@jmondi.org>
204 lines
4.3 KiB
C++
204 lines
4.3 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* object-invoke.cpp - Cross-thread Object method invocation test
|
|
*/
|
|
|
|
#include <iostream>
|
|
#include <thread>
|
|
|
|
#include <libcamera/event_dispatcher.h>
|
|
#include <libcamera/object.h>
|
|
|
|
#include "libcamera/internal/thread.h"
|
|
|
|
#include "test.h"
|
|
|
|
using namespace std;
|
|
using namespace libcamera;
|
|
|
|
class InvokedObject : public Object
|
|
{
|
|
public:
|
|
enum Status {
|
|
NoCall,
|
|
InvalidThread,
|
|
CallReceived,
|
|
};
|
|
|
|
InvokedObject()
|
|
: status_(NoCall)
|
|
{
|
|
}
|
|
|
|
Status status() const { return status_; }
|
|
int value() const { return value_; }
|
|
void reset()
|
|
{
|
|
status_ = NoCall;
|
|
value_ = 0;
|
|
}
|
|
|
|
void method(int value)
|
|
{
|
|
if (Thread::current() != thread())
|
|
status_ = InvalidThread;
|
|
else
|
|
status_ = CallReceived;
|
|
|
|
value_ = value;
|
|
}
|
|
|
|
void methodWithReference(const int &value)
|
|
{
|
|
}
|
|
|
|
int methodWithReturn()
|
|
{
|
|
return 42;
|
|
}
|
|
|
|
private:
|
|
Status status_;
|
|
int value_;
|
|
};
|
|
|
|
class ObjectInvokeTest : public Test
|
|
{
|
|
protected:
|
|
int run()
|
|
{
|
|
EventDispatcher *dispatcher = Thread::current()->eventDispatcher();
|
|
|
|
/*
|
|
* Test that queued method invocation in the same thread goes
|
|
* through the event dispatcher.
|
|
*/
|
|
object_.invokeMethod(&InvokedObject::method,
|
|
ConnectionTypeQueued, 42);
|
|
|
|
if (object_.status() != InvokedObject::NoCall) {
|
|
cerr << "Method not invoked asynchronously" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
dispatcher->processEvents();
|
|
|
|
switch (object_.status()) {
|
|
case InvokedObject::NoCall:
|
|
cout << "Method not invoked for main thread" << endl;
|
|
return TestFail;
|
|
case InvokedObject::InvalidThread:
|
|
cout << "Method invoked in incorrect thread for main thread" << endl;
|
|
return TestFail;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (object_.value() != 42) {
|
|
cout << "Method invoked with incorrect value for main thread" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/*
|
|
* Test that blocking invocation is delivered directly when the
|
|
* caller and callee live in the same thread.
|
|
*/
|
|
object_.reset();
|
|
|
|
object_.invokeMethod(&InvokedObject::method,
|
|
ConnectionTypeBlocking, 42);
|
|
|
|
switch (object_.status()) {
|
|
case InvokedObject::NoCall:
|
|
cout << "Method not invoked for main thread (blocking)" << endl;
|
|
return TestFail;
|
|
case InvokedObject::InvalidThread:
|
|
cout << "Method invoked in incorrect thread for main thread (blocking)" << endl;
|
|
return TestFail;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* Move the object to a thread and verify that auto method
|
|
* invocation is delivered in the correct thread.
|
|
*/
|
|
object_.reset();
|
|
object_.moveToThread(&thread_);
|
|
|
|
thread_.start();
|
|
|
|
object_.invokeMethod(&InvokedObject::method,
|
|
ConnectionTypeBlocking, 42);
|
|
|
|
switch (object_.status()) {
|
|
case InvokedObject::NoCall:
|
|
cout << "Method not invoked for custom thread" << endl;
|
|
return TestFail;
|
|
case InvokedObject::InvalidThread:
|
|
cout << "Method invoked in incorrect thread for custom thread" << endl;
|
|
return TestFail;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (object_.value() != 42) {
|
|
cout << "Method invoked with incorrect value for custom thread" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* Test that direct method invocation bypasses threads. */
|
|
object_.reset();
|
|
object_.invokeMethod(&InvokedObject::method,
|
|
ConnectionTypeDirect, 42);
|
|
|
|
switch (object_.status()) {
|
|
case InvokedObject::NoCall:
|
|
cout << "Method not invoked for custom thread" << endl;
|
|
return TestFail;
|
|
case InvokedObject::CallReceived:
|
|
cout << "Method invoked in incorrect thread for direct call" << endl;
|
|
return TestFail;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (object_.value() != 42) {
|
|
cout << "Method invoked with incorrect value for direct call" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/*
|
|
* Test invoking a method that takes reference arguments. This
|
|
* targets compilation, there's no need to check runtime
|
|
* results.
|
|
*/
|
|
object_.invokeMethod(&InvokedObject::methodWithReference,
|
|
ConnectionTypeBlocking, 42);
|
|
|
|
/* Test invoking a method that returns a value. */
|
|
int ret = object_.invokeMethod(&InvokedObject::methodWithReturn,
|
|
ConnectionTypeBlocking);
|
|
if (ret != 42) {
|
|
cout << "Method invoked return incorrect value (" << ret
|
|
<< ")" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
void cleanup()
|
|
{
|
|
thread_.exit(0);
|
|
thread_.wait();
|
|
}
|
|
|
|
private:
|
|
Thread thread_;
|
|
InvokedObject object_;
|
|
};
|
|
|
|
TEST_REGISTER(ObjectInvokeTest)
|