93e72b695e
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>
132 lines
2.3 KiB
C++
132 lines
2.3 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* threads.cpp - Threads test
|
|
*/
|
|
|
|
#include <chrono>
|
|
#include <iostream>
|
|
#include <thread>
|
|
|
|
#include "libcamera/internal/thread.h"
|
|
|
|
#include "test.h"
|
|
|
|
using namespace std;
|
|
using namespace libcamera;
|
|
|
|
class DelayThread : public Thread
|
|
{
|
|
public:
|
|
DelayThread(chrono::steady_clock::duration duration)
|
|
: duration_(duration)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
void run()
|
|
{
|
|
this_thread::sleep_for(duration_);
|
|
}
|
|
|
|
private:
|
|
chrono::steady_clock::duration duration_;
|
|
};
|
|
|
|
class ThreadTest : public Test
|
|
{
|
|
protected:
|
|
int init()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int run()
|
|
{
|
|
/* Test Thread() retrieval for the main thread. */
|
|
Thread *thread = Thread::current();
|
|
if (!thread) {
|
|
cout << "Thread::current() failed to main thread"
|
|
<< endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (!thread->isRunning()) {
|
|
cout << "Main thread is not running" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* Test starting the main thread, the test shall not crash. */
|
|
thread->start();
|
|
|
|
/* Test the running state of a custom thread. */
|
|
thread = new Thread();
|
|
thread->start();
|
|
|
|
if (!thread->isRunning()) {
|
|
cout << "Thread is not running after being started"
|
|
<< endl;
|
|
return TestFail;
|
|
}
|
|
|
|
thread->exit(0);
|
|
thread->wait();
|
|
|
|
if (thread->isRunning()) {
|
|
cout << "Thread is still running after finishing"
|
|
<< endl;
|
|
return TestFail;
|
|
}
|
|
|
|
delete thread;
|
|
|
|
/* Test waiting for completion with a timeout. */
|
|
thread = new DelayThread(chrono::milliseconds(500));
|
|
thread->start();
|
|
thread->exit(0);
|
|
|
|
bool timeout = !thread->wait(chrono::milliseconds(100));
|
|
|
|
if (!timeout) {
|
|
cout << "Waiting for thread didn't time out" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
timeout = !thread->wait(chrono::milliseconds(1000));
|
|
|
|
if (timeout) {
|
|
cout << "Waiting for thread timed out" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
delete thread;
|
|
|
|
/* Test waiting on a thread that isn't running. */
|
|
thread = new Thread();
|
|
|
|
timeout = !thread->wait();
|
|
if (timeout) {
|
|
cout << "Waiting for non-started thread timed out" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
thread->start();
|
|
thread->exit(0);
|
|
thread->wait();
|
|
|
|
timeout = !thread->wait();
|
|
if (timeout) {
|
|
cout << "Waiting for already stopped thread timed out" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
void cleanup()
|
|
{
|
|
}
|
|
};
|
|
|
|
TEST_REGISTER(ThreadTest)
|