From 27aff949fbc1b9aabfc594bbfd6f94be55a086ec Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 15 Jun 2021 16:15:12 +0100 Subject: libcamera/base: Move extended base functionality Move the functionality for the following components to the new base support library: - BoundMethod - EventDispatcher - EventDispatcherPoll - Log - Message - Object - Signal - Semaphore - Thread - Timer While it would be preferable to see these split to move one component per commit, these components are all interdependent upon each other, which leaves us with one big change performing the move for all of them. Reviewed-by: Hirokazu Honda Reviewed-by: Paul Elder Signed-off-by: Kieran Bingham --- Documentation/guides/pipeline-handler.rst | 3 +- include/libcamera/base/bound_method.h | 239 +++++ include/libcamera/base/event_dispatcher.h | 35 + include/libcamera/base/event_dispatcher_poll.h | 58 ++ include/libcamera/base/log.h | 130 +++ include/libcamera/base/meson.build | 10 + include/libcamera/base/message.h | 71 ++ include/libcamera/base/object.h | 71 ++ include/libcamera/base/semaphore.h | 34 + include/libcamera/base/signal.h | 132 +++ include/libcamera/base/thread.h | 76 ++ include/libcamera/base/timer.h | 49 + include/libcamera/bound_method.h | 239 ----- include/libcamera/camera.h | 4 +- include/libcamera/camera_manager.h | 5 +- include/libcamera/internal/camera_sensor.h | 2 +- include/libcamera/internal/device_enumerator.h | 2 +- include/libcamera/internal/event_dispatcher.h | 35 - include/libcamera/internal/event_dispatcher_poll.h | 58 -- include/libcamera/internal/event_notifier.h | 4 +- include/libcamera/internal/ipa_data_serializer.h | 3 +- include/libcamera/internal/ipa_manager.h | 3 +- include/libcamera/internal/ipa_module.h | 3 +- include/libcamera/internal/ipc_pipe.h | 4 +- include/libcamera/internal/ipc_unixsocket.h | 2 +- include/libcamera/internal/log.h | 130 --- include/libcamera/internal/media_device.h | 4 +- include/libcamera/internal/meson.build | 7 - include/libcamera/internal/message.h | 71 -- include/libcamera/internal/pipeline_handler.h | 2 +- include/libcamera/internal/process.h | 2 +- include/libcamera/internal/semaphore.h | 34 - include/libcamera/internal/thread.h | 78 -- include/libcamera/internal/timer.h | 49 - include/libcamera/internal/v4l2_device.h | 6 +- include/libcamera/internal/v4l2_subdevice.h | 2 +- include/libcamera/internal/v4l2_videodevice.h | 4 +- include/libcamera/ipa/ipa_interface.h | 3 +- include/libcamera/meson.build | 3 - include/libcamera/object.h | 71 -- include/libcamera/request.h | 2 +- include/libcamera/signal.h | 132 --- src/android/camera3_hal.cpp | 2 +- src/android/camera_capabilities.cpp | 3 +- src/android/camera_device.cpp | 9 +- src/android/camera_device.h | 7 +- src/android/camera_hal_config.cpp | 2 +- src/android/camera_hal_manager.cpp | 4 +- src/android/camera_metadata.cpp | 2 +- src/android/camera_worker.h | 6 +- src/android/jpeg/encoder_libjpeg.cpp | 3 +- src/android/jpeg/exif.cpp | 3 +- src/android/jpeg/post_processor_jpeg.cpp | 4 +- src/android/jpeg/thumbnailer.cpp | 4 +- src/android/mm/cros_camera_buffer.cpp | 2 +- src/android/mm/generic_camera_buffer.cpp | 3 +- src/android/yuv/post_processor_yuv.cpp | 3 +- src/ipa/ipu3/ipu3.cpp | 3 +- src/ipa/ipu3/ipu3_agc.cpp | 4 +- src/ipa/ipu3/ipu3_awb.cpp | 2 +- src/ipa/libipa/histogram.cpp | 2 +- src/ipa/raspberrypi/cam_helper.hpp | 4 +- src/ipa/raspberrypi/controller/controller.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/agc.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/alsc.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/awb.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/black_level.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/ccm.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/contrast.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/dpc.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/focus.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/geq.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/lux.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/noise.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/sdn.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/sharpen.cpp | 2 +- src/ipa/raspberrypi/raspberrypi.cpp | 7 +- src/ipa/rkisp1/rkisp1.cpp | 4 +- src/ipa/vimc/vimc.cpp | 3 +- src/libcamera/base/bound_method.cpp | 109 +++ src/libcamera/base/event_dispatcher.cpp | 116 +++ src/libcamera/base/event_dispatcher_poll.cpp | 308 +++++++ src/libcamera/base/log.cpp | 998 ++++++++++++++++++++ src/libcamera/base/meson.build | 11 + src/libcamera/base/message.cpp | 166 ++++ src/libcamera/base/object.cpp | 300 +++++++ src/libcamera/base/semaphore.cpp | 103 +++ src/libcamera/base/signal.cpp | 179 ++++ src/libcamera/base/thread.cpp | 680 ++++++++++++++ src/libcamera/base/timer.cpp | 185 ++++ src/libcamera/bound_method.cpp | 110 --- src/libcamera/buffer.cpp | 2 +- src/libcamera/byte_stream_buffer.cpp | 2 +- src/libcamera/camera.cpp | 5 +- src/libcamera/camera_manager.cpp | 5 +- src/libcamera/camera_sensor_properties.cpp | 4 +- src/libcamera/control_serializer.cpp | 3 +- src/libcamera/controls.cpp | 2 +- src/libcamera/delayed_controls.cpp | 3 +- src/libcamera/device_enumerator.cpp | 3 +- src/libcamera/device_enumerator_sysfs.cpp | 3 +- src/libcamera/device_enumerator_udev.cpp | 3 +- src/libcamera/event_dispatcher.cpp | 117 --- src/libcamera/event_dispatcher_poll.cpp | 308 ------- src/libcamera/event_notifier.cpp | 6 +- src/libcamera/file.cpp | 2 +- src/libcamera/file_descriptor.cpp | 2 +- src/libcamera/formats.cpp | 4 +- src/libcamera/framebuffer_allocator.cpp | 3 +- src/libcamera/geometry.cpp | 2 +- src/libcamera/ipa_data_serializer.cpp | 2 +- src/libcamera/ipa_manager.cpp | 2 +- src/libcamera/ipa_module.cpp | 2 +- src/libcamera/ipa_proxy.cpp | 2 +- src/libcamera/ipc_pipe.cpp | 2 +- src/libcamera/ipc_pipe_unixsocket.cpp | 9 +- src/libcamera/ipc_unixsocket.cpp | 3 +- src/libcamera/log.cpp | 999 --------------------- src/libcamera/media_device.cpp | 2 +- src/libcamera/media_object.cpp | 3 +- src/libcamera/meson.build | 11 - src/libcamera/message.cpp | 167 ---- src/libcamera/object.cpp | 302 ------- src/libcamera/pipeline/ipu3/cio2.h | 2 +- src/libcamera/pipeline/ipu3/frames.h | 2 +- src/libcamera/pipeline/ipu3/imgu.cpp | 6 +- src/libcamera/pipeline/ipu3/ipu3.cpp | 6 +- src/libcamera/pipeline/raspberrypi/dma_heaps.cpp | 2 +- src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 4 +- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +- src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 +- src/libcamera/pipeline/simple/converter.cpp | 8 +- src/libcamera/pipeline/simple/converter.h | 4 +- src/libcamera/pipeline/simple/simple.cpp | 3 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 +- src/libcamera/pipeline/vimc/vimc.cpp | 14 +- src/libcamera/pipeline_handler.cpp | 6 +- src/libcamera/process.cpp | 2 +- src/libcamera/request.cpp | 3 +- src/libcamera/semaphore.cpp | 103 --- src/libcamera/signal.cpp | 179 ---- src/libcamera/stream.cpp | 2 +- src/libcamera/sysfs.cpp | 3 +- src/libcamera/thread.cpp | 680 -------------- src/libcamera/timer.cpp | 186 ---- src/libcamera/v4l2_device.cpp | 2 +- src/libcamera/v4l2_pixelformat.cpp | 3 +- src/libcamera/v4l2_subdevice.cpp | 2 +- src/libcamera/v4l2_videodevice.cpp | 3 +- src/v4l2/v4l2_camera.cpp | 2 +- src/v4l2/v4l2_camera.h | 4 +- src/v4l2/v4l2_camera_proxy.cpp | 4 +- src/v4l2/v4l2_compat_manager.cpp | 7 +- test/camera/buffer_import.cpp | 7 +- test/camera/capture.cpp | 6 +- test/event-dispatcher.cpp | 6 +- test/event-thread.cpp | 5 +- test/event.cpp | 7 +- test/hotplug-cameras.cpp | 7 +- test/ipa/ipa_interface_test.cpp | 7 +- test/ipc/unixsocket.cpp | 7 +- test/ipc/unixsocket_ipc.cpp | 7 +- test/log/log_api.cpp | 4 +- test/log/log_process.cpp | 8 +- test/message.cpp | 4 +- test/object-delete.cpp | 5 +- test/object-invoke.cpp | 7 +- test/object.cpp | 7 +- test/process/process_test.cpp | 7 +- test/serialization/ipa_data_serializer_test.cpp | 5 +- test/signal-threads.cpp | 5 +- test/signal.cpp | 4 +- test/threads.cpp | 2 +- test/timer-thread.cpp | 6 +- test/timer.cpp | 6 +- test/v4l2_videodevice/buffer_sharing.cpp | 6 +- test/v4l2_videodevice/capture_async.cpp | 6 +- test/v4l2_videodevice/v4l2_m2mdevice.cpp | 7 +- .../libcamera_templates/module_ipa_proxy.cpp.tmpl | 5 +- .../libcamera_templates/module_ipa_proxy.h.tmpl | 3 +- .../module_ipa_proxy_worker.cpp.tmpl | 7 +- 181 files changed, 4340 insertions(+), 4316 deletions(-) create mode 100644 include/libcamera/base/bound_method.h create mode 100644 include/libcamera/base/event_dispatcher.h create mode 100644 include/libcamera/base/event_dispatcher_poll.h create mode 100644 include/libcamera/base/log.h create mode 100644 include/libcamera/base/message.h create mode 100644 include/libcamera/base/object.h create mode 100644 include/libcamera/base/semaphore.h create mode 100644 include/libcamera/base/signal.h create mode 100644 include/libcamera/base/thread.h create mode 100644 include/libcamera/base/timer.h delete mode 100644 include/libcamera/bound_method.h delete mode 100644 include/libcamera/internal/event_dispatcher.h delete mode 100644 include/libcamera/internal/event_dispatcher_poll.h delete mode 100644 include/libcamera/internal/log.h delete mode 100644 include/libcamera/internal/message.h delete mode 100644 include/libcamera/internal/semaphore.h delete mode 100644 include/libcamera/internal/thread.h delete mode 100644 include/libcamera/internal/timer.h delete mode 100644 include/libcamera/object.h delete mode 100644 include/libcamera/signal.h create mode 100644 src/libcamera/base/bound_method.cpp create mode 100644 src/libcamera/base/event_dispatcher.cpp create mode 100644 src/libcamera/base/event_dispatcher_poll.cpp create mode 100644 src/libcamera/base/log.cpp create mode 100644 src/libcamera/base/message.cpp create mode 100644 src/libcamera/base/object.cpp create mode 100644 src/libcamera/base/semaphore.cpp create mode 100644 src/libcamera/base/signal.cpp create mode 100644 src/libcamera/base/thread.cpp create mode 100644 src/libcamera/base/timer.cpp delete mode 100644 src/libcamera/bound_method.cpp delete mode 100644 src/libcamera/event_dispatcher.cpp delete mode 100644 src/libcamera/event_dispatcher_poll.cpp delete mode 100644 src/libcamera/log.cpp delete mode 100644 src/libcamera/message.cpp delete mode 100644 src/libcamera/object.cpp delete mode 100644 src/libcamera/semaphore.cpp delete mode 100644 src/libcamera/signal.cpp delete mode 100644 src/libcamera/thread.cpp delete mode 100644 src/libcamera/timer.cpp diff --git a/Documentation/guides/pipeline-handler.rst b/Documentation/guides/pipeline-handler.rst index 3047e006..15277693 100644 --- a/Documentation/guides/pipeline-handler.rst +++ b/Documentation/guides/pipeline-handler.rst @@ -288,7 +288,8 @@ features: .. code-block:: cpp - #include "libcamera/internal/log.h" + #include + #include "libcamera/internal/pipeline_handler.h" Run the following commands: diff --git a/include/libcamera/base/bound_method.h b/include/libcamera/base/bound_method.h new file mode 100644 index 00000000..282f9b58 --- /dev/null +++ b/include/libcamera/base/bound_method.h @@ -0,0 +1,239 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * bound_method.h - Method bind and invocation + */ +#ifndef __LIBCAMERA_BASE_BOUND_METHOD_H__ +#define __LIBCAMERA_BASE_BOUND_METHOD_H__ + +#include +#include +#include +#include + +namespace libcamera { + +class Object; + +enum ConnectionType { + ConnectionTypeAuto, + ConnectionTypeDirect, + ConnectionTypeQueued, + ConnectionTypeBlocking, +}; + +class BoundMethodPackBase +{ +public: + virtual ~BoundMethodPackBase() = default; +}; + +template +class BoundMethodPack : public BoundMethodPackBase +{ +public: + BoundMethodPack(const Args &... args) + : args_(args...) + { + } + + std::tuple...> args_; + R ret_; +}; + +template +class BoundMethodPack : public BoundMethodPackBase +{ +public: + BoundMethodPack(const Args &... args) + : args_(args...) + { + } + + std::tuple...> args_; +}; + +class BoundMethodBase +{ +public: + BoundMethodBase(void *obj, Object *object, ConnectionType type) + : obj_(obj), object_(object), connectionType_(type) + { + } + virtual ~BoundMethodBase() = default; + + template::value> * = nullptr> + bool match(T *obj) { return obj == obj_; } + bool match(Object *object) { return object == object_; } + + Object *object() const { return object_; } + + virtual void invokePack(BoundMethodPackBase *pack) = 0; + +protected: + bool activatePack(std::shared_ptr pack, + bool deleteMethod); + + void *obj_; + Object *object_; + +private: + ConnectionType connectionType_; +}; + +template +class BoundMethodArgs : public BoundMethodBase +{ +public: + using PackType = BoundMethodPack; + +private: + template + void invokePack(BoundMethodPackBase *pack, std::index_sequence) + { + PackType *args = static_cast(pack); + args->ret_ = invoke(std::get(args->args_)...); + } + +public: + BoundMethodArgs(void *obj, Object *object, ConnectionType type) + : BoundMethodBase(obj, object, type) {} + + void invokePack(BoundMethodPackBase *pack) override + { + invokePack(pack, std::make_index_sequence{}); + } + + virtual R activate(Args... args, bool deleteMethod = false) = 0; + virtual R invoke(Args... args) = 0; +}; + +template +class BoundMethodArgs : public BoundMethodBase +{ +public: + using PackType = BoundMethodPack; + +private: + template + void invokePack(BoundMethodPackBase *pack, std::index_sequence) + { + /* args is effectively unused when the sequence I is empty. */ + PackType *args [[gnu::unused]] = static_cast(pack); + invoke(std::get(args->args_)...); + } + +public: + BoundMethodArgs(void *obj, Object *object, ConnectionType type) + : BoundMethodBase(obj, object, type) {} + + void invokePack(BoundMethodPackBase *pack) override + { + invokePack(pack, std::make_index_sequence{}); + } + + virtual void activate(Args... args, bool deleteMethod = false) = 0; + virtual void invoke(Args... args) = 0; +}; + +template +class BoundMethodMember : public BoundMethodArgs +{ +public: + using PackType = typename BoundMethodArgs::PackType; + + BoundMethodMember(T *obj, Object *object, R (T::*func)(Args...), + ConnectionType type = ConnectionTypeAuto) + : BoundMethodArgs(obj, object, type), func_(func) + { + } + + bool match(R (T::*func)(Args...)) const { return func == func_; } + + R activate(Args... args, bool deleteMethod = false) override + { + if (!this->object_) { + T *obj = static_cast(this->obj_); + return (obj->*func_)(args...); + } + + auto pack = std::make_shared(args...); + bool sync = BoundMethodBase::activatePack(pack, deleteMethod); + return sync ? pack->ret_ : R(); + } + + R invoke(Args... args) override + { + T *obj = static_cast(this->obj_); + return (obj->*func_)(args...); + } + +private: + R (T::*func_)(Args...); +}; + +template +class BoundMethodMember : public BoundMethodArgs +{ +public: + using PackType = typename BoundMethodArgs::PackType; + + BoundMethodMember(T *obj, Object *object, void (T::*func)(Args...), + ConnectionType type = ConnectionTypeAuto) + : BoundMethodArgs(obj, object, type), func_(func) + { + } + + bool match(void (T::*func)(Args...)) const { return func == func_; } + + void activate(Args... args, bool deleteMethod = false) override + { + if (!this->object_) { + T *obj = static_cast(this->obj_); + return (obj->*func_)(args...); + } + + auto pack = std::make_shared(args...); + BoundMethodBase::activatePack(pack, deleteMethod); + } + + void invoke(Args... args) override + { + T *obj = static_cast(this->obj_); + return (obj->*func_)(args...); + } + +private: + void (T::*func_)(Args...); +}; + +template +class BoundMethodStatic : public BoundMethodArgs +{ +public: + BoundMethodStatic(R (*func)(Args...)) + : BoundMethodArgs(nullptr, nullptr, ConnectionTypeAuto), + func_(func) + { + } + + bool match(R (*func)(Args...)) const { return func == func_; } + + R activate(Args... args, [[maybe_unused]] bool deleteMethod = false) override + { + return (*func_)(args...); + } + + R invoke(Args...) override + { + return R(); + } + +private: + R (*func_)(Args...); +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_BOUND_METHOD_H__ */ diff --git a/include/libcamera/base/event_dispatcher.h b/include/libcamera/base/event_dispatcher.h new file mode 100644 index 00000000..045df27f --- /dev/null +++ b/include/libcamera/base/event_dispatcher.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_dispatcher.h - Event dispatcher + */ +#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ +#define __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ + +#include + +namespace libcamera { + +class EventNotifier; +class Timer; + +class EventDispatcher +{ +public: + virtual ~EventDispatcher(); + + virtual void registerEventNotifier(EventNotifier *notifier) = 0; + virtual void unregisterEventNotifier(EventNotifier *notifier) = 0; + + virtual void registerTimer(Timer *timer) = 0; + virtual void unregisterTimer(Timer *timer) = 0; + + virtual void processEvents() = 0; + + virtual void interrupt() = 0; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ */ diff --git a/include/libcamera/base/event_dispatcher_poll.h b/include/libcamera/base/event_dispatcher_poll.h new file mode 100644 index 00000000..ae2a3f04 --- /dev/null +++ b/include/libcamera/base/event_dispatcher_poll.h @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_dispatcher_poll.h - Poll-based event dispatcher + */ +#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ +#define __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ + +#include +#include +#include + +#include + +struct pollfd; + +namespace libcamera { + +class EventNotifier; +class Timer; + +class EventDispatcherPoll final : public EventDispatcher +{ +public: + EventDispatcherPoll(); + ~EventDispatcherPoll(); + + void registerEventNotifier(EventNotifier *notifier); + void unregisterEventNotifier(EventNotifier *notifier); + + void registerTimer(Timer *timer); + void unregisterTimer(Timer *timer); + + void processEvents(); + void interrupt(); + +private: + struct EventNotifierSetPoll { + short events() const; + EventNotifier *notifiers[3]; + }; + + int poll(std::vector *pollfds); + void processInterrupt(const struct pollfd &pfd); + void processNotifiers(const std::vector &pollfds); + void processTimers(); + + std::map notifiers_; + std::list timers_; + int eventfd_; + + bool processingEvents_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ */ diff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h new file mode 100644 index 00000000..b93c947a --- /dev/null +++ b/include/libcamera/base/log.h @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2018, Google Inc. + * + * log.h - Logging infrastructure + */ +#ifndef __LIBCAMERA_BASE_LOG_H__ +#define __LIBCAMERA_BASE_LOG_H__ + +#include +#include + +#include +#include + +namespace libcamera { + +enum LogSeverity { + LogInvalid = -1, + LogDebug = 0, + LogInfo, + LogWarning, + LogError, + LogFatal, +}; + +class LogCategory +{ +public: + explicit LogCategory(const char *name); + + const char *name() const { return name_; } + LogSeverity severity() const { return severity_; } + void setSeverity(LogSeverity severity); + + static const LogCategory &defaultCategory(); + +private: + const char *name_; + LogSeverity severity_; +}; + +#define LOG_DECLARE_CATEGORY(name) \ +extern const LogCategory &_LOG_CATEGORY(name)(); + +#define LOG_DEFINE_CATEGORY(name) \ +const LogCategory &_LOG_CATEGORY(name)() \ +{ \ + /* The instance will be deleted by the Logger destructor. */ \ + static LogCategory *category = new LogCategory(#name); \ + return *category; \ +} + +class LogMessage +{ +public: + LogMessage(const char *fileName, unsigned int line, + const LogCategory &category, LogSeverity severity); + + LogMessage(LogMessage &&); + ~LogMessage(); + + std::ostream &stream() { return msgStream_; } + + const utils::time_point ×tamp() const { return timestamp_; } + LogSeverity severity() const { return severity_; } + const LogCategory &category() const { return category_; } + const std::string &fileInfo() const { return fileInfo_; } + const std::string msg() const { return msgStream_.str(); } + +private: + LIBCAMERA_DISABLE_COPY(LogMessage) + + void init(const char *fileName, unsigned int line); + + std::ostringstream msgStream_; + const LogCategory &category_; + LogSeverity severity_; + utils::time_point timestamp_; + std::string fileInfo_; +}; + +class Loggable +{ +public: + virtual ~Loggable(); + +protected: + virtual std::string logPrefix() const = 0; + + LogMessage _log(const LogCategory *category, LogSeverity severity, + const char *fileName = __builtin_FILE(), + unsigned int line = __builtin_LINE()) const; +}; + +LogMessage _log(const LogCategory *category, LogSeverity severity, + const char *fileName = __builtin_FILE(), + unsigned int line = __builtin_LINE()); + +#ifndef __DOXYGEN__ +#define _LOG_CATEGORY(name) logCategory##name + +#define _LOG1(severity) \ + _log(nullptr, Log##severity).stream() +#define _LOG2(category, severity) \ + _log(&_LOG_CATEGORY(category)(), Log##severity).stream() + +/* + * Expand the LOG() macro to _LOG1() or _LOG2() based on the number of + * arguments. + */ +#define _LOG_MACRO(_1, _2, NAME, ...) NAME +#define LOG(...) _LOG_MACRO(__VA_ARGS__, _LOG2, _LOG1)(__VA_ARGS__) +#else /* __DOXYGEN___ */ +#define LOG(category, severity) +#endif /* __DOXYGEN__ */ + +#ifndef NDEBUG +#define ASSERT(condition) static_cast(({ \ + if (!(condition)) \ + LOG(Fatal) << "assertion \"" #condition "\" failed in " \ + << __func__ << "()"; \ +})) +#else +#define ASSERT(condition) static_cast(false && (condition)) +#endif + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_LOG_H__ */ diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 2db756c5..7a858dcb 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -3,7 +3,17 @@ libcamera_base_include_dir = libcamera_include_dir / 'base' libcamera_base_headers = files([ + 'bound_method.h', 'class.h', + 'event_dispatcher.h', + 'event_dispatcher_poll.h', + 'log.h', + 'message.h', + 'object.h', + 'semaphore.h', + 'signal.h', + 'thread.h', + 'timer.h', 'utils.h', ]) diff --git a/include/libcamera/base/message.h b/include/libcamera/base/message.h new file mode 100644 index 00000000..5d2a9f04 --- /dev/null +++ b/include/libcamera/base/message.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * message.h - Message queue support + */ +#ifndef __LIBCAMERA_BASE_MESSAGE_H__ +#define __LIBCAMERA_BASE_MESSAGE_H__ + +#include + +#include + +namespace libcamera { + +class BoundMethodBase; +class Object; +class Semaphore; +class Thread; + +class Message +{ +public: + enum Type { + None = 0, + InvokeMessage = 1, + ThreadMoveMessage = 2, + DeferredDelete = 3, + UserMessage = 1000, + }; + + Message(Type type); + virtual ~Message(); + + Type type() const { return type_; } + Object *receiver() const { return receiver_; } + + static Type registerMessageType(); + +private: + friend class Thread; + + Type type_; + Object *receiver_; + + static std::atomic_uint nextUserType_; +}; + +class InvokeMessage : public Message +{ +public: + InvokeMessage(BoundMethodBase *method, + std::shared_ptr pack, + Semaphore *semaphore = nullptr, + bool deleteMethod = false); + ~InvokeMessage(); + + Semaphore *semaphore() const { return semaphore_; } + + void invoke(); + +private: + BoundMethodBase *method_; + std::shared_ptr pack_; + Semaphore *semaphore_; + bool deleteMethod_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_MESSAGE_H__ */ diff --git a/include/libcamera/base/object.h b/include/libcamera/base/object.h new file mode 100644 index 00000000..5c385ab4 --- /dev/null +++ b/include/libcamera/base/object.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * object.h - Base object + */ +#ifndef __LIBCAMERA_BASE_OBJECT_H__ +#define __LIBCAMERA_BASE_OBJECT_H__ + +#include +#include +#include + +#include + +namespace libcamera { + +class Message; +template +class Signal; +class SignalBase; +class Thread; + +class Object +{ +public: + Object(Object *parent = nullptr); + virtual ~Object(); + + void deleteLater(); + + void postMessage(std::unique_ptr msg); + + template::value> * = nullptr> + R invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type, + Args... args) + { + T *obj = static_cast(this); + auto *method = new BoundMethodMember(obj, this, func, type); + return method->activate(args..., true); + } + + Thread *thread() const { return thread_; } + void moveToThread(Thread *thread); + + Object *parent() const { return parent_; } + +protected: + virtual void message(Message *msg); + +private: + friend class SignalBase; + friend class Thread; + + void notifyThreadMove(); + + void connect(SignalBase *signal); + void disconnect(SignalBase *signal); + + Object *parent_; + std::vector children_; + + Thread *thread_; + std::list signals_; + unsigned int pendingMessages_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_OBJECT_H__ */ diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h new file mode 100644 index 00000000..c8e62e3e --- /dev/null +++ b/include/libcamera/base/semaphore.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * semaphore.h - General-purpose counting semaphore + */ +#ifndef __LIBCAMERA_BASE_SEMAPHORE_H__ +#define __LIBCAMERA_BASE_SEMAPHORE_H__ + +#include + +#include + +namespace libcamera { + +class Semaphore +{ +public: + Semaphore(unsigned int n = 0); + + unsigned int available(); + void acquire(unsigned int n = 1); + bool tryAcquire(unsigned int n = 1); + void release(unsigned int n = 1); + +private: + Mutex mutex_; + std::condition_variable cv_; + unsigned int available_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_SEMAPHORE_H__ */ diff --git a/include/libcamera/base/signal.h b/include/libcamera/base/signal.h new file mode 100644 index 00000000..c2521769 --- /dev/null +++ b/include/libcamera/base/signal.h @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * signal.h - Signal & slot implementation + */ +#ifndef __LIBCAMERA_BASE_SIGNAL_H__ +#define __LIBCAMERA_BASE_SIGNAL_H__ + +#include +#include +#include +#include + +#include +#include + +namespace libcamera { + +class SignalBase +{ +public: + void disconnect(Object *object); + +protected: + using SlotList = std::list; + + void connect(BoundMethodBase *slot); + void disconnect(std::function match); + + SlotList slots(); + +private: + SlotList slots_; +}; + +template +class Signal : public SignalBase +{ +public: + ~Signal() + { + disconnect(); + } + +#ifndef __DOXYGEN__ + template::value> * = nullptr> + void connect(T *obj, R (T::*func)(Args...), + ConnectionType type = ConnectionTypeAuto) + { + Object *object = static_cast(obj); + SignalBase::connect(new BoundMethodMember(obj, object, func, type)); + } + + template::value> * = nullptr> +#else + template +#endif + void connect(T *obj, R (T::*func)(Args...)) + { + SignalBase::connect(new BoundMethodMember(obj, nullptr, func)); + } + + template + void connect(R (*func)(Args...)) + { + SignalBase::connect(new BoundMethodStatic(func)); + } + + void disconnect() + { + SignalBase::disconnect([]([[maybe_unused]] SlotList::iterator &iter) { + return true; + }); + } + + template + void disconnect(T *obj) + { + SignalBase::disconnect([obj](SlotList::iterator &iter) { + return (*iter)->match(obj); + }); + } + + template + void disconnect(T *obj, R (T::*func)(Args...)) + { + SignalBase::disconnect([obj, func](SlotList::iterator &iter) { + BoundMethodArgs *slot = + static_cast *>(*iter); + + if (!slot->match(obj)) + return false; + + /* + * If the object matches the slot, the slot is + * guaranteed to be a member slot, so we can safely + * cast it to BoundMethodMember to match + * func. + */ + return static_cast *>(slot)->match(func); + }); + } + + template + void disconnect(R (*func)(Args...)) + { + SignalBase::disconnect([func](SlotList::iterator &iter) { + BoundMethodArgs *slot = + static_cast *>(*iter); + + if (!slot->match(nullptr)) + return false; + + return static_cast *>(slot)->match(func); + }); + } + + void emit(Args... args) + { + /* + * Make a copy of the slots list as the slot could call the + * disconnect operation, invalidating the iterator. + */ + for (BoundMethodBase *slot : slots()) + static_cast *>(slot)->activate(args...); + } +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_SIGNAL_H__ */ diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h new file mode 100644 index 00000000..2ed18d49 --- /dev/null +++ b/include/libcamera/base/thread.h @@ -0,0 +1,76 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * thread.h - Thread support + */ +#ifndef __LIBCAMERA_BASE_THREAD_H__ +#define __LIBCAMERA_BASE_THREAD_H__ + +#include +#include +#include +#include + +#include +#include +#include + +namespace libcamera { + +class EventDispatcher; +class Message; +class Object; +class ThreadData; +class ThreadMain; + +using Mutex = std::mutex; +using MutexLocker = std::unique_lock; + +class Thread +{ +public: + Thread(); + virtual ~Thread(); + + void start(); + void exit(int code = 0); + bool wait(utils::duration duration = utils::duration::max()); + + bool isRunning(); + + Signal finished; + + static Thread *current(); + static pid_t currentId(); + + EventDispatcher *eventDispatcher(); + + void dispatchMessages(Message::Type type = Message::Type::None); + +protected: + int exec(); + virtual void run(); + +private: + void startThread(); + void finishThread(); + + void postMessage(std::unique_ptr msg, Object *receiver); + void removeMessages(Object *receiver); + + friend class Object; + friend class ThreadData; + friend class ThreadMain; + + void moveObject(Object *object); + void moveObject(Object *object, ThreadData *currentData, + ThreadData *targetData); + + std::thread thread_; + ThreadData *data_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_THREAD_H__ */ diff --git a/include/libcamera/base/timer.h b/include/libcamera/base/timer.h new file mode 100644 index 00000000..e79e85f1 --- /dev/null +++ b/include/libcamera/base/timer.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * timer.h - Generic timer + */ +#ifndef __LIBCAMERA_BASE_TIMER_H__ +#define __LIBCAMERA_BASE_TIMER_H__ + +#include +#include + +#include +#include + +namespace libcamera { + +class Message; + +class Timer : public Object +{ +public: + Timer(Object *parent = nullptr); + ~Timer(); + + void start(unsigned int msec) { start(std::chrono::milliseconds(msec)); } + void start(std::chrono::milliseconds duration); + void start(std::chrono::steady_clock::time_point deadline); + void stop(); + bool isRunning() const; + + std::chrono::steady_clock::time_point deadline() const { return deadline_; } + + Signal timeout; + +protected: + void message(Message *msg) override; + +private: + void registerTimer(); + void unregisterTimer(); + + bool running_; + std::chrono::steady_clock::time_point deadline_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_BASE_TIMER_H__ */ diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h deleted file mode 100644 index 4fc445ec..00000000 --- a/include/libcamera/bound_method.h +++ /dev/null @@ -1,239 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * bound_method.h - Method bind and invocation - */ -#ifndef __LIBCAMERA_BOUND_METHOD_H__ -#define __LIBCAMERA_BOUND_METHOD_H__ - -#include -#include -#include -#include - -namespace libcamera { - -class Object; - -enum ConnectionType { - ConnectionTypeAuto, - ConnectionTypeDirect, - ConnectionTypeQueued, - ConnectionTypeBlocking, -}; - -class BoundMethodPackBase -{ -public: - virtual ~BoundMethodPackBase() = default; -}; - -template -class BoundMethodPack : public BoundMethodPackBase -{ -public: - BoundMethodPack(const Args &... args) - : args_(args...) - { - } - - std::tuple...> args_; - R ret_; -}; - -template -class BoundMethodPack : public BoundMethodPackBase -{ -public: - BoundMethodPack(const Args &... args) - : args_(args...) - { - } - - std::tuple...> args_; -}; - -class BoundMethodBase -{ -public: - BoundMethodBase(void *obj, Object *object, ConnectionType type) - : obj_(obj), object_(object), connectionType_(type) - { - } - virtual ~BoundMethodBase() = default; - - template::value> * = nullptr> - bool match(T *obj) { return obj == obj_; } - bool match(Object *object) { return object == object_; } - - Object *object() const { return object_; } - - virtual void invokePack(BoundMethodPackBase *pack) = 0; - -protected: - bool activatePack(std::shared_ptr pack, - bool deleteMethod); - - void *obj_; - Object *object_; - -private: - ConnectionType connectionType_; -}; - -template -class BoundMethodArgs : public BoundMethodBase -{ -public: - using PackType = BoundMethodPack; - -private: - template - void invokePack(BoundMethodPackBase *pack, std::index_sequence) - { - PackType *args = static_cast(pack); - args->ret_ = invoke(std::get(args->args_)...); - } - -public: - BoundMethodArgs(void *obj, Object *object, ConnectionType type) - : BoundMethodBase(obj, object, type) {} - - void invokePack(BoundMethodPackBase *pack) override - { - invokePack(pack, std::make_index_sequence{}); - } - - virtual R activate(Args... args, bool deleteMethod = false) = 0; - virtual R invoke(Args... args) = 0; -}; - -template -class BoundMethodArgs : public BoundMethodBase -{ -public: - using PackType = BoundMethodPack; - -private: - template - void invokePack(BoundMethodPackBase *pack, std::index_sequence) - { - /* args is effectively unused when the sequence I is empty. */ - PackType *args [[gnu::unused]] = static_cast(pack); - invoke(std::get(args->args_)...); - } - -public: - BoundMethodArgs(void *obj, Object *object, ConnectionType type) - : BoundMethodBase(obj, object, type) {} - - void invokePack(BoundMethodPackBase *pack) override - { - invokePack(pack, std::make_index_sequence{}); - } - - virtual void activate(Args... args, bool deleteMethod = false) = 0; - virtual void invoke(Args... args) = 0; -}; - -template -class BoundMethodMember : public BoundMethodArgs -{ -public: - using PackType = typename BoundMethodArgs::PackType; - - BoundMethodMember(T *obj, Object *object, R (T::*func)(Args...), - ConnectionType type = ConnectionTypeAuto) - : BoundMethodArgs(obj, object, type), func_(func) - { - } - - bool match(R (T::*func)(Args...)) const { return func == func_; } - - R activate(Args... args, bool deleteMethod = false) override - { - if (!this->object_) { - T *obj = static_cast(this->obj_); - return (obj->*func_)(args...); - } - - auto pack = std::make_shared(args...); - bool sync = BoundMethodBase::activatePack(pack, deleteMethod); - return sync ? pack->ret_ : R(); - } - - R invoke(Args... args) override - { - T *obj = static_cast(this->obj_); - return (obj->*func_)(args...); - } - -private: - R (T::*func_)(Args...); -}; - -template -class BoundMethodMember : public BoundMethodArgs -{ -public: - using PackType = typename BoundMethodArgs::PackType; - - BoundMethodMember(T *obj, Object *object, void (T::*func)(Args...), - ConnectionType type = ConnectionTypeAuto) - : BoundMethodArgs(obj, object, type), func_(func) - { - } - - bool match(void (T::*func)(Args...)) const { return func == func_; } - - void activate(Args... args, bool deleteMethod = false) override - { - if (!this->object_) { - T *obj = static_cast(this->obj_); - return (obj->*func_)(args...); - } - - auto pack = std::make_shared(args...); - BoundMethodBase::activatePack(pack, deleteMethod); - } - - void invoke(Args... args) override - { - T *obj = static_cast(this->obj_); - return (obj->*func_)(args...); - } - -private: - void (T::*func_)(Args...); -}; - -template -class BoundMethodStatic : public BoundMethodArgs -{ -public: - BoundMethodStatic(R (*func)(Args...)) - : BoundMethodArgs(nullptr, nullptr, ConnectionTypeAuto), - func_(func) - { - } - - bool match(R (*func)(Args...)) const { return func == func_; } - - R activate(Args... args, [[maybe_unused]] bool deleteMethod = false) override - { - return (*func_)(args...); - } - - R invoke(Args...) override - { - return R(); - } - -private: - R (*func_)(Args...); -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_BOUND_METHOD_H__ */ diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index ea091400..b081907e 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -13,11 +13,11 @@ #include #include +#include +#include #include -#include #include -#include #include #include diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 5deede03..744e5a06 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -13,9 +13,8 @@ #include #include - -#include -#include +#include +#include namespace libcamera { diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 7bc54061..db12b07e 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -12,13 +12,13 @@ #include #include +#include #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_subdevice.h" namespace libcamera { diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h index 707cfe8f..222caf75 100644 --- a/include/libcamera/internal/device_enumerator.h +++ b/include/libcamera/internal/device_enumerator.h @@ -13,7 +13,7 @@ #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h deleted file mode 100644 index e6a8ad65..00000000 --- a/include/libcamera/internal/event_dispatcher.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_dispatcher.h - Event dispatcher - */ -#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ -#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ - -#include - -namespace libcamera { - -class EventNotifier; -class Timer; - -class EventDispatcher -{ -public: - virtual ~EventDispatcher(); - - virtual void registerEventNotifier(EventNotifier *notifier) = 0; - virtual void unregisterEventNotifier(EventNotifier *notifier) = 0; - - virtual void registerTimer(Timer *timer) = 0; - virtual void unregisterTimer(Timer *timer) = 0; - - virtual void processEvents() = 0; - - virtual void interrupt() = 0; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ */ diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h deleted file mode 100644 index 33de051d..00000000 --- a/include/libcamera/internal/event_dispatcher_poll.h +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_dispatcher_poll.h - Poll-based event dispatcher - */ -#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ -#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ - -#include -#include -#include - -#include "libcamera/internal/event_dispatcher.h" - -struct pollfd; - -namespace libcamera { - -class EventNotifier; -class Timer; - -class EventDispatcherPoll final : public EventDispatcher -{ -public: - EventDispatcherPoll(); - ~EventDispatcherPoll(); - - void registerEventNotifier(EventNotifier *notifier); - void unregisterEventNotifier(EventNotifier *notifier); - - void registerTimer(Timer *timer); - void unregisterTimer(Timer *timer); - - void processEvents(); - void interrupt(); - -private: - struct EventNotifierSetPoll { - short events() const; - EventNotifier *notifiers[3]; - }; - - int poll(std::vector *pollfds); - void processInterrupt(const struct pollfd &pfd); - void processNotifiers(const std::vector &pollfds); - void processTimers(); - - std::map notifiers_; - std::list timers_; - int eventfd_; - - bool processingEvents_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ */ diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/internal/event_notifier.h index cc3495c0..8a6419f2 100644 --- a/include/libcamera/internal/event_notifier.h +++ b/include/libcamera/internal/event_notifier.h @@ -7,8 +7,8 @@ #ifndef __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ #define __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ -#include -#include +#include +#include namespace libcamera { diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h index 70168acc..76325b1d 100644 --- a/include/libcamera/internal/ipa_data_serializer.h +++ b/include/libcamera/internal/ipa_data_serializer.h @@ -14,6 +14,8 @@ #include #include +#include + #include #include #include @@ -22,7 +24,6 @@ #include "libcamera/internal/byte_stream_buffer.h" #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/control_serializer.h" -#include "libcamera/internal/log.h" namespace libcamera { diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index e904a2be..34224e33 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -10,11 +10,12 @@ #include #include +#include + #include #include #include "libcamera/internal/ipa_module.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/pub_key.h" diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h index 19fc5827..a87f5650 100644 --- a/include/libcamera/internal/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -11,10 +11,11 @@ #include #include +#include + #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" namespace libcamera { diff --git a/include/libcamera/internal/ipc_pipe.h b/include/libcamera/internal/ipc_pipe.h index c9a84b78..e58de340 100644 --- a/include/libcamera/internal/ipc_pipe.h +++ b/include/libcamera/internal/ipc_pipe.h @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/ipc_unixsocket.h" +#include -#include +#include "libcamera/internal/ipc_unixsocket.h" namespace libcamera { diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h index e871b650..9f5b0677 100644 --- a/include/libcamera/internal/ipc_unixsocket.h +++ b/include/libcamera/internal/ipc_unixsocket.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h deleted file mode 100644 index 82e55a62..00000000 --- a/include/libcamera/internal/log.h +++ /dev/null @@ -1,130 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2018, Google Inc. - * - * log.h - Logging infrastructure - */ -#ifndef __LIBCAMERA_INTERNAL_LOG_H__ -#define __LIBCAMERA_INTERNAL_LOG_H__ - -#include -#include - -#include -#include - -namespace libcamera { - -enum LogSeverity { - LogInvalid = -1, - LogDebug = 0, - LogInfo, - LogWarning, - LogError, - LogFatal, -}; - -class LogCategory -{ -public: - explicit LogCategory(const char *name); - - const char *name() const { return name_; } - LogSeverity severity() const { return severity_; } - void setSeverity(LogSeverity severity); - - static const LogCategory &defaultCategory(); - -private: - const char *name_; - LogSeverity severity_; -}; - -#define LOG_DECLARE_CATEGORY(name) \ -extern const LogCategory &_LOG_CATEGORY(name)(); - -#define LOG_DEFINE_CATEGORY(name) \ -const LogCategory &_LOG_CATEGORY(name)() \ -{ \ - /* The instance will be deleted by the Logger destructor. */ \ - static LogCategory *category = new LogCategory(#name); \ - return *category; \ -} - -class LogMessage -{ -public: - LogMessage(const char *fileName, unsigned int line, - const LogCategory &category, LogSeverity severity); - - LogMessage(LogMessage &&); - ~LogMessage(); - - std::ostream &stream() { return msgStream_; } - - const utils::time_point ×tamp() const { return timestamp_; } - LogSeverity severity() const { return severity_; } - const LogCategory &category() const { return category_; } - const std::string &fileInfo() const { return fileInfo_; } - const std::string msg() const { return msgStream_.str(); } - -private: - LIBCAMERA_DISABLE_COPY(LogMessage) - - void init(const char *fileName, unsigned int line); - - std::ostringstream msgStream_; - const LogCategory &category_; - LogSeverity severity_; - utils::time_point timestamp_; - std::string fileInfo_; -}; - -class Loggable -{ -public: - virtual ~Loggable(); - -protected: - virtual std::string logPrefix() const = 0; - - LogMessage _log(const LogCategory *category, LogSeverity severity, - const char *fileName = __builtin_FILE(), - unsigned int line = __builtin_LINE()) const; -}; - -LogMessage _log(const LogCategory *category, LogSeverity severity, - const char *fileName = __builtin_FILE(), - unsigned int line = __builtin_LINE()); - -#ifndef __DOXYGEN__ -#define _LOG_CATEGORY(name) logCategory##name - -#define _LOG1(severity) \ - _log(nullptr, Log##severity).stream() -#define _LOG2(category, severity) \ - _log(&_LOG_CATEGORY(category)(), Log##severity).stream() - -/* - * Expand the LOG() macro to _LOG1() or _LOG2() based on the number of - * arguments. - */ -#define _LOG_MACRO(_1, _2, NAME, ...) NAME -#define LOG(...) _LOG_MACRO(__VA_ARGS__, _LOG2, _LOG1)(__VA_ARGS__) -#else /* __DOXYGEN___ */ -#define LOG(category, severity) -#endif /* __DOXYGEN__ */ - -#ifndef NDEBUG -#define ASSERT(condition) static_cast(({ \ - if (!(condition)) \ - LOG(Fatal) << "assertion \"" #condition "\" failed in " \ - << __func__ << "()"; \ -})) -#else -#define ASSERT(condition) static_cast(false && (condition)) -#endif - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_LOG_H__ */ diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index c3292508..8424611d 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -14,9 +14,9 @@ #include -#include +#include +#include -#include "libcamera/internal/log.h" #include "libcamera/internal/media_object.h" namespace libcamera { diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 1348e926..cf664fc9 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -22,8 +22,6 @@ libcamera_internal_headers = files([ 'device_enumerator.h', 'device_enumerator_sysfs.h', 'device_enumerator_udev.h', - 'event_dispatcher.h', - 'event_dispatcher_poll.h', 'event_notifier.h', 'file.h', 'formats.h', @@ -31,18 +29,13 @@ libcamera_internal_headers = files([ 'ipa_module.h', 'ipa_proxy.h', 'ipc_unixsocket.h', - 'log.h', 'media_device.h', 'media_object.h', - 'message.h', 'pipeline_handler.h', 'process.h', 'pub_key.h', - 'semaphore.h', 'source_paths.h', 'sysfs.h', - 'thread.h', - 'timer.h', 'v4l2_device.h', 'v4l2_pixelformat.h', 'v4l2_subdevice.h', diff --git a/include/libcamera/internal/message.h b/include/libcamera/internal/message.h deleted file mode 100644 index f1b133bf..00000000 --- a/include/libcamera/internal/message.h +++ /dev/null @@ -1,71 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * message.h - Message queue support - */ -#ifndef __LIBCAMERA_INTERNAL_MESSAGE_H__ -#define __LIBCAMERA_INTERNAL_MESSAGE_H__ - -#include - -#include - -namespace libcamera { - -class BoundMethodBase; -class Object; -class Semaphore; -class Thread; - -class Message -{ -public: - enum Type { - None = 0, - InvokeMessage = 1, - ThreadMoveMessage = 2, - DeferredDelete = 3, - UserMessage = 1000, - }; - - Message(Type type); - virtual ~Message(); - - Type type() const { return type_; } - Object *receiver() const { return receiver_; } - - static Type registerMessageType(); - -private: - friend class Thread; - - Type type_; - Object *receiver_; - - static std::atomic_uint nextUserType_; -}; - -class InvokeMessage : public Message -{ -public: - InvokeMessage(BoundMethodBase *method, - std::shared_ptr pack, - Semaphore *semaphore = nullptr, - bool deleteMethod = false); - ~InvokeMessage(); - - Semaphore *semaphore() const { return semaphore_; } - - void invoke(); - -private: - BoundMethodBase *method_; - std::shared_ptr pack_; - Semaphore *semaphore_; - bool deleteMethod_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_MESSAGE_H__ */ diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 8beb6b76..9e2d65d6 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -16,9 +16,9 @@ #include #include +#include #include -#include #include #include "libcamera/internal/ipa_proxy.h" diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h index 254cda85..c4d5d9c1 100644 --- a/include/libcamera/internal/process.h +++ b/include/libcamera/internal/process.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/semaphore.h b/include/libcamera/internal/semaphore.h deleted file mode 100644 index 9dc65d29..00000000 --- a/include/libcamera/internal/semaphore.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * semaphore.h - General-purpose counting semaphore - */ -#ifndef __LIBCAMERA_INTERNAL_SEMAPHORE_H__ -#define __LIBCAMERA_INTERNAL_SEMAPHORE_H__ - -#include - -#include "libcamera/internal/thread.h" - -namespace libcamera { - -class Semaphore -{ -public: - Semaphore(unsigned int n = 0); - - unsigned int available(); - void acquire(unsigned int n = 1); - bool tryAcquire(unsigned int n = 1); - void release(unsigned int n = 1); - -private: - Mutex mutex_; - std::condition_variable cv_; - unsigned int available_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_SEMAPHORE_H__ */ diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h deleted file mode 100644 index 9662e28b..00000000 --- a/include/libcamera/internal/thread.h +++ /dev/null @@ -1,78 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * thread.h - Thread support - */ -#ifndef __LIBCAMERA_INTERNAL_THREAD_H__ -#define __LIBCAMERA_INTERNAL_THREAD_H__ - -#include -#include -#include -#include - -#include - -#include - -#include "libcamera/internal/message.h" - -namespace libcamera { - -class EventDispatcher; -class Message; -class Object; -class ThreadData; -class ThreadMain; - -using Mutex = std::mutex; -using MutexLocker = std::unique_lock; - -class Thread -{ -public: - Thread(); - virtual ~Thread(); - - void start(); - void exit(int code = 0); - bool wait(utils::duration duration = utils::duration::max()); - - bool isRunning(); - - Signal finished; - - static Thread *current(); - static pid_t currentId(); - - EventDispatcher *eventDispatcher(); - - void dispatchMessages(Message::Type type = Message::Type::None); - -protected: - int exec(); - virtual void run(); - -private: - void startThread(); - void finishThread(); - - void postMessage(std::unique_ptr msg, Object *receiver); - void removeMessages(Object *receiver); - - friend class Object; - friend class ThreadData; - friend class ThreadMain; - - void moveObject(Object *object); - void moveObject(Object *object, ThreadData *currentData, - ThreadData *targetData); - - std::thread thread_; - ThreadData *data_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_THREAD_H__ */ diff --git a/include/libcamera/internal/timer.h b/include/libcamera/internal/timer.h deleted file mode 100644 index 013e93c0..00000000 --- a/include/libcamera/internal/timer.h +++ /dev/null @@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * timer.h - Generic timer - */ -#ifndef __LIBCAMERA_INTERNAL_TIMER_H__ -#define __LIBCAMERA_INTERNAL_TIMER_H__ - -#include -#include - -#include -#include - -namespace libcamera { - -class Message; - -class Timer : public Object -{ -public: - Timer(Object *parent = nullptr); - ~Timer(); - - void start(unsigned int msec) { start(std::chrono::milliseconds(msec)); } - void start(std::chrono::milliseconds duration); - void start(std::chrono::steady_clock::time_point deadline); - void stop(); - bool isRunning() const; - - std::chrono::steady_clock::time_point deadline() const { return deadline_; } - - Signal timeout; - -protected: - void message(Message *msg) override; - -private: - void registerTimer(); - void unregisterTimer(); - - bool running_; - std::chrono::steady_clock::time_point deadline_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_TIMER_H__ */ diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index c318e976..1edd664a 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -13,12 +13,12 @@ #include +#include +#include + #include -#include #include -#include "libcamera/internal/log.h" - namespace libcamera { class EventNotifier; diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index d07dd6b4..97b89fb9 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -12,11 +12,11 @@ #include #include +#include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_object.h" #include "libcamera/internal/v4l2_device.h" diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index 227d015e..a7c3d529 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -17,14 +17,14 @@ #include #include +#include +#include #include #include #include -#include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_device.h" #include "libcamera/internal/v4l2_pixelformat.h" diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h index 4aefaa71..9a15c86b 100644 --- a/include/libcamera/ipa/ipa_interface.h +++ b/include/libcamera/ipa/ipa_interface.h @@ -13,10 +13,11 @@ #include #include +#include + #include #include #include -#include namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 21a43388..c69d63d2 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -1,7 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 libcamera_public_headers = files([ - 'bound_method.h', 'buffer.h', 'camera.h', 'camera_manager.h', @@ -11,10 +10,8 @@ libcamera_public_headers = files([ 'framebuffer_allocator.h', 'geometry.h', 'logging.h', - 'object.h', 'pixel_format.h', 'request.h', - 'signal.h', 'span.h', 'stream.h', 'transform.h', diff --git a/include/libcamera/object.h b/include/libcamera/object.h deleted file mode 100644 index a1882f05..00000000 --- a/include/libcamera/object.h +++ /dev/null @@ -1,71 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * object.h - Base object - */ -#ifndef __LIBCAMERA_OBJECT_H__ -#define __LIBCAMERA_OBJECT_H__ - -#include -#include -#include - -#include - -namespace libcamera { - -class Message; -template -class Signal; -class SignalBase; -class Thread; - -class Object -{ -public: - Object(Object *parent = nullptr); - virtual ~Object(); - - void deleteLater(); - - void postMessage(std::unique_ptr msg); - - template::value> * = nullptr> - R invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type, - Args... args) - { - T *obj = static_cast(this); - auto *method = new BoundMethodMember(obj, this, func, type); - return method->activate(args..., true); - } - - Thread *thread() const { return thread_; } - void moveToThread(Thread *thread); - - Object *parent() const { return parent_; } - -protected: - virtual void message(Message *msg); - -private: - friend class SignalBase; - friend class Thread; - - void notifyThreadMove(); - - void connect(SignalBase *signal); - void disconnect(SignalBase *signal); - - Object *parent_; - std::vector children_; - - Thread *thread_; - std::list signals_; - unsigned int pendingMessages_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_OBJECT_H__ */ diff --git a/include/libcamera/request.h b/include/libcamera/request.h index 00c646fe..2d361c9d 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -14,9 +14,9 @@ #include #include +#include #include -#include namespace libcamera { diff --git a/include/libcamera/signal.h b/include/libcamera/signal.h deleted file mode 100644 index 3233529a..00000000 --- a/include/libcamera/signal.h +++ /dev/null @@ -1,132 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * signal.h - Signal & slot implementation - */ -#ifndef __LIBCAMERA_SIGNAL_H__ -#define __LIBCAMERA_SIGNAL_H__ - -#include -#include -#include -#include - -#include -#include - -namespace libcamera { - -class SignalBase -{ -public: - void disconnect(Object *object); - -protected: - using SlotList = std::list; - - void connect(BoundMethodBase *slot); - void disconnect(std::function match); - - SlotList slots(); - -private: - SlotList slots_; -}; - -template -class Signal : public SignalBase -{ -public: - ~Signal() - { - disconnect(); - } - -#ifndef __DOXYGEN__ - template::value> * = nullptr> - void connect(T *obj, R (T::*func)(Args...), - ConnectionType type = ConnectionTypeAuto) - { - Object *object = static_cast(obj); - SignalBase::connect(new BoundMethodMember(obj, object, func, type)); - } - - template::value> * = nullptr> -#else - template -#endif - void connect(T *obj, R (T::*func)(Args...)) - { - SignalBase::connect(new BoundMethodMember(obj, nullptr, func)); - } - - template - void connect(R (*func)(Args...)) - { - SignalBase::connect(new BoundMethodStatic(func)); - } - - void disconnect() - { - SignalBase::disconnect([]([[maybe_unused]] SlotList::iterator &iter) { - return true; - }); - } - - template - void disconnect(T *obj) - { - SignalBase::disconnect([obj](SlotList::iterator &iter) { - return (*iter)->match(obj); - }); - } - - template - void disconnect(T *obj, R (T::*func)(Args...)) - { - SignalBase::disconnect([obj, func](SlotList::iterator &iter) { - BoundMethodArgs *slot = - static_cast *>(*iter); - - if (!slot->match(obj)) - return false; - - /* - * If the object matches the slot, the slot is - * guaranteed to be a member slot, so we can safely - * cast it to BoundMethodMember to match - * func. - */ - return static_cast *>(slot)->match(func); - }); - } - - template - void disconnect(R (*func)(Args...)) - { - SignalBase::disconnect([func](SlotList::iterator &iter) { - BoundMethodArgs *slot = - static_cast *>(*iter); - - if (!slot->match(nullptr)) - return false; - - return static_cast *>(slot)->match(func); - }); - } - - void emit(Args... args) - { - /* - * Make a copy of the slots list as the slot could call the - * disconnect operation, invalidating the iterator. - */ - for (BoundMethodBase *slot : slots()) - static_cast *>(slot)->activate(args...); - } -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_SIGNAL_H__ */ diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp index e6d435e0..da836bae 100644 --- a/src/android/camera3_hal.cpp +++ b/src/android/camera3_hal.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "camera_device.h" #include "camera_hal_manager.h" diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 00224a6d..6b5edb66 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -12,12 +12,13 @@ #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 6243c07e..86ea22b6 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -15,16 +15,15 @@ #include #include +#include +#include +#include + #include #include #include #include -#include - -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" - #include "system/graphics.h" using namespace libcamera; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 090fe28a..4747f577 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -14,15 +14,16 @@ #include +#include +#include +#include + #include #include #include #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" #include "camera_capabilities.h" #include "camera_metadata.h" diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp index f33ba269..d84de4fd 100644 --- a/src/android/camera_hal_config.cpp +++ b/src/android/camera_hal_config.cpp @@ -21,7 +21,7 @@ namespace filesystem = std::experimental::filesystem; #include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 54087d3a..4cd67544 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -7,11 +7,11 @@ #include "camera_hal_manager.h" +#include + #include #include -#include "libcamera/internal/log.h" - #include "camera_device.h" using namespace libcamera; diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index c7298d62..3fc7cf27 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -7,7 +7,7 @@ #include "camera_metadata.h" -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h index e289ef9b..6e1aee4a 100644 --- a/src/android/camera_worker.h +++ b/src/android/camera_worker.h @@ -9,14 +9,14 @@ #include +#include +#include + #include #include -#include #include #include -#include "libcamera/internal/thread.h" - class CameraDevice; class CaptureRequest diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index f006e1d1..e6358ca9 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -16,12 +16,13 @@ #include #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index 747f1cfa..0ba4cb85 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -14,10 +14,9 @@ #include #include +#include #include -#include "libcamera/internal/log.h" - using namespace libcamera; LOG_DEFINE_CATEGORY(EXIF) diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index 058ccc99..0e93f365 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -14,9 +14,9 @@ #include "encoder_libjpeg.h" #include "exif.h" -#include +#include -#include "libcamera/internal/log.h" +#include using namespace libcamera; using namespace std::chrono_literals; diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp index f709d343..5cb00744 100644 --- a/src/android/jpeg/thumbnailer.cpp +++ b/src/android/jpeg/thumbnailer.cpp @@ -7,9 +7,9 @@ #include "thumbnailer.h" -#include +#include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index c4157606..0008d261 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -7,7 +7,7 @@ #include "../camera_buffer.h" -#include "libcamera/internal/log.h" +#include #include "cros-camera/camera_buffer_manager.h" diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index cca88cf3..326fdc06 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -9,8 +9,9 @@ #include +#include + #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp index b67364c8..772e805b 100644 --- a/src/android/yuv/post_processor_yuv.cpp +++ b/src/android/yuv/post_processor_yuv.cpp @@ -9,12 +9,13 @@ #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 8b4c7351..31a3c006 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -19,7 +21,6 @@ #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" #include "ipu3_agc.h" #include "ipu3_awb.h" diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp index c476a60d..fd0b70f0 100644 --- a/src/ipa/ipu3/ipu3_agc.cpp +++ b/src/ipa/ipu3/ipu3_agc.cpp @@ -11,9 +11,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include #include "libipa/histogram.h" diff --git a/src/ipa/ipu3/ipu3_awb.cpp b/src/ipa/ipu3/ipu3_awb.cpp index 54ce8e67..9b409c8f 100644 --- a/src/ipa/ipu3/ipu3_awb.cpp +++ b/src/ipa/ipu3/ipu3_awb.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include namespace libcamera { diff --git a/src/ipa/libipa/histogram.cpp b/src/ipa/libipa/histogram.cpp index d4d7cfdf..fb1eb2a2 100644 --- a/src/ipa/libipa/histogram.cpp +++ b/src/ipa/libipa/histogram.cpp @@ -8,7 +8,7 @@ #include -#include "libcamera/internal/log.h" +#include /** * \file histogram.h diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index 221898ce..a6664819 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -10,13 +10,13 @@ #include +#include + #include "camera_mode.h" #include "controller/controller.hpp" #include "controller/metadata.hpp" #include "md_parser.hpp" -#include - #include "libcamera/internal/v4l2_videodevice.h" namespace RPiController { diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp index 96b58359..d3433ad2 100644 --- a/src/ipa/raspberrypi/controller/controller.cpp +++ b/src/ipa/raspberrypi/controller/controller.cpp @@ -5,7 +5,7 @@ * controller.cpp - ISP controller */ -#include "libcamera/internal/log.h" +#include #include "algorithm.hpp" #include "controller.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 55e80ac7..1ed578cf 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -9,7 +9,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp index b0d24aa2..3cdc95a9 100644 --- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "alsc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp index 1c917e4f..5cfd33a3 100644 --- a/src/ipa/raspberrypi/controller/rpi/awb.cpp +++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp @@ -5,7 +5,7 @@ * awb.cpp - AWB control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp index 9ac855f5..6b3497f1 100644 --- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp +++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp @@ -8,7 +8,7 @@ #include #include -#include "libcamera/internal/log.h" +#include #include "../black_level_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp index dbdcbb39..821a4c7c 100644 --- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp +++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp @@ -5,7 +5,7 @@ * ccm.cpp - CCM (colour correction matrix) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "../ccm_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp index 2bc43027..ae55aad5 100644 --- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp +++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../contrast_status.h" #include "../histogram.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp index e533cd53..110f5056 100644 --- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp @@ -5,7 +5,7 @@ * dpc.cpp - DPC (defective pixel correction) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "dpc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp index bab4406f..a87ec802 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.cpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../focus_status.h" #include "focus.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp index 5eff116c..bdceb1f3 100644 --- a/src/ipa/raspberrypi/controller/rpi/geq.cpp +++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp @@ -5,7 +5,7 @@ * geq.cpp - GEQ (green equalisation) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../device_status.h" #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp index 258e44f4..f58d6939 100644 --- a/src/ipa/raspberrypi/controller/rpi/lux.cpp +++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp @@ -8,7 +8,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp index 156f7501..63cad639 100644 --- a/src/ipa/raspberrypi/controller/rpi/noise.cpp +++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "../device_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp index 959bc740..93845509 100644 --- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp @@ -5,7 +5,7 @@ * sdn.cpp - SDN (spatial denoise) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../denoise_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp index 2cd861ca..b0c2e00a 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "../sharpen_status.h" diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 1c1e802a..a3f01449 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -13,6 +13,10 @@ #include #include +#include + +#include + #include #include #include @@ -25,9 +29,6 @@ #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" - -#include #include "agc_algorithm.hpp" #include "agc_status.h" diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index b47ea324..cdfb4d13 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -15,6 +15,8 @@ #include #include +#include + #include #include #include @@ -22,8 +24,6 @@ #include #include -#include "libcamera/internal/log.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPARkISP1) diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 13681d88..e44765af 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -14,11 +14,12 @@ #include +#include + #include #include #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" namespace libcamera { diff --git a/src/libcamera/base/bound_method.cpp b/src/libcamera/base/bound_method.cpp new file mode 100644 index 00000000..3ecec51c --- /dev/null +++ b/src/libcamera/base/bound_method.cpp @@ -0,0 +1,109 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * bound_method.cpp - Method bind and invocation + */ + +#include +#include +#include +#include + +/** + * \file base/bound_method.h + * \brief Method bind and invocation + */ + +namespace libcamera { + +/** + * \enum ConnectionType + * \brief Connection type for asynchronous communication + * + * This enumeration describes the possible types of asynchronous communication + * between a sender and a receiver. It applies to Signal::emit() and + * Object::invokeMethod(). + * + * \var ConnectionTypeAuto + * \brief If the sender and the receiver live in the same thread, + * ConnectionTypeDirect is used. Otherwise ConnectionTypeQueued is used. + * + * \var ConnectionTypeDirect + * \brief The receiver is invoked immediately and synchronously in the sender's + * thread. + * + * \var ConnectionTypeQueued + * \brief The receiver is invoked asynchronously + * + * Invoke the receiver asynchronously in its thread when control returns to the + * thread's event loop. The sender proceeds without waiting for the invocation + * to complete. + * + * \var ConnectionTypeBlocking + * \brief The receiver is invoked synchronously + * + * If the sender and the receiver live in the same thread, this is equivalent to + * ConnectionTypeDirect. Otherwise, the receiver is invoked asynchronously in + * its thread when control returns to the thread's event loop. The sender + * blocks until the receiver signals the completion of the invocation. + */ + +/** + * \brief Invoke the bound method with packed arguments + * \param[in] pack Packed arguments + * \param[in] deleteMethod True to delete \a this bound method instance when + * method invocation completes + * + * The bound method stores its return value, if any, in the arguments \a pack. + * For direct and blocking invocations, this is performed synchronously, and + * the return value contained in the pack may be used. For queued invocations, + * the return value is stored at an undefined point of time and shall thus not + * be used by the caller. + * + * \return True if the return value contained in the \a pack may be used by the + * caller, false otherwise + */ +bool BoundMethodBase::activatePack(std::shared_ptr pack, + bool deleteMethod) +{ + ConnectionType type = connectionType_; + if (type == ConnectionTypeAuto) { + if (Thread::current() == object_->thread()) + type = ConnectionTypeDirect; + else + type = ConnectionTypeQueued; + } else if (type == ConnectionTypeBlocking) { + if (Thread::current() == object_->thread()) + type = ConnectionTypeDirect; + } + + switch (type) { + case ConnectionTypeDirect: + default: + invokePack(pack.get()); + if (deleteMethod) + delete this; + return true; + + case ConnectionTypeQueued: { + std::unique_ptr msg = + std::make_unique(this, pack, nullptr, deleteMethod); + object_->postMessage(std::move(msg)); + return false; + } + + case ConnectionTypeBlocking: { + Semaphore semaphore; + + std::unique_ptr msg = + std::make_unique(this, pack, &semaphore, deleteMethod); + object_->postMessage(std::move(msg)); + + semaphore.acquire(); + return true; + } + } +} + +} /* namespace libcamera */ diff --git a/src/libcamera/base/event_dispatcher.cpp b/src/libcamera/base/event_dispatcher.cpp new file mode 100644 index 00000000..4be89e81 --- /dev/null +++ b/src/libcamera/base/event_dispatcher.cpp @@ -0,0 +1,116 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_dispatcher.cpp - Event dispatcher + */ + +#include +#include + +/** + * \file base/event_dispatcher.h + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Event) + +/** + * \class EventDispatcher + * \brief Interface to manage the libcamera events and timers + * + * The EventDispatcher class allows the integration of the application event + * loop with libcamera by abstracting how events and timers are managed and + * processed. + * + * To listen to events, libcamera creates EventNotifier instances and registers + * them with the dispatcher with registerEventNotifier(). The event notifier + * \ref EventNotifier::activated signal is then emitted by the dispatcher + * whenever the event is detected. + * + * To set timers, libcamera creates Timer instances and registers them with the + * dispatcher with registerTimer(). The timer \ref Timer::timeout signal is then + * emitted by the dispatcher when the timer times out. + */ + +EventDispatcher::~EventDispatcher() +{ +} + +/** + * \fn EventDispatcher::registerEventNotifier() + * \brief Register an event notifier + * \param[in] notifier The event notifier to register + * + * Once the \a notifier is registered with the dispatcher, the dispatcher will + * emit the notifier \ref EventNotifier::activated signal whenever a + * corresponding event is detected on the notifier's file descriptor. The event + * is monitored until the notifier is unregistered with + * unregisterEventNotifier(). + * + * Registering multiple notifiers for the same file descriptor and event type is + * not allowed and results in undefined behaviour. + */ + +/** + * \fn EventDispatcher::unregisterEventNotifier() + * \brief Unregister an event notifier + * \param[in] notifier The event notifier to unregister + * + * After this function returns the \a notifier is guaranteed not to emit the + * \ref EventNotifier::activated signal. + * + * If the notifier isn't registered, this function performs no operation. + */ + +/** + * \fn EventDispatcher::registerTimer() + * \brief Register a timer + * \param[in] timer The timer to register + * + * Once the \a timer is registered with the dispatcher, the dispatcher will emit + * the timer \ref Timer::timeout signal when the timer times out. The timer can + * be unregistered with unregisterTimer() before it times out, in which case the + * signal will not be emitted. + * + * When the \a timer times out, it is automatically unregistered by the + * dispatcher and can be registered back as early as from the \ref Timer::timeout + * signal handlers. + * + * Registering the same timer multiple times is not allowed and results in + * undefined behaviour. + */ + +/** + * \fn EventDispatcher::unregisterTimer() + * \brief Unregister a timer + * \param[in] timer The timer to unregister + * + * After this function returns the \a timer is guaranteed not to emit the + * \ref Timer::timeout signal. + * + * If the timer isn't registered, this function performs no operation. + */ + +/** + * \fn EventDispatcher::processEvents() + * \brief Wait for and process pending events + * + * This function processes all pending events associated with registered event + * notifiers and timers and signals the corresponding EventNotifier and Timer + * objects. If no events are pending, it waits for the first event and processes + * it before returning. + */ + +/** + * \fn EventDispatcher::interrupt() + * \brief Interrupt any running processEvents() call as soon as possible + * + * Calling this function interrupts any blocking processEvents() call in + * progress. The processEvents() function will return as soon as possible, + * after processing pending timers and events. If processEvents() isn't in + * progress, it will be interrupted immediately the next time it gets called. + */ + +} /* namespace libcamera */ diff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp new file mode 100644 index 00000000..d76ca7fc --- /dev/null +++ b/src/libcamera/base/event_dispatcher_poll.cpp @@ -0,0 +1,308 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_dispatcher_poll.cpp - Poll-based event dispatcher + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "libcamera/internal/event_notifier.h" + +/** + * \file base/event_dispatcher_poll.h + */ + +namespace libcamera { + +LOG_DECLARE_CATEGORY(Event) + +static const char *notifierType(EventNotifier::Type type) +{ + if (type == EventNotifier::Read) + return "read"; + if (type == EventNotifier::Write) + return "write"; + if (type == EventNotifier::Exception) + return "exception"; + + return ""; +} + +/** + * \class EventDispatcherPoll + * \brief A poll-based event dispatcher + */ + +EventDispatcherPoll::EventDispatcherPoll() + : processingEvents_(false) +{ + /* + * Create the event fd. Failures are fatal as we can't implement an + * interruptible dispatcher without the fd. + */ + eventfd_ = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); + if (eventfd_ < 0) + LOG(Event, Fatal) << "Unable to create eventfd"; +} + +EventDispatcherPoll::~EventDispatcherPoll() +{ + close(eventfd_); +} + +void EventDispatcherPoll::registerEventNotifier(EventNotifier *notifier) +{ + EventNotifierSetPoll &set = notifiers_[notifier->fd()]; + EventNotifier::Type type = notifier->type(); + + if (set.notifiers[type] && set.notifiers[type] != notifier) { + LOG(Event, Warning) + << "Ignoring duplicate " << notifierType(type) + << " notifier for fd " << notifier->fd(); + return; + } + + set.notifiers[type] = notifier; +} + +void EventDispatcherPoll::unregisterEventNotifier(EventNotifier *notifier) +{ + auto iter = notifiers_.find(notifier->fd()); + if (iter == notifiers_.end()) + return; + + EventNotifierSetPoll &set = iter->second; + EventNotifier::Type type = notifier->type(); + + if (!set.notifiers[type]) + return; + + if (set.notifiers[type] != notifier) { + LOG(Event, Warning) + << notifierType(type) << " notifier for fd " + << notifier->fd() << " is not registered"; + return; + } + + set.notifiers[type] = nullptr; + + /* + * Don't race with event processing if this method is called from an + * event notifier. The notifiers_ entry will be erased by + * processEvents(). + */ + if (processingEvents_) + return; + + if (!set.notifiers[0] && !set.notifiers[1] && !set.notifiers[2]) + notifiers_.erase(iter); +} + +void EventDispatcherPoll::registerTimer(Timer *timer) +{ + for (auto iter = timers_.begin(); iter != timers_.end(); ++iter) { + if ((*iter)->deadline() > timer->deadline()) { + timers_.insert(iter, timer); + return; + } + } + + timers_.push_back(timer); +} + +void EventDispatcherPoll::unregisterTimer(Timer *timer) +{ + for (auto iter = timers_.begin(); iter != timers_.end(); ++iter) { + if (*iter == timer) { + timers_.erase(iter); + return; + } + + /* + * As the timers list is ordered, we can stop as soon as we go + * past the deadline. + */ + if ((*iter)->deadline() > timer->deadline()) + break; + } +} + +void EventDispatcherPoll::processEvents() +{ + int ret; + + Thread::current()->dispatchMessages(); + + /* Create the pollfd array. */ + std::vector pollfds; + pollfds.reserve(notifiers_.size() + 1); + + for (auto notifier : notifiers_) + pollfds.push_back({ notifier.first, notifier.second.events(), 0 }); + + pollfds.push_back({ eventfd_, POLLIN, 0 }); + + /* Wait for events and process notifiers and timers. */ + do { + ret = poll(&pollfds); + } while (ret == -1 && errno == EINTR); + + if (ret < 0) { + ret = -errno; + LOG(Event, Warning) << "poll() failed with " << strerror(-ret); + } else if (ret > 0) { + processInterrupt(pollfds.back()); + pollfds.pop_back(); + processNotifiers(pollfds); + } + + processTimers(); +} + +void EventDispatcherPoll::interrupt() +{ + uint64_t value = 1; + ssize_t ret = write(eventfd_, &value, sizeof(value)); + if (ret != sizeof(value)) { + if (ret < 0) + ret = -errno; + LOG(Event, Error) + << "Failed to interrupt event dispatcher (" + << ret << ")"; + } +} + +short EventDispatcherPoll::EventNotifierSetPoll::events() const +{ + short events = 0; + + if (notifiers[EventNotifier::Read]) + events |= POLLIN; + if (notifiers[EventNotifier::Write]) + events |= POLLOUT; + if (notifiers[EventNotifier::Exception]) + events |= POLLPRI; + + return events; +} + +int EventDispatcherPoll::poll(std::vector *pollfds) +{ + /* Compute the timeout. */ + Timer *nextTimer = !timers_.empty() ? timers_.front() : nullptr; + struct timespec timeout; + + if (nextTimer) { + utils::time_point now = utils::clock::now(); + + if (nextTimer->deadline() > now) + timeout = utils::duration_to_timespec(nextTimer->deadline() - now); + else + timeout = { 0, 0 }; + + LOG(Event, Debug) + << "timeout " << timeout.tv_sec << "." + << std::setfill('0') << std::setw(9) + << timeout.tv_nsec; + } + + return ppoll(pollfds->data(), pollfds->size(), + nextTimer ? &timeout : nullptr, nullptr); +} + +void EventDispatcherPoll::processInterrupt(const struct pollfd &pfd) +{ + if (!(pfd.revents & POLLIN)) + return; + + uint64_t value; + ssize_t ret = read(eventfd_, &value, sizeof(value)); + if (ret != sizeof(value)) { + if (ret < 0) + ret = -errno; + LOG(Event, Error) + << "Failed to process interrupt (" << ret << ")"; + } +} + +void EventDispatcherPoll::processNotifiers(const std::vector &pollfds) +{ + static const struct { + EventNotifier::Type type; + short events; + } events[] = { + { EventNotifier::Read, POLLIN }, + { EventNotifier::Write, POLLOUT }, + { EventNotifier::Exception, POLLPRI }, + }; + + processingEvents_ = true; + + for (const pollfd &pfd : pollfds) { + auto iter = notifiers_.find(pfd.fd); + ASSERT(iter != notifiers_.end()); + + EventNotifierSetPoll &set = iter->second; + + for (const auto &event : events) { + EventNotifier *notifier = set.notifiers[event.type]; + + if (!notifier) + continue; + + /* + * If the file descriptor is invalid, disable the + * notifier immediately. + */ + if (pfd.revents & POLLNVAL) { + LOG(Event, Warning) + << "Disabling " << notifierType(event.type) + << " due to invalid file descriptor " + << pfd.fd; + unregisterEventNotifier(notifier); + continue; + } + + if (pfd.revents & event.events) + notifier->activated.emit(notifier); + } + + /* Erase the notifiers_ entry if it is now empty. */ + if (!set.notifiers[0] && !set.notifiers[1] && !set.notifiers[2]) + notifiers_.erase(iter); + } + + processingEvents_ = false; +} + +void EventDispatcherPoll::processTimers() +{ + utils::time_point now = utils::clock::now(); + + while (!timers_.empty()) { + Timer *timer = timers_.front(); + if (timer->deadline() > now) + break; + + timers_.pop_front(); + timer->stop(); + timer->timeout.emit(timer); + } +} + +} /* namespace libcamera */ diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp new file mode 100644 index 00000000..1801ae26 --- /dev/null +++ b/src/libcamera/base/log.cpp @@ -0,0 +1,998 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2018, Google Inc. + * + * log.cpp - Logging infrastructure + */ + +#include + +#include +#if HAVE_BACKTRACE +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +/** + * \file base/log.h + * \brief Logging infrastructure + * + * libcamera includes a logging infrastructure used through the library that + * allows inspection of internal operation in a user-configurable way. The log + * messages are grouped in categories that represent areas of libcamera, and + * output of messages for each category can be controlled by independent log + * levels. + * + * The levels are configurable through the LIBCAMERA_LOG_LEVELS environment + * variable that contains a comma-separated list of 'category:level' pairs. + * + * The category names are strings and can include a wildcard ('*') character at + * the end to match multiple categories. + * + * The level are either numeric values, or strings containing the log level + * name. The available log levels are DEBUG, INFO, WARN, ERROR and FATAL. Log + * message with a level higher than or equal to the configured log level for + * their category are output to the log, while other messages are silently + * discarded. + * + * By default log messages are output to stderr. They can be redirected to a log + * file by setting the LIBCAMERA_LOG_FILE environment variable to the name of + * the file. The file must be writable and is truncated if it exists. If any + * error occurs when opening the file, the file is ignored and the log is output + * to stderr. + */ + +/** + * \file logging.h + * \brief Logging management + * + * API to change the logging output destination and log levels programatically. + */ + +namespace libcamera { + +static int log_severity_to_syslog(LogSeverity severity) +{ + switch (severity) { + case LogDebug: + return LOG_DEBUG; + case LogInfo: + return LOG_INFO; + case LogWarning: + return LOG_WARNING; + case LogError: + return LOG_ERR; + case LogFatal: + return LOG_ALERT; + default: + return LOG_NOTICE; + } +} + +static const char *log_severity_name(LogSeverity severity) +{ + static const char *const names[] = { + "DEBUG", + " INFO", + " WARN", + "ERROR", + "FATAL", + }; + + if (static_cast(severity) < std::size(names)) + return names[severity]; + else + return "UNKWN"; +} + +/** + * \brief Log output + * + * The LogOutput class models a log output destination + */ +class LogOutput +{ +public: + LogOutput(const char *path); + LogOutput(std::ostream *stream); + LogOutput(); + ~LogOutput(); + + bool isValid() const; + void write(const LogMessage &msg); + void write(const std::string &msg); + +private: + void writeSyslog(LogSeverity severity, const std::string &msg); + void writeStream(const std::string &msg); + + std::ostream *stream_; + LoggingTarget target_; +}; + +/** + * \brief Construct a log output based on a file + * \param[in] path Full path to log file + */ +LogOutput::LogOutput(const char *path) + : target_(LoggingTargetFile) +{ + stream_ = new std::ofstream(path); +} + +/** + * \brief Construct a log output based on a stream + * \param[in] stream Stream to send log output to + */ +LogOutput::LogOutput(std::ostream *stream) + : stream_(stream), target_(LoggingTargetStream) +{ +} + +/** + * \brief Construct a log output to syslog + */ +LogOutput::LogOutput() + : stream_(nullptr), target_(LoggingTargetSyslog) +{ + openlog("libcamera", LOG_PID, 0); +} + +LogOutput::~LogOutput() +{ + switch (target_) { + case LoggingTargetFile: + delete stream_; + break; + case LoggingTargetSyslog: + closelog(); + break; + default: + break; + } +} + +/** + * \brief Check if the log output is valid + * \return True if the log output is valid + */ +bool LogOutput::isValid() const +{ + switch (target_) { + case LoggingTargetFile: + return stream_->good(); + case LoggingTargetStream: + return stream_ != nullptr; + default: + return true; + } +} + +/** + * \brief Write message to log output + * \param[in] msg Message to write + */ +void LogOutput::write(const LogMessage &msg) +{ + std::string str; + + switch (target_) { + case LoggingTargetSyslog: + str = std::string(log_severity_name(msg.severity())) + " " + + msg.category().name() + " " + msg.fileInfo() + " " + + msg.msg(); + writeSyslog(msg.severity(), str); + break; + case LoggingTargetStream: + case LoggingTargetFile: + str = "[" + utils::time_point_to_string(msg.timestamp()) + "] [" + + std::to_string(Thread::currentId()) + "] " + + log_severity_name(msg.severity()) + " " + + msg.category().name() + " " + msg.fileInfo() + " " + + msg.msg(); + writeStream(str); + break; + default: + break; + } +} + +/** + * \brief Write string to log output + * \param[in] str String to write + */ +void LogOutput::write(const std::string &str) +{ + switch (target_) { + case LoggingTargetSyslog: + writeSyslog(LogDebug, str); + break; + case LoggingTargetStream: + case LoggingTargetFile: + writeStream(str); + break; + default: + break; + } +} + +void LogOutput::writeSyslog(LogSeverity severity, const std::string &str) +{ + syslog(log_severity_to_syslog(severity), "%s", str.c_str()); +} + +void LogOutput::writeStream(const std::string &str) +{ + stream_->write(str.c_str(), str.size()); + stream_->flush(); +} + +/** + * \brief Message logger + * + * The Logger class handles log configuration. + */ +class Logger +{ +public: + ~Logger(); + + static Logger *instance(); + + void write(const LogMessage &msg); + void backtrace(); + + int logSetFile(const char *path); + int logSetStream(std::ostream *stream); + int logSetTarget(LoggingTarget target); + void logSetLevel(const char *category, const char *level); + +private: + Logger(); + + void parseLogFile(); + void parseLogLevels(); + static LogSeverity parseLogLevel(const std::string &level); + + friend LogCategory; + void registerCategory(LogCategory *category); + + std::unordered_set categories_; + std::list> levels_; + + std::shared_ptr output_; +}; + +/** + * \enum LoggingTarget + * \brief Log destination type + * \var LoggingTargetNone + * \brief No logging destination + * \sa Logger::logSetTarget + * \var LoggingTargetSyslog + * \brief Log to syslog + * \sa Logger::logSetTarget + * \var LoggingTargetFile + * \brief Log to file + * \sa Logger::logSetFile + * \var LoggingTargetStream + * \brief Log to stream + * \sa Logger::logSetStream + */ + +/** + * \brief Direct logging to a file + * \param[in] path Full path to the log file + * + * This function directs the log output to the file identified by \a path. The + * previous log target, if any, is closed, and all new log messages will be + * written to the new log file. + * + * If the function returns an error, the log target is not changed. + * + * \return Zero on success, or a negative error code otherwise + */ +int logSetFile(const char *path) +{ + return Logger::instance()->logSetFile(path); +} + +/** + * \brief Direct logging to a stream + * \param[in] stream Stream to send log output to + * + * This function directs the log output to \a stream. The previous log target, + * if any, is closed, and all new log messages will be written to the new log + * stream. + * + * If the function returns an error, the log file is not changed + * + * \return Zero on success, or a negative error code otherwise. + */ +int logSetStream(std::ostream *stream) +{ + return Logger::instance()->logSetStream(stream); +} + +/** + * \brief Set the logging target + * \param[in] target Logging destination + * + * This function sets the logging output to the target specified by \a target. + * The allowed values of \a target are LoggingTargetNone and + * LoggingTargetSyslog. LoggingTargetNone will send the log output to nowhere, + * and LoggingTargetSyslog will send the log output to syslog. The previous + * log target, if any, is closed, and all new log messages will be written to + * the new log destination. + * + * LoggingTargetFile and LoggingTargetStream are not valid values for \a target. + * Use logSetFile() and logSetStream() instead, respectively. + * + * If the function returns an error, the log file is not changed. + * + * \return Zero on success, or a negative error code otherwise. + */ +int logSetTarget(LoggingTarget target) +{ + return Logger::instance()->logSetTarget(target); +} + +/** + * \brief Set the log level + * \param[in] category Logging category + * \param[in] level Log level + * + * This function sets the log level of \a category to \a level. + * \a level shall be one of the following strings: + * - "DEBUG" + * - "INFO" + * - "WARN" + * - "ERROR" + * - "FATAL" + * + * "*" is not a valid \a category for this function. + */ +void logSetLevel(const char *category, const char *level) +{ + Logger::instance()->logSetLevel(category, level); +} + +Logger::~Logger() +{ + for (LogCategory *category : categories_) + delete category; +} + +/** + * \brief Retrieve the logger instance + * + * The Logger is a singleton and can't be constructed manually. This function + * shall instead be used to retrieve the single global instance of the logger. + * + * \return The logger instance + */ +Logger *Logger::instance() +{ + static Logger instance; + return &instance; +} + +/** + * \brief Write a message to the configured logger output + * \param[in] msg The message object + */ +void Logger::write(const LogMessage &msg) +{ + std::shared_ptr output = std::atomic_load(&output_); + if (!output) + return; + + output->write(msg); +} + +/** + * \brief Write a backtrace to the log + */ +void Logger::backtrace() +{ +#if HAVE_BACKTRACE + std::shared_ptr output = std::atomic_load(&output_); + if (!output) + return; + + void *buffer[32]; + int num_entries = ::backtrace(buffer, std::size(buffer)); + char **strings = backtrace_symbols(buffer, num_entries); + if (!strings) + return; + + std::ostringstream msg; + msg << "Backtrace:" << std::endl; + + /* + * Skip the first two entries that correspond to this method and + * ~LogMessage(). + */ + for (int i = 2; i < num_entries; ++i) + msg << strings[i] << std::endl; + + output->write(msg.str()); + + free(strings); +#endif +} + +/** + * \brief Set the log file + * \param[in] path Full path to the log file + * + * \sa libcamera::logSetFile() + * + * \return Zero on success, or a negative error code otherwise. + */ +int Logger::logSetFile(const char *path) +{ + std::shared_ptr output = std::make_shared(path); + if (!output->isValid()) + return -EINVAL; + + std::atomic_store(&output_, output); + return 0; +} + +/** + * \brief Set the log stream + * \param[in] stream Stream to send log output to + * + * \sa libcamera::logSetStream() + * + * \return Zero on success, or a negative error code otherwise. + */ +int Logger::logSetStream(std::ostream *stream) +{ + std::shared_ptr output = std::make_shared(stream); + std::atomic_store(&output_, output); + return 0; +} + +/** + * \brief Set the log target + * \param[in] target Log destination + * + * \sa libcamera::logSetTarget() + * + * \return Zero on success, or a negative error code otherwise. + */ +int Logger::logSetTarget(enum LoggingTarget target) +{ + std::shared_ptr output; + + switch (target) { + case LoggingTargetSyslog: + output = std::make_shared(); + std::atomic_store(&output_, output); + break; + case LoggingTargetNone: + output = nullptr; + std::atomic_store(&output_, std::shared_ptr()); + break; + default: + return -EINVAL; + } + + return 0; +} + +/** + * \brief Set the log level + * \param[in] category Logging category + * \param[in] level Log level + * + * \sa libcamera::logSetLevel() + */ +void Logger::logSetLevel(const char *category, const char *level) +{ + LogSeverity severity = parseLogLevel(level); + if (severity == LogInvalid) + return; + + for (LogCategory *c : categories_) { + if (!strcmp(c->name(), category)) { + c->setSeverity(severity); + break; + } + } +} + +/** + * \brief Construct a logger + */ +Logger::Logger() +{ + parseLogFile(); + parseLogLevels(); +} + +/** + * \brief Parse the log output file from the environment + * + * If the LIBCAMERA_LOG_FILE environment variable is set, open the file it + * points to and redirect the logger output to it. If the environment variable + * is set to "syslog", then the logger output will be directed to syslog. Errors + * are silently ignored and don't affect the logger output (set to stderr). + */ +void Logger::parseLogFile() +{ + const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE"); + if (!file) { + logSetStream(&std::cerr); + return; + } + + if (!strcmp(file, "syslog")) { + logSetTarget(LoggingTargetSyslog); + return; + } + + logSetFile(file); +} + +/** + * \brief Parse the log levels from the environment + * + * The log levels are stored in the LIBCAMERA_LOG_LEVELS environment variable + * as a list of "category:level" pairs, separated by commas (','). Parse the + * variable and store the levels to configure all log categories. + */ +void Logger::parseLogLevels() +{ + const char *debug = utils::secure_getenv("LIBCAMERA_LOG_LEVELS"); + if (!debug) + return; + + for (const char *pair = debug; *debug != '\0'; pair = debug) { + const char *comma = strchrnul(debug, ','); + size_t len = comma - pair; + + /* Skip over the comma. */ + debug = *comma == ',' ? comma + 1 : comma; + + /* Skip to the next pair if the pair is empty. */ + if (!len) + continue; + + std::string category; + std::string level; + + const char *colon = static_cast(memchr(pair, ':', len)); + if (!colon) { + /* 'x' is a shortcut for '*:x'. */ + category = "*"; + level = std::string(pair, len); + } else { + category = std::string(pair, colon - pair); + level = std::string(colon + 1, comma - colon - 1); + } + + /* Both the category and the level must be specified. */ + if (category.empty() || level.empty()) + continue; + + LogSeverity severity = parseLogLevel(level); + if (severity == LogInvalid) + continue; + + levels_.push_back({ category, severity }); + } +} + +/** + * \brief Parse a log level string into a LogSeverity + * \param[in] level The log level string + * + * Log levels can be specified as an integer value in the range from LogDebug to + * LogFatal, or as a string corresponding to the severity name in uppercase. Any + * other value is invalid. + * + * \return The log severity, or LogInvalid if the string is invalid + */ +LogSeverity Logger::parseLogLevel(const std::string &level) +{ + static const char *const names[] = { + "DEBUG", + "INFO", + "WARN", + "ERROR", + "FATAL", + }; + + int severity; + + if (std::isdigit(level[0])) { + char *endptr; + severity = strtoul(level.c_str(), &endptr, 10); + if (*endptr != '\0' || severity > LogFatal) + severity = LogInvalid; + } else { + severity = LogInvalid; + for (unsigned int i = 0; i < std::size(names); ++i) { + if (names[i] == level) { + severity = i; + break; + } + } + } + + return static_cast(severity); +} + +/** + * \brief Register a log category with the logger + * \param[in] category The log category + * + * Log categories must have unique names. If a category with the same name + * already exists this function performs no operation. + */ +void Logger::registerCategory(LogCategory *category) +{ + categories_.insert(category); + + const std::string &name = category->name(); + for (const std::pair &level : levels_) { + bool match = true; + + for (unsigned int i = 0; i < level.first.size(); ++i) { + if (level.first[i] == '*') + break; + + if (i >= name.size() || + name[i] != level.first[i]) { + match = false; + break; + } + } + + if (match) { + category->setSeverity(level.second); + break; + } + } +} + +/** + * \enum LogSeverity + * Log message severity + * \var LogDebug + * Debug message + * \var LogInfo + * Informational message + * \var LogWarning + * Warning message, signals a potential issue + * \var LogError + * Error message, signals an unrecoverable issue + * \var LogFatal + * Fatal message, signals an unrecoverable issue and aborts execution + */ + +/** + * \class LogCategory + * \brief A category of log message + * + * The LogCategory class represents a category of log messages, related to an + * area of the library. It groups all messages belonging to the same category, + * and is used to control the log level per group. + */ + +/** + * \brief Construct a log category + * \param[in] name The category name + */ +LogCategory::LogCategory(const char *name) + : name_(name), severity_(LogSeverity::LogInfo) +{ + Logger::instance()->registerCategory(this); +} + +/** + * \fn LogCategory::name() + * \brief Retrieve the log category name + * \return The log category name + */ + +/** + * \fn LogCategory::severity() + * \brief Retrieve the severity of the log category + * \sa setSeverity() + * \return Return the severity of the log category + */ + +/** + * \brief Set the severity of the log category + * + * Messages of severity higher than or equal to the severity of the log category + * are printed, other messages are discarded. + */ +void LogCategory::setSeverity(LogSeverity severity) +{ + severity_ = severity; +} + +/** + * \brief Retrieve the default log category + * + * The default log category is named "default" and is used by the LOG() macro + * when no log category is specified. + * + * \return A reference to the default log category + */ +const LogCategory &LogCategory::defaultCategory() +{ + static const LogCategory *category = new LogCategory("default"); + return *category; +} + +/** + * \class LogMessage + * \brief Internal log message representation. + * + * The LogMessage class models a single message in the log. It serves as a + * helper to provide the std::ostream API for logging, and must never be used + * directly. Use the LOG() macro instead access the log infrastructure. + */ + +/** + * \brief Construct a log message for a given category + * \param[in] fileName The file name where the message is logged from + * \param[in] line The line number where the message is logged from + * \param[in] category The log message category, controlling how the message + * will be displayed + * \param[in] severity The log message severity, controlling how the message + * will be displayed + * + * Create a log message pertaining to line \a line of file \a fileName. The + * \a severity argument sets the message severity to control whether it will be + * output or dropped. + */ +LogMessage::LogMessage(const char *fileName, unsigned int line, + const LogCategory &category, LogSeverity severity) + : category_(category), severity_(severity) +{ + init(fileName, line); +} + +/** + * \brief Move-construct a log message + * \param[in] other The other message + * + * The move constructor is meant to support the _log() functions. Thanks to copy + * elision it will likely never be called, but C++11 only permits copy elision, + * it doesn't enforce it unlike C++17. To avoid potential link errors depending + * on the compiler type and version, and optimization level, the move + * constructor is defined even if it will likely never be called, and ensures + * that the destructor of the \a other message will not output anything to the + * log by setting the severity to LogInvalid. + */ +LogMessage::LogMessage(LogMessage &&other) + : msgStream_(std::move(other.msgStream_)), category_(other.category_), + severity_(other.severity_) +{ + other.severity_ = LogInvalid; +} + +void LogMessage::init(const char *fileName, unsigned int line) +{ + /* Log the timestamp, severity and file information. */ + timestamp_ = utils::clock::now(); + + std::ostringstream ossFileInfo; + ossFileInfo << utils::basename(fileName) << ":" << line; + fileInfo_ = ossFileInfo.str(); +} + +LogMessage::~LogMessage() +{ + /* Don't print anything if we have been moved to another LogMessage. */ + if (severity_ == LogInvalid) + return; + + msgStream_ << std::endl; + + if (severity_ >= category_.severity()) + Logger::instance()->write(*this); + + if (severity_ == LogSeverity::LogFatal) { + Logger::instance()->backtrace(); + std::abort(); + } +} + +/** + * \fn std::ostream& LogMessage::stream() + * + * Data is added to a LogMessage through the stream returned by this function. + * The stream implements the std::ostream API and can be used for logging as + * std::cout. + * + * \return A reference to the log message stream + */ + +/** + * \fn LogMessage::timestamp() + * \brief Retrieve the timestamp of the log message + * \return The timestamp of the message + */ + +/** + * \fn LogMessage::severity() + * \brief Retrieve the severity of the log message + * \return The severity of the message + */ + +/** + * \fn LogMessage::category() + * \brief Retrieve the category of the log message + * \return The category of the message + */ + +/** + * \fn LogMessage::fileInfo() + * \brief Retrieve the file info of the log message + * \return The file info of the message + */ + +/** + * \fn LogMessage::msg() + * \brief Retrieve the message text of the log message + * \return The message text of the message, as a string + */ + +/** + * \class Loggable + * \brief Base class to support log message extensions + * + * The Loggable class allows classes to extend log messages without any change + * to the way the LOG() macro is invoked. By inheriting from Loggable and + * implementing the logPrefix() virtual method, a class can specify extra + * information to be automatically added to messages logged from class member + * methods. + */ + +Loggable::~Loggable() +{ +} + +/** + * \fn Loggable::logPrefix() + * \brief Retrieve a string to be prefixed to the log message + * + * This method allows classes inheriting from the Loggable class to extend the + * logger with an object-specific prefix output right before the log message + * contents. + * + * \return A string to be prefixed to the log message + */ + +/** + * \brief Create a temporary LogMessage object to log a message + * \param[in] category The log message category + * \param[in] severity The log message severity + * \param[in] fileName The file name where the message is logged from + * \param[in] line The line number where the message is logged from + * + * This method is used as a backeng by the LOG() macro to create a log message + * for locations inheriting from the Loggable class. + * + * \return A log message + */ +LogMessage Loggable::_log(const LogCategory *category, LogSeverity severity, + const char *fileName, unsigned int line) const +{ + LogMessage msg(fileName, line, + category ? *category : LogCategory::defaultCategory(), + severity); + + msg.stream() << logPrefix() << ": "; + return msg; +} + +/** + * \brief Create a temporary LogMessage object to log a message + * \param[in] category The log message category + * \param[in] severity The log message severity + * \param[in] fileName The file name where the message is logged from + * \param[in] line The line number where the message is logged from + * + * This function is used as a backeng by the LOG() macro to create a log + * message for locations not inheriting from the Loggable class. + * + * \return A log message + */ +LogMessage _log(const LogCategory *category, LogSeverity severity, + const char *fileName, unsigned int line) +{ + return LogMessage(fileName, line, + category ? *category : LogCategory::defaultCategory(), + severity); +} + +/** + * \def LOG_DECLARE_CATEGORY(name) + * \hideinitializer + * \brief Declare a category of log messages + * + * This macro is used to declare a log category defined in another compilation + * unit by the LOG_DEFINE_CATEGORY() macro. + * + * The LOG_DECLARE_CATEGORY() macro must be used in the libcamera namespace. + * + * \sa LogCategory + */ + +/** + * \def LOG_DEFINE_CATEGORY(name) + * \hideinitializer + * \brief Define a category of log messages + * + * This macro is used to define a log category that can then be used with the + * LOGC() macro. Category names shall be unique, if a category is shared between + * compilation units, it shall be defined in one compilation unit only and + * declared with LOG_DECLARE_CATEGORY() in the other compilation units. + * + * The LOG_DEFINE_CATEGORY() macro must be used in the libcamera namespace. + * + * \sa LogCategory + */ + +/** + * \def LOG(category, severity) + * \hideinitializer + * \brief Log a message + * \param[in] category Category (optional) + * \param[in] severity Severity + * + * Return an std::ostream reference to which a message can be logged using the + * iostream API. The \a category, if specified, sets the message category. When + * absent the default category is used. The \a severity controls whether the + * message is printed or discarded, depending on the log level for the category. + * + * If the severity is set to Fatal, execution is aborted and the program + * terminates immediately after printing the message. + * + * \warning Logging from the destructor of a global object, either directly or + * indirectly, results in undefined behaviour. + * + * \todo Allow logging from destructors of global objects to the largest + * possible extent + */ + +/** + * \def ASSERT(condition) + * \hideinitializer + * \brief Abort program execution if assertion fails + * + * If \a condition is false, ASSERT() logs an error message with the Fatal log + * level and aborts program execution. + * + * If the macro NDEBUG is defined before including log.h, ASSERT() generates no + * code. + * + * Using conditions that have side effects with ASSERT() is not recommended, as + * these effects would depend on whether NDEBUG is defined or not. Similarly, + * ASSERT() should not be used to check for errors that can occur under normal + * conditions as those checks would then be removed when compiling with NDEBUG. + */ + +} /* namespace libcamera */ diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 302a2886..7a19c67c 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -2,10 +2,21 @@ libcamera_base_sources = files([ 'class.cpp', + 'bound_method.cpp', + 'event_dispatcher.cpp', + 'event_dispatcher_poll.cpp', + 'log.cpp', + 'message.cpp', + 'object.cpp', + 'semaphore.cpp', + 'signal.cpp', + 'thread.cpp', + 'timer.cpp', 'utils.cpp', ]) libcamera_base_deps = [ + dependency('threads'), ] libcamera_base_lib = shared_library('libcamera-base', diff --git a/src/libcamera/base/message.cpp b/src/libcamera/base/message.cpp new file mode 100644 index 00000000..f1d772e4 --- /dev/null +++ b/src/libcamera/base/message.cpp @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * message.cpp - Message queue support + */ + +#include + +#include +#include + +/** + * \file base/message.h + * \brief Message queue support + * + * The messaging API enables inter-thread communication through message + * posting. Messages can be sent from any thread to any recipient deriving from + * the Object class. + * + * To post a message, the sender allocates it dynamically as instance of a class + * derived from Message. It then posts the message to an Object recipient + * through Object::postMessage(). Message ownership is passed to the object, + * thus the message shall not store any temporary data. + * + * The message is delivered in the context of the object's thread, through the + * Object::message() virtual method. After delivery the message is + * automatically deleted. + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Message) + +std::atomic_uint Message::nextUserType_{ Message::UserMessage }; + +/** + * \class Message + * \brief A message that can be posted to a Thread + */ + +/** + * \enum Message::Type + * \brief The message type + * \var Message::None + * \brief Invalid message type + * \var Message::InvokeMessage + * \brief Asynchronous method invocation across threads + * \var Message::ThreadMoveMessage + * \brief Object is being moved to a different thread + * \var Message::DeferredDelete + * \brief Object is scheduled for deletion + * \var Message::UserMessage + * \brief First value available for user-defined messages + */ + +/** + * \brief Construct a message object of type \a type + * \param[in] type The message type + */ +Message::Message(Message::Type type) + : type_(type) +{ +} + +Message::~Message() +{ +} + +/** + * \fn Message::type() + * \brief Retrieve the message type + * \return The message type + */ + +/** + * \fn Message::receiver() + * \brief Retrieve the message receiver + * \return The message receiver + */ + +/** + * \brief Reserve and register a custom user-defined message type + * + * Custom message types use values starting at Message::UserMessage. Assigning + * custom types manually may lead to accidental duplicated types. To avoid this + * problem, this method reserves and returns the next available user-defined + * message type. + * + * The recommended way to use this method is to subclass Message and provide a + * static accessor for the custom message type. + * + * \code{.cpp} + * class MyCustomMessage : public Message + * { + * public: + * MyCustomMessage() : Message(type()) {} + * + * static Message::Type type() + * { + * static MessageType type = registerMessageType(); + * return type; + * } + * }; + * \endcode + * + * \return A new unique message type + */ +Message::Type Message::registerMessageType() +{ + return static_cast(nextUserType_++); +} + +/** + * \class InvokeMessage + * \brief A message carrying a method invocation across threads + */ + +/** + * \brief Construct an InvokeMessage for method invocation on an Object + * \param[in] method The bound method + * \param[in] pack The packed method arguments + * \param[in] semaphore The semaphore used to signal message delivery + * \param[in] deleteMethod True to delete the \a method when the message is + * destroyed + */ +InvokeMessage::InvokeMessage(BoundMethodBase *method, + std::shared_ptr pack, + Semaphore *semaphore, bool deleteMethod) + : Message(Message::InvokeMessage), method_(method), pack_(pack), + semaphore_(semaphore), deleteMethod_(deleteMethod) +{ +} + +InvokeMessage::~InvokeMessage() +{ + if (deleteMethod_) + delete method_; +} + +/** + * \fn InvokeMessage::semaphore() + * \brief Retrieve the message semaphore passed to the constructor + * \return The message semaphore + */ + +/** + * \brief Invoke the method bound to InvokeMessage::method_ with arguments + * InvokeMessage::pack_ + */ +void InvokeMessage::invoke() +{ + method_->invokePack(pack_.get()); +} + +/** + * \var InvokeMessage::method_ + * \brief The method to be invoked + */ + +/** + * \var InvokeMessage::pack_ + * \brief The packed method invocation arguments + */ + +} /* namespace libcamera */ diff --git a/src/libcamera/base/object.cpp b/src/libcamera/base/object.cpp new file mode 100644 index 00000000..25410ecd --- /dev/null +++ b/src/libcamera/base/object.cpp @@ -0,0 +1,300 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * object.cpp - Base object + */ + +#include + +#include + +#include +#include +#include +#include +#include +#include + +/** + * \file base/object.h + * \brief Base object to support automatic signal disconnection + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Object) + +/** + * \class Object + * \brief Base object to support automatic signal disconnection + * + * The Object class simplifies signal/slot handling for classes implementing + * slots. By inheriting from Object, an object is automatically disconnected + * from all connected signals when it gets destroyed. + * + * Object instances are bound to the thread of their parent, or the thread in + * which they're created when they have no parent. When a message is posted to + * an object, its handler will run in the object's thread. This allows + * implementing easy message passing between threads by inheriting from the + * Object class. + * + * Deleting an object from a thread other than the one the object is bound to is + * unsafe, unless the caller ensures that the object isn't processing any + * message concurrently. + * + * Object slots connected to signals will also run in the context of the + * object's thread, regardless of whether the signal is emitted in the same or + * in another thread. + * + * \sa Message, Signal, Thread + */ + +/** + * \brief Construct an Object instance + * \param[in] parent The object parent + * + * The new Object instance is bound to the thread of its \a parent, or to the + * current thread if the \a parent is nullptr. + */ +Object::Object(Object *parent) + : parent_(parent), pendingMessages_(0) +{ + thread_ = parent ? parent->thread() : Thread::current(); + + if (parent) + parent->children_.push_back(this); +} + +/** + * \brief Destroy an Object instance + * + * Deleting an Object automatically disconnects all signals from the Object's + * slots. All the Object's children are made orphan, but stay bound to their + * current thread. + * + * Object instances shall be destroyed from the thread they are bound to, + * otherwise undefined behaviour may occur. If deletion of an Object needs to + * be scheduled from a different thread, deleteLater() shall be used. + */ +Object::~Object() +{ + /* + * Move signals to a private list to avoid concurrent iteration and + * deletion of items from Signal::disconnect(). + */ + std::list signals(std::move(signals_)); + for (SignalBase *signal : signals) + signal->disconnect(this); + + if (pendingMessages_) + thread()->removeMessages(this); + + if (parent_) { + auto it = std::find(parent_->children_.begin(), + parent_->children_.end(), this); + ASSERT(it != parent_->children_.end()); + parent_->children_.erase(it); + } + + for (auto child : children_) + child->parent_ = nullptr; +} + +/** + * \brief Schedule deletion of the instance in the thread it belongs to + * + * This function schedules deletion of the Object when control returns to the + * event loop that the object belongs to. This ensures the object is destroyed + * from the right context, as required by the libcamera threading model. + * + * If this function is called before the thread's event loop is started, the + * object will be deleted when the event loop starts. + * + * Deferred deletion can be used to control the destruction context with shared + * pointers. An object managed with shared pointers is deleted when the last + * reference is destroyed, which makes difficult to ensure through software + * design which context the deletion will take place in. With a custom deleter + * for the shared pointer using deleteLater(), the deletion can be guaranteed to + * happen in the thread the object is bound to. + * + * \code{.cpp} + * std::shared_ptr createObject() + * { + * struct Deleter : std::default_delete { + * void operator()(MyObject *obj) + * { + * obj->deleteLater(); + * } + * }; + * + * MyObject *obj = new MyObject(); + * + * return std::shared_ptr(obj, Deleter()); + * } + * \endcode + * + * \context This function is \threadsafe. + */ +void Object::deleteLater() +{ + postMessage(std::make_unique(Message::DeferredDelete)); +} + +/** + * \brief Post a message to the object's thread + * \param[in] msg The message + * + * This method posts the message \a msg to the message queue of the object's + * thread, to be delivered to the object through the message() method in the + * context of its thread. Message ownership is passed to the thread, and the + * message will be deleted after being delivered. + * + * Messages are delivered through the thread's event loop. If the thread is not + * running its event loop the message will not be delivered until the event + * loop gets started. + * + * Due to their asynchronous nature, threads do not provide any guarantee that + * all posted messages are delivered before the thread is stopped. See + * \ref thread-stop for additional information. + * + * \context This function is \threadsafe. + */ +void Object::postMessage(std::unique_ptr msg) +{ + thread()->postMessage(std::move(msg), this); +} + +/** + * \brief Message handler for the object + * \param[in] msg The message + * + * This virtual method receives messages for the object. It is called in the + * context of the object's thread, and can be overridden to process custom + * messages. The parent Object::message() method shall be called for any + * message not handled by the override method. + * + * The message \a msg is valid only for the duration of the call, no reference + * to it shall be kept after this method returns. + */ +void Object::message(Message *msg) +{ + switch (msg->type()) { + case Message::InvokeMessage: { + InvokeMessage *iMsg = static_cast(msg); + Semaphore *semaphore = iMsg->semaphore(); + iMsg->invoke(); + + if (semaphore) + semaphore->release(); + + break; + } + + case Message::DeferredDelete: + delete this; + break; + + default: + break; + } +} + +/** + * \fn R Object::invokeMethod() + * \brief Invoke a method asynchronously on an Object instance + * \param[in] func The object method to invoke + * \param[in] type Connection type for method invocation + * \param[in] args The method arguments + * + * This method invokes the member method \a func with arguments \a args, based + * on the connection \a type. Depending on the type, the method will be called + * synchronously in the same thread or asynchronously in the object's thread. + * + * Arguments \a args passed by value or reference are copied, while pointers + * are passed untouched. The caller shall ensure that any pointer argument + * remains valid until the method is invoked. + * + * Due to the asynchronous nature of threads, functions invoked asynchronously + * with the ConnectionTypeQueued type are not guaranteed to be called before + * the thread is stopped. See \ref thread-stop for additional information. + * + * \context This function is \threadsafe. + * + * \return For connection types ConnectionTypeDirect and + * ConnectionTypeBlocking, return the return value of the invoked method. For + * connection type ConnectionTypeQueued, return a default-constructed R value. + */ + +/** + * \fn Object::thread() + * \brief Retrieve the thread the object is bound to + * \context This function is \threadsafe. + * \return The thread the object is bound to + */ + +/** + * \brief Move the object and all its children to a different thread + * \param[in] thread The target thread + * + * This method moves the object and all its children from the current thread to + * the new \a thread. + * + * Before the object is moved, a Message::ThreadMoveMessage message is sent to + * it. The message() method can be reimplement in derived classes to be notified + * of the upcoming thread move and perform any required processing. + * + * Moving an object that has a parent is not allowed, and causes undefined + * behaviour. + * + * \context This function is thread-bound. + */ +void Object::moveToThread(Thread *thread) +{ + ASSERT(Thread::current() == thread_); + + if (thread_ == thread) + return; + + if (parent_) { + LOG(Object, Error) + << "Moving object to thread with a parent is not permitted"; + return; + } + + notifyThreadMove(); + + thread->moveObject(this); +} + +void Object::notifyThreadMove() +{ + Message msg(Message::ThreadMoveMessage); + message(&msg); + + for (auto child : children_) + child->notifyThreadMove(); +} + +/** + * \fn Object::parent() + * \brief Retrieve the object's parent + * \return The object's parent + */ + +void Object::connect(SignalBase *signal) +{ + signals_.push_back(signal); +} + +void Object::disconnect(SignalBase *signal) +{ + for (auto iter = signals_.begin(); iter != signals_.end(); ) { + if (*iter == signal) + iter = signals_.erase(iter); + else + iter++; + } +} + +} /* namespace libcamera */ diff --git a/src/libcamera/base/semaphore.cpp b/src/libcamera/base/semaphore.cpp new file mode 100644 index 00000000..7aedc6a8 --- /dev/null +++ b/src/libcamera/base/semaphore.cpp @@ -0,0 +1,103 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * semaphore.cpp - General-purpose counting semaphore + */ + +#include +#include + +/** + * \file base/semaphore.h + * \brief General-purpose counting semaphore + */ + +namespace libcamera { + +/** + * \class Semaphore + * \brief General-purpose counting semaphore + * + * A semaphore is a locking primitive that protects resources. It is created + * with an initial number of resources (which may be 0), and offers two + * primitives to acquire and release resources. The acquire() method tries to + * acquire a number of resources, and blocks if not enough resources are + * available until they get released. The release() method releases a number of + * resources, waking up any consumer blocked on an acquire() call. + */ + +/** + * \brief Construct a semaphore with \a n resources + * \param[in] n The resource count + */ +Semaphore::Semaphore(unsigned int n) + : available_(n) +{ +} + +/** + * \brief Retrieve the number of available resources + * \return The number of available resources + */ +unsigned int Semaphore::available() +{ + MutexLocker locker(mutex_); + return available_; +} + +/** + * \brief Acquire \a n resources + * \param[in] n The resource count + * + * This method attempts to acquire \a n resources. If \a n is higher than the + * number of available resources, the call will block until enough resources + * become available. + */ +void Semaphore::acquire(unsigned int n) +{ + MutexLocker locker(mutex_); + cv_.wait(locker, [&] { return available_ >= n; }); + available_ -= n; +} + +/** + * \brief Try to acquire \a n resources without blocking + * \param[in] n The resource count + * + * This method attempts to acquire \a n resources. If \a n is higher than the + * number of available resources, it returns false immediately without + * acquiring any resource. Otherwise it acquires the resources and returns + * true. + * + * \return True if the resources have been acquired, false otherwise + */ +bool Semaphore::tryAcquire(unsigned int n) +{ + MutexLocker locker(mutex_); + if (available_ < n) + return false; + + available_ -= n; + return true; +} + +/** + * \brief Release \a n resources + * \param[in] n The resource count + * + * This method releases \a n resources, increasing the available resource count + * by \a n. If the number of available resources becomes large enough for any + * consumer blocked on an acquire() call, those consumers get woken up. + */ +void Semaphore::release(unsigned int n) +{ + { + MutexLocker locker(mutex_); + available_ += n; + } + + cv_.notify_all(); +} + +} /* namespace libcamera */ diff --git a/src/libcamera/base/signal.cpp b/src/libcamera/base/signal.cpp new file mode 100644 index 00000000..298b2d4b --- /dev/null +++ b/src/libcamera/base/signal.cpp @@ -0,0 +1,179 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * signal.cpp - Signal & slot implementation + */ + +#include + +#include + +/** + * \file base/signal.h + * \brief Signal & slot implementation + */ + +namespace libcamera { + +namespace { + +/* + * Mutex to protect the SignalBase::slots_ and Object::signals_ lists. If lock + * contention needs to be decreased, this could be replaced with locks in + * Object and SignalBase, or with a mutex pool. + */ +Mutex signalsLock; + +} /* namespace */ + +void SignalBase::connect(BoundMethodBase *slot) +{ + MutexLocker locker(signalsLock); + + Object *object = slot->object(); + if (object) + object->connect(this); + slots_.push_back(slot); +} + +void SignalBase::disconnect(Object *object) +{ + disconnect([object](SlotList::iterator &iter) { + return (*iter)->match(object); + }); +} + +void SignalBase::disconnect(std::function match) +{ + MutexLocker locker(signalsLock); + + for (auto iter = slots_.begin(); iter != slots_.end(); ) { + if (match(iter)) { + Object *object = (*iter)->object(); + if (object) + object->disconnect(this); + + delete *iter; + iter = slots_.erase(iter); + } else { + ++iter; + } + } +} + +SignalBase::SlotList SignalBase::slots() +{ + MutexLocker locker(signalsLock); + return slots_; +} + +/** + * \class Signal + * \brief Generic signal and slot communication mechanism + * + * Signals and slots are a language construct aimed at communication between + * objects through the observer pattern without the need for boilerplate code. + * See http://doc.qt.io/qt-5/signalsandslots.html for more information. + * + * Signals model events that can be observed from objects unrelated to the event + * source. Slots are functions that are called in response to a signal. Signals + * can be connected to and disconnected from slots dynamically at runtime. When + * a signal is emitted, all connected slots are called sequentially in the order + * they have been connected. + * + * Signals are defined with zero, one or more typed parameters. They are emitted + * with a value for each of the parameters, and those values are passed to the + * connected slots. + * + * Slots are normal static or class member functions. In order to be connected + * to a signal, their signature must match the signal type (taking the same + * arguments as the signal and returning void). + * + * Connecting a signal to a slot results in the slot being called with the + * arguments passed to the emit() function when the signal is emitted. Multiple + * slots can be connected to the same signal, and multiple signals can connected + * to the same slot. Duplicate connections between a signal and a slot are + * allowed and result in the slot being called multiple times for the same + * signal emission. + * + * When a slot belongs to an instance of the Object class, the slot is called + * in the context of the thread that the object is bound to. If the signal is + * emitted from the same thread, the slot will be called synchronously, before + * Signal::emit() returns. If the signal is emitted from a different thread, + * the slot will be called asynchronously from the object's thread's event + * loop, after the Signal::emit() method returns, with a copy of the signal's + * arguments. The emitter shall thus ensure that any pointer or reference + * passed through the signal will remain valid after the signal is emitted. + */ + +/** + * \fn Signal::connect(T *object, R (T::*func)(Args...)) + * \brief Connect the signal to a member function slot + * \param[in] object The slot object pointer + * \param[in] func The slot member function + * + * If the typename T inherits from Object, the signal will be automatically + * disconnected from the \a func slot of \a object when \a object is destroyed. + * Otherwise the caller shall disconnect signals manually before destroying \a + * object. + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::connect(R (*func)(Args...)) + * \brief Connect the signal to a static function slot + * \param[in] func The slot static function + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::disconnect() + * \brief Disconnect the signal from all slots + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::disconnect(T *object) + * \brief Disconnect the signal from all slots of the \a object + * \param[in] object The object pointer whose slots to disconnect + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::disconnect(T *object, R (T::*func)(Args...)) + * \brief Disconnect the signal from the \a object slot member function \a func + * \param[in] object The object pointer whose slots to disconnect + * \param[in] func The slot member function to disconnect + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::disconnect(R (*func)(Args...)) + * \brief Disconnect the signal from the slot static function \a func + * \param[in] func The slot static function to disconnect + * + * \context This function is \threadsafe. + */ + +/** + * \fn Signal::emit(Args... args) + * \brief Emit the signal and call all connected slots + * \param args The arguments passed to the connected slots + * + * Emitting a signal calls all connected slots synchronously and sequentially in + * the order the slots have been connected. The arguments passed to the emit() + * function are passed to the slot functions unchanged. If a slot modifies one + * of the arguments (when passed by pointer or reference), the modification is + * thus visible to all subsequently called slots. + * + * This function is not \threadsafe, but thread-safety is guaranteed against + * concurrent connect() and disconnect() calls. + */ + +} /* namespace libcamera */ diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp new file mode 100644 index 00000000..c7c2d6b2 --- /dev/null +++ b/src/libcamera/base/thread.cpp @@ -0,0 +1,680 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * thread.cpp - Thread support + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +/** + * \page thread Thread Support + * + * libcamera supports multi-threaded applications through a threading model that + * sets precise rules to guarantee thread-safe usage of the API. Additionally, + * libcamera makes internal use of threads, and offers APIs that simplify + * interactions with application threads. Careful compliance with the threading + * model will ensure avoidance of race conditions. + * + * Every thread created by libcamera is associated with an instance of the + * Thread class. Those threads run an internal event loop by default to + * dispatch events to objects. Additionally, the main thread of the application + * (defined as the thread that calls CameraManager::start()) is also associated + * with a Thread instance, but has no event loop accessible to libcamera. Other + * application threads are not visible to libcamera. + * + * \section thread-objects Threads and Objects + * + * Instances of the Object class and all its derived classes are thread-aware + * and are bound to the thread they are created in. They are said to *live* in + * a thread, and they interact with the event loop of their thread for the + * purpose of message passing and signal delivery. Messages posted to the + * object with Object::postMessage() will be delivered from the event loop of + * the thread that the object lives in. Signals delivered to the object, unless + * explicitly connected with ConnectionTypeDirect, will also be delivered from + * the object thread's event loop. + * + * All Object instances created internally by libcamera are bound to internal + * threads. As objects interact with thread event loops for proper operation, + * creating an Object instance in a thread that has no internal event loop (such + * as the main application thread, or libcamera threads that have a custom main + * loop), prevents some features of the Object class from being used. See + * Thread::exec() for more details. + * + * \section thread-signals Threads and Signals + * + * When sent to a receiver that does not inherit from the Object class, signals + * are delivered synchronously in the thread of the sender. When the receiver + * inherits from the Object class, delivery is by default asynchronous if the + * sender and receiver live in different threads. In that case, the signal is + * posted to the receiver's message queue and will be delivered from the + * receiver's event loop, running in the receiver's thread. This mechanism can + * be overridden by selecting a different connection type when calling + * Signal::connect(). + * + * \section thread-reentrancy Reentrancy and Thread-Safety + * + * Through the documentation, several terms are used to define how classes and + * their member functions can be used from multiple threads. + * + * - A **reentrant** function may be called simultaneously from multiple + * threads if and only if each invocation uses a different instance of the + * class. This is the default for all member functions not explictly marked + * otherwise. + * + * - \anchor thread-safe A **thread-safe** function may be called + * simultaneously from multiple threads on the same instance of a class. A + * thread-safe function is thus reentrant. Thread-safe functions may also be + * called simultaneously with any other reentrant function of the same class + * on the same instance. + * + * - \anchor thread-bound A **thread-bound** function may be called only from + * the thread that the class instances lives in (see section \ref + * thread-objects). For instances of classes that do not derive from the + * Object class, this is the thread in which the instance was created. A + * thread-bound function is not thread-safe, and may or may not be reentrant. + * + * Neither reentrancy nor thread-safety, in this context, mean that a function + * may be called simultaneously from the same thread, for instance from a + * callback invoked by the function. This may deadlock and isn't allowed unless + * separately documented. + * + * A class is defined as reentrant, thread-safe or thread-bound if all its + * member functions are reentrant, thread-safe or thread-bound respectively. + * Some member functions may additionally be documented as having additional + * thread-related attributes. + * + * Most classes are reentrant but not thread-safe, as making them fully + * thread-safe would incur locking costs considered prohibitive for the + * expected use cases. + */ + +/** + * \file base/thread.h + * \brief Thread support + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Thread) + +class ThreadMain; + +/** + * \brief A queue of posted messages + */ +class MessageQueue +{ +public: + /** + * \brief List of queued Message instances + */ + std::list> list_; + /** + * \brief Protects the \ref list_ + */ + Mutex mutex_; +}; + +/** + * \brief Thread-local internal data + */ +class ThreadData +{ +public: + ThreadData() + : thread_(nullptr), running_(false), dispatcher_(nullptr) + { + } + + static ThreadData *current(); + +private: + friend class Thread; + friend class ThreadMain; + + Thread *thread_; + bool running_; + pid_t tid_; + + Mutex mutex_; + + std::atomic dispatcher_; + + std::condition_variable cv_; + std::atomic exit_; + int exitCode_; + + MessageQueue messages_; +}; + +/** + * \brief Thread wrapper for the main thread + */ +class ThreadMain : public Thread +{ +public: + ThreadMain() + { + data_->running_ = true; + } + +protected: + void run() override + { + LOG(Thread, Fatal) << "The main thread can't be restarted"; + } +}; + +static thread_local ThreadData *currentThreadData = nullptr; +static ThreadMain mainThread; + +/** + * \brief Retrieve thread-local internal data for the current thread + * \return The thread-local internal data for the current thread + */ +ThreadData *ThreadData::current() +{ + if (currentThreadData) + return currentThreadData; + + /* + * The main thread doesn't receive thread-local data when it is + * started, set it here. + */ + ThreadData *data = mainThread.data_; + data->tid_ = syscall(SYS_gettid); + currentThreadData = data; + return data; +} + +/** + * \typedef Mutex + * \brief An alias for std::mutex + */ + +/** + * \typedef MutexLocker + * \brief An alias for std::unique_lock + */ + +/** + * \class Thread + * \brief A thread of execution + * + * The Thread class is a wrapper around std::thread that handles integration + * with the Object, Signal and EventDispatcher classes. + * + * Thread instances by default run an event loop until the exit() method is + * called. The event loop dispatches events (messages, notifiers and timers) + * sent to the objects living in the thread. This behaviour can be modified by + * overriding the run() function. + * + * \section thread-stop Stopping Threads + * + * Threads can't be forcibly stopped. Instead, a thread user first requests the + * thread to exit and then waits for the thread's main function to react to the + * request and return, at which points the thread will stop. + * + * For threads running exec(), the exit() function is used to request the thread + * to exit. For threads subclassing the Thread class and implementing a custom + * run() function, a subclass-specific mechanism shall be provided. In either + * case, the wait() function shall be called to wait for the thread to stop. + * + * Due to their asynchronous nature, threads are subject to race conditions when + * they stop. This is of particular importance for messages posted to the thread + * with postMessage() (and the other mechanisms that rely on it, such as + * Object::invokeMethod() or asynchronous signal delivery). To understand the + * issues, three contexts need to be considered: + * + * - The worker is the Thread performing work and being instructed to stop. + * - The controller is the context which instructs the worker thread to stop. + * - The other contexts are any threads other than the worker and controller + * that interact with the worker thread. + * + * Messages posted to the worker thread from the controller context before + * calling exit() are queued to the thread's message queue, and the Thread class + * offers no guarantee that those messages will be processed before the thread + * stops. This allows threads to stop fast. + * + * A thread that requires delivery of messages posted from the controller + * context before exit() should reimplement the run() function and call + * dispatchMessages() after exec(). + * + * Messages posted to the worker thread from the other contexts are asynchronous + * with respect to the exit() call from the controller context. There is no + * guarantee as to whether those messages will be processed or not before the + * thread stops. + * + * Messages that are not processed will stay in the queue, in the exact same way + * as messages posted after the thread has stopped. They will be processed when + * the thread is restarted. If the thread is never restarted, they will be + * deleted without being processed when the Thread instance is destroyed. + */ + +/** + * \brief Create a thread + */ +Thread::Thread() +{ + data_ = new ThreadData; + data_->thread_ = this; +} + +Thread::~Thread() +{ + delete data_->dispatcher_.load(std::memory_order_relaxed); + delete data_; +} + +/** + * \brief Start the thread + */ +void Thread::start() +{ + MutexLocker locker(data_->mutex_); + + if (data_->running_) + return; + + data_->running_ = true; + data_->exitCode_ = -1; + data_->exit_.store(false, std::memory_order_relaxed); + + thread_ = std::thread(&Thread::startThread, this); +} + +void Thread::startThread() +{ + struct ThreadCleaner { + ThreadCleaner(Thread *thread, void (Thread::*cleaner)()) + : thread_(thread), cleaner_(cleaner) + { + } + ~ThreadCleaner() + { + (thread_->*cleaner_)(); + } + + Thread *thread_; + void (Thread::*cleaner_)(); + }; + + /* + * Make sure the thread is cleaned up even if the run method exits + * abnormally (for instance via a direct call to pthread_cancel()). + */ + thread_local ThreadCleaner cleaner(this, &Thread::finishThread); + + data_->tid_ = syscall(SYS_gettid); + currentThreadData = data_; + + run(); +} + +/** + * \brief Enter the event loop + * + * This method enters an event loop based on the event dispatcher instance for + * the thread, and blocks until the exit() method is called. It is meant to be + * called within the thread from the run() method and shall not be called + * outside of the thread. + * + * \return The exit code passed to the exit() method + */ +int Thread::exec() +{ + MutexLocker locker(data_->mutex_); + + EventDispatcher *dispatcher = eventDispatcher(); + + locker.unlock(); + + while (!data_->exit_.load(std::memory_order_acquire)) + dispatcher->processEvents(); + + locker.lock(); + + return data_->exitCode_; +} + +/** + * \brief Main method of the thread + * + * When the thread is started with start(), it calls this method in the context + * of the new thread. The run() method can be overridden to perform custom + * work, either custom initialization and cleanup before and after calling the + * Thread::exec() function, or a custom thread loop altogether. When this + * method returns the thread execution is stopped, and the \ref finished signal + * is emitted. + * + * Note that if this function is overridden and doesn't call Thread::exec(), no + * events will be dispatched to the objects living in the thread. These objects + * will not be able to use the EventNotifier, Timer or Message facilities. This + * includes functions that rely on message dispatching, such as + * Object::deleteLater(). + * + * The base implementation just calls exec(). + */ +void Thread::run() +{ + exec(); +} + +void Thread::finishThread() +{ + data_->mutex_.lock(); + data_->running_ = false; + data_->mutex_.unlock(); + + finished.emit(this); + data_->cv_.notify_all(); +} + +/** + * \brief Stop the thread's event loop + * \param[in] code The exit code + * + * This method interrupts the event loop started by the exec() method, causing + * exec() to return \a code. + * + * Calling exit() on a thread that reimplements the run() method and doesn't + * call exec() will likely have no effect. + * + * \context This function is \threadsafe. + */ +void Thread::exit(int code) +{ + data_->exitCode_ = code; + data_->exit_.store(true, std::memory_order_release); + + EventDispatcher *dispatcher = data_->dispatcher_.load(std::memory_order_relaxed); + if (!dispatcher) + return; + + dispatcher->interrupt(); +} + +/** + * \brief Wait for the thread to finish + * \param[in] duration Maximum wait duration + * + * This function waits until the thread finishes or the \a duration has + * elapsed, whichever happens first. If \a duration is equal to + * utils::duration::max(), the wait never times out. If the thread is not + * running the function returns immediately. + * + * \context This function is \threadsafe. + * + * \return True if the thread has finished, or false if the wait timed out + */ +bool Thread::wait(utils::duration duration) +{ + bool hasFinished = true; + + { + MutexLocker locker(data_->mutex_); + + if (duration == utils::duration::max()) + data_->cv_.wait(locker, [&]() { return !data_->running_; }); + else + hasFinished = data_->cv_.wait_for(locker, duration, + [&]() { return !data_->running_; }); + } + + if (thread_.joinable()) + thread_.join(); + + return hasFinished; +} + +/** + * \brief Check if the thread is running + * + * A Thread instance is considered as running once the underlying thread has + * started. This method guarantees that it returns true after the start() + * method returns, and false after the wait() method returns. + * + * \context This function is \threadsafe. + * + * \return True if the thread is running, false otherwise + */ +bool Thread::isRunning() +{ + MutexLocker locker(data_->mutex_); + return data_->running_; +} + +/** + * \var Thread::finished + * \brief Signal the end of thread execution + */ + +/** + * \brief Retrieve the Thread instance for the current thread + * \context This function is \threadsafe. + * \return The Thread instance for the current thread + */ +Thread *Thread::current() +{ + ThreadData *data = ThreadData::current(); + return data->thread_; +} + +/** + * \brief Retrieve the ID of the current thread + * + * The thread ID corresponds to the Linux thread ID (TID) as returned by the + * gettid system call. + * + * \context This function is \threadsafe. + * + * \return The ID of the current thread + */ +pid_t Thread::currentId() +{ + ThreadData *data = ThreadData::current(); + return data->tid_; +} + +/** + * \brief Retrieve the event dispatcher + * + * This function retrieves the internal event dispatcher for the thread. The + * returned event dispatcher is valid until the thread is destroyed. + * + * \context This function is \threadsafe. + * + * \return Pointer to the event dispatcher + */ +EventDispatcher *Thread::eventDispatcher() +{ + if (!data_->dispatcher_.load(std::memory_order_relaxed)) + data_->dispatcher_.store(new EventDispatcherPoll(), + std::memory_order_release); + + return data_->dispatcher_.load(std::memory_order_relaxed); +} + +/** + * \brief Post a message to the thread for the \a receiver + * \param[in] msg The message + * \param[in] receiver The receiver + * + * This method stores the message \a msg in the message queue of the thread for + * the \a receiver and wake up the thread's event loop. Message ownership is + * passed to the thread, and the message will be deleted after being delivered. + * + * Messages are delivered through the thread's event loop. If the thread is not + * running its event loop the message will not be delivered until the event + * loop gets started. + * + * When the thread is stopped, posted messages may not have all been processed. + * See \ref thread-stop for additional information. + * + * If the \a receiver is not bound to this thread the behaviour is undefined. + * + * \sa exec() + */ +void Thread::postMessage(std::unique_ptr msg, Object *receiver) +{ + msg->receiver_ = receiver; + + ASSERT(data_ == receiver->thread()->data_); + + MutexLocker locker(data_->messages_.mutex_); + data_->messages_.list_.push_back(std::move(msg)); + receiver->pendingMessages_++; + locker.unlock(); + + EventDispatcher *dispatcher = + data_->dispatcher_.load(std::memory_order_acquire); + if (dispatcher) + dispatcher->interrupt(); +} + +/** + * \brief Remove all posted messages for the \a receiver + * \param[in] receiver The receiver + * + * If the \a receiver is not bound to this thread the behaviour is undefined. + */ +void Thread::removeMessages(Object *receiver) +{ + ASSERT(data_ == receiver->thread()->data_); + + MutexLocker locker(data_->messages_.mutex_); + if (!receiver->pendingMessages_) + return; + + std::vector> toDelete; + for (std::unique_ptr &msg : data_->messages_.list_) { + if (!msg) + continue; + if (msg->receiver_ != receiver) + continue; + + /* + * Move the message to the pending deletion list to delete it + * after releasing the lock. The messages list element will + * contain a null pointer, and will be removed when dispatching + * messages. + */ + toDelete.push_back(std::move(msg)); + receiver->pendingMessages_--; + } + + ASSERT(!receiver->pendingMessages_); + locker.unlock(); + + toDelete.clear(); +} + +/** + * \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. + * + * Messages shall only be dispatched from the current thread, typically within + * the thread from the run() function. Calling this function outside of the + * thread results in undefined behaviour. + */ +void Thread::dispatchMessages(Message::Type type) +{ + ASSERT(data_ == ThreadData::current()); + + MutexLocker locker(data_->messages_.mutex_); + + std::list> &messages = data_->messages_.list_; + + for (auto iter = messages.begin(); iter != messages.end(); ) { + std::unique_ptr &msg = *iter; + + if (!msg) { + iter = data_->messages_.list_.erase(iter); + continue; + } + + if (type != Message::Type::None && msg->type() != type) { + ++iter; + continue; + } + + std::unique_ptr 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(message.get()); + message.reset(); + locker.lock(); + } +} + +/** + * \brief Move an \a object and all its children to the thread + * \param[in] object The object + */ +void Thread::moveObject(Object *object) +{ + ThreadData *currentData = object->thread_->data_; + ThreadData *targetData = data_; + + MutexLocker lockerFrom(currentData->messages_.mutex_, std::defer_lock); + MutexLocker lockerTo(targetData->messages_.mutex_, std::defer_lock); + std::lock(lockerFrom, lockerTo); + + moveObject(object, currentData, targetData); +} + +void Thread::moveObject(Object *object, ThreadData *currentData, + ThreadData *targetData) +{ + /* Move pending messages to the message queue of the new thread. */ + if (object->pendingMessages_) { + unsigned int movedMessages = 0; + + for (std::unique_ptr &msg : currentData->messages_.list_) { + if (!msg) + continue; + if (msg->receiver_ != object) + continue; + + targetData->messages_.list_.push_back(std::move(msg)); + movedMessages++; + } + + if (movedMessages) { + EventDispatcher *dispatcher = + targetData->dispatcher_.load(std::memory_order_acquire); + if (dispatcher) + dispatcher->interrupt(); + } + } + + object->thread_ = this; + + /* Move all children. */ + for (auto child : object->children_) + moveObject(child, currentData, targetData); +} + +} /* namespace libcamera */ diff --git a/src/libcamera/base/timer.cpp b/src/libcamera/base/timer.cpp new file mode 100644 index 00000000..9c54352d --- /dev/null +++ b/src/libcamera/base/timer.cpp @@ -0,0 +1,185 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * timer.cpp - Generic timer + */ + +#include + +#include + +#include +#include +#include +#include +#include + +#include + +/** + * \file base/timer.h + * \brief Generic timer + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Timer) + +/** + * \class Timer + * \brief Single-shot timer interface + * + * The Timer class models a single-shot timer that is started with start() and + * emits the \ref timeout signal when it times out. + * + * Once started the timer will run until it times out. It can be stopped with + * stop(), and once it times out or is stopped, can be started again with + * start(). + * + * The timer deadline is specified as either a duration in milliseconds or an + * absolute time point. If the deadline is set to the current time or to the + * past, the timer will time out immediately when execution returns to the + * event loop of the timer's thread. + * + * Timers run in the thread they belong to, and thus emit the \a ref timeout + * signal from that thread. To avoid race conditions they must not be started + * or stopped from a different thread, attempts to do so will be rejected and + * logged, and may cause undefined behaviour. + */ + +/** + * \brief Construct a timer + * \param[in] parent The parent Object + */ +Timer::Timer(Object *parent) + : Object(parent), running_(false) +{ +} + +Timer::~Timer() +{ + stop(); +} + +/** + * \fn Timer::start(unsigned int msec) + * \brief Start or restart the timer with a timeout of \a msec + * \param[in] msec The timer duration in milliseconds + * + * If the timer is already running it will be stopped and restarted. + * + * \context This function is \threadbound. + */ + +/** + * \brief Start or restart the timer with a timeout of \a duration + * \param[in] duration The timer duration in milliseconds + * + * If the timer is already running it will be stopped and restarted. + * + * \context This function is \threadbound. + */ +void Timer::start(std::chrono::milliseconds duration) +{ + start(utils::clock::now() + duration); +} + +/** + * \brief Start or restart the timer with a \a deadline + * \param[in] deadline The timer deadline + * + * If the timer is already running it will be stopped and restarted. + * + * \context This function is \threadbound. + */ +void Timer::start(std::chrono::steady_clock::time_point deadline) +{ + if (Thread::current() != thread()) { + LOG(Timer, Error) << "Timer can't be started from another thread"; + return; + } + + deadline_ = deadline; + + LOG(Timer, Debug) + << "Starting timer " << this << ": deadline " + << utils::time_point_to_string(deadline_); + + if (isRunning()) + unregisterTimer(); + + registerTimer(); +} + +/** + * \brief Stop the timer + * + * After this function returns the timer is guaranteed not to emit the + * \ref timeout signal. + * + * If the timer is not running this function performs no operation. + * + * \context This function is \threadbound. + */ +void Timer::stop() +{ + if (!isRunning()) + return; + + if (Thread::current() != thread()) { + LOG(Timer, Error) << "Timer can't be stopped from another thread"; + return; + } + + unregisterTimer(); +} + +void Timer::registerTimer() +{ + thread()->eventDispatcher()->registerTimer(this); + running_ = true; +} + +void Timer::unregisterTimer() +{ + running_ = false; + thread()->eventDispatcher()->unregisterTimer(this); +} + +/** + * \brief Check if the timer is running + * \return True if the timer is running, false otherwise + */ +bool Timer::isRunning() const +{ + return running_; +} + +/** + * \fn Timer::deadline() + * \brief Retrieve the timer deadline + * \return The timer deadline + */ + +/** + * \var Timer::timeout + * \brief Signal emitted when the timer times out + * + * The timer pointer is passed as a parameter. + */ + +void Timer::message(Message *msg) +{ + if (msg->type() == Message::ThreadMoveMessage) { + if (isRunning()) { + unregisterTimer(); + invokeMethod(&Timer::registerTimer, + ConnectionTypeQueued); + } + } + + Object::message(msg); +} + +} /* namespace libcamera */ diff --git a/src/libcamera/bound_method.cpp b/src/libcamera/bound_method.cpp deleted file mode 100644 index 4965bb5e..00000000 --- a/src/libcamera/bound_method.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * bound_method.cpp - Method bind and invocation - */ - -#include - -#include "libcamera/internal/message.h" -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" - -/** - * \file bound_method.h - * \brief Method bind and invocation - */ - -namespace libcamera { - -/** - * \enum ConnectionType - * \brief Connection type for asynchronous communication - * - * This enumeration describes the possible types of asynchronous communication - * between a sender and a receiver. It applies to Signal::emit() and - * Object::invokeMethod(). - * - * \var ConnectionTypeAuto - * \brief If the sender and the receiver live in the same thread, - * ConnectionTypeDirect is used. Otherwise ConnectionTypeQueued is used. - * - * \var ConnectionTypeDirect - * \brief The receiver is invoked immediately and synchronously in the sender's - * thread. - * - * \var ConnectionTypeQueued - * \brief The receiver is invoked asynchronously - * - * Invoke the receiver asynchronously in its thread when control returns to the - * thread's event loop. The sender proceeds without waiting for the invocation - * to complete. - * - * \var ConnectionTypeBlocking - * \brief The receiver is invoked synchronously - * - * If the sender and the receiver live in the same thread, this is equivalent to - * ConnectionTypeDirect. Otherwise, the receiver is invoked asynchronously in - * its thread when control returns to the thread's event loop. The sender - * blocks until the receiver signals the completion of the invocation. - */ - -/** - * \brief Invoke the bound method with packed arguments - * \param[in] pack Packed arguments - * \param[in] deleteMethod True to delete \a this bound method instance when - * method invocation completes - * - * The bound method stores its return value, if any, in the arguments \a pack. - * For direct and blocking invocations, this is performed synchronously, and - * the return value contained in the pack may be used. For queued invocations, - * the return value is stored at an undefined point of time and shall thus not - * be used by the caller. - * - * \return True if the return value contained in the \a pack may be used by the - * caller, false otherwise - */ -bool BoundMethodBase::activatePack(std::shared_ptr pack, - bool deleteMethod) -{ - ConnectionType type = connectionType_; - if (type == ConnectionTypeAuto) { - if (Thread::current() == object_->thread()) - type = ConnectionTypeDirect; - else - type = ConnectionTypeQueued; - } else if (type == ConnectionTypeBlocking) { - if (Thread::current() == object_->thread()) - type = ConnectionTypeDirect; - } - - switch (type) { - case ConnectionTypeDirect: - default: - invokePack(pack.get()); - if (deleteMethod) - delete this; - return true; - - case ConnectionTypeQueued: { - std::unique_ptr msg = - std::make_unique(this, pack, nullptr, deleteMethod); - object_->postMessage(std::move(msg)); - return false; - } - - case ConnectionTypeBlocking: { - Semaphore semaphore; - - std::unique_ptr msg = - std::make_unique(this, pack, &semaphore, deleteMethod); - object_->postMessage(std::move(msg)); - - semaphore.acquire(); - return true; - } - } -} - -} /* namespace libcamera */ diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index ca999429..e4c345d5 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -13,7 +13,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file libcamera/buffer.h diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp index 7fc6f694..b67bb928 100644 --- a/src/libcamera/byte_stream_buffer.cpp +++ b/src/libcamera/byte_stream_buffer.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file byte_stream_buffer.h diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 1340c266..de0123ae 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -11,13 +11,14 @@ #include #include +#include +#include + #include #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" -#include "libcamera/internal/thread.h" /** * \file camera.h diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index a3784db6..fc3bd88c 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -14,12 +14,13 @@ #include +#include +#include + #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" /** * \file camera_manager.h diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp index fc4ea78d..7b7279ef 100644 --- a/src/libcamera/camera_sensor_properties.cpp +++ b/src/libcamera/camera_sensor_properties.cpp @@ -9,9 +9,9 @@ #include -#include +#include -#include "libcamera/internal/log.h" +#include /** * \file camera_sensor_properties.h diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index 09744413..dd5a2608 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -11,13 +11,14 @@ #include #include +#include + #include #include #include #include #include "libcamera/internal/byte_stream_buffer.h" -#include "libcamera/internal/log.h" /** * \file control_serializer.h diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 7df372ad..34317fa0 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -12,10 +12,10 @@ #include #include +#include #include #include "libcamera/internal/control_validator.h" -#include "libcamera/internal/log.h" /** * \file controls.h diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp index 0bf81b51..90ce7e0b 100644 --- a/src/libcamera/delayed_controls.cpp +++ b/src/libcamera/delayed_controls.cpp @@ -7,9 +7,10 @@ #include "libcamera/internal/delayed_controls.h" +#include + #include -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_device.h" /** diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index e6ecc360..1f33faf5 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -11,7 +11,8 @@ #include -#include "libcamera/internal/log.h" +#include + #include "libcamera/internal/media_device.h" /** diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp index ff728852..686bb809 100644 --- a/src/libcamera/device_enumerator_sysfs.cpp +++ b/src/libcamera/device_enumerator_sysfs.cpp @@ -17,7 +17,8 @@ #include #include -#include "libcamera/internal/log.h" +#include + #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index d26fcf10..4b842773 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -17,8 +17,9 @@ #include #include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/event_dispatcher.cpp deleted file mode 100644 index e0ce1eb3..00000000 --- a/src/libcamera/event_dispatcher.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_dispatcher.cpp - Event dispatcher - */ - -#include "libcamera/internal/event_dispatcher.h" - -#include "libcamera/internal/log.h" - -/** - * \file event_dispatcher.h - */ - -namespace libcamera { - -LOG_DEFINE_CATEGORY(Event) - -/** - * \class EventDispatcher - * \brief Interface to manage the libcamera events and timers - * - * The EventDispatcher class allows the integration of the application event - * loop with libcamera by abstracting how events and timers are managed and - * processed. - * - * To listen to events, libcamera creates EventNotifier instances and registers - * them with the dispatcher with registerEventNotifier(). The event notifier - * \ref EventNotifier::activated signal is then emitted by the dispatcher - * whenever the event is detected. - * - * To set timers, libcamera creates Timer instances and registers them with the - * dispatcher with registerTimer(). The timer \ref Timer::timeout signal is then - * emitted by the dispatcher when the timer times out. - */ - -EventDispatcher::~EventDispatcher() -{ -} - -/** - * \fn EventDispatcher::registerEventNotifier() - * \brief Register an event notifier - * \param[in] notifier The event notifier to register - * - * Once the \a notifier is registered with the dispatcher, the dispatcher will - * emit the notifier \ref EventNotifier::activated signal whenever a - * corresponding event is detected on the notifier's file descriptor. The event - * is monitored until the notifier is unregistered with - * unregisterEventNotifier(). - * - * Registering multiple notifiers for the same file descriptor and event type is - * not allowed and results in undefined behaviour. - */ - -/** - * \fn EventDispatcher::unregisterEventNotifier() - * \brief Unregister an event notifier - * \param[in] notifier The event notifier to unregister - * - * After this function returns the \a notifier is guaranteed not to emit the - * \ref EventNotifier::activated signal. - * - * If the notifier isn't registered, this function performs no operation. - */ - -/** - * \fn EventDispatcher::registerTimer() - * \brief Register a timer - * \param[in] timer The timer to register - * - * Once the \a timer is registered with the dispatcher, the dispatcher will emit - * the timer \ref Timer::timeout signal when the timer times out. The timer can - * be unregistered with unregisterTimer() before it times out, in which case the - * signal will not be emitted. - * - * When the \a timer times out, it is automatically unregistered by the - * dispatcher and can be registered back as early as from the \ref Timer::timeout - * signal handlers. - * - * Registering the same timer multiple times is not allowed and results in - * undefined behaviour. - */ - -/** - * \fn EventDispatcher::unregisterTimer() - * \brief Unregister a timer - * \param[in] timer The timer to unregister - * - * After this function returns the \a timer is guaranteed not to emit the - * \ref Timer::timeout signal. - * - * If the timer isn't registered, this function performs no operation. - */ - -/** - * \fn EventDispatcher::processEvents() - * \brief Wait for and process pending events - * - * This function processes all pending events associated with registered event - * notifiers and timers and signals the corresponding EventNotifier and Timer - * objects. If no events are pending, it waits for the first event and processes - * it before returning. - */ - -/** - * \fn EventDispatcher::interrupt() - * \brief Interrupt any running processEvents() call as soon as possible - * - * Calling this function interrupts any blocking processEvents() call in - * progress. The processEvents() function will return as soon as possible, - * after processing pending timers and events. If processEvents() isn't in - * progress, it will be interrupted immediately the next time it gets called. - */ - -} /* namespace libcamera */ diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp deleted file mode 100644 index 0b6aee18..00000000 --- a/src/libcamera/event_dispatcher_poll.cpp +++ /dev/null @@ -1,308 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_dispatcher_poll.cpp - Poll-based event dispatcher - */ - -#include "libcamera/internal/event_dispatcher_poll.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" - -/** - * \file event_dispatcher_poll.h - */ - -namespace libcamera { - -LOG_DECLARE_CATEGORY(Event) - -static const char *notifierType(EventNotifier::Type type) -{ - if (type == EventNotifier::Read) - return "read"; - if (type == EventNotifier::Write) - return "write"; - if (type == EventNotifier::Exception) - return "exception"; - - return ""; -} - -/** - * \class EventDispatcherPoll - * \brief A poll-based event dispatcher - */ - -EventDispatcherPoll::EventDispatcherPoll() - : processingEvents_(false) -{ - /* - * Create the event fd. Failures are fatal as we can't implement an - * interruptible dispatcher without the fd. - */ - eventfd_ = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); - if (eventfd_ < 0) - LOG(Event, Fatal) << "Unable to create eventfd"; -} - -EventDispatcherPoll::~EventDispatcherPoll() -{ - close(eventfd_); -} - -void EventDispatcherPoll::registerEventNotifier(EventNotifier *notifier) -{ - EventNotifierSetPoll &set = notifiers_[notifier->fd()]; - EventNotifier::Type type = notifier->type(); - - if (set.notifiers[type] && set.notifiers[type] != notifier) { - LOG(Event, Warning) - << "Ignoring duplicate " << notifierType(type) - << " notifier for fd " << notifier->fd(); - return; - } - - set.notifiers[type] = notifier; -} - -void EventDispatcherPoll::unregisterEventNotifier(EventNotifier *notifier) -{ - auto iter = notifiers_.find(notifier->fd()); - if (iter == notifiers_.end()) - return; - - EventNotifierSetPoll &set = iter->second; - EventNotifier::Type type = notifier->type(); - - if (!set.notifiers[type]) - return; - - if (set.notifiers[type] != notifier) { - LOG(Event, Warning) - << notifierType(type) << " notifier for fd " - << notifier->fd() << " is not registered"; - return; - } - - set.notifiers[type] = nullptr; - - /* - * Don't race with event processing if this method is called from an - * event notifier. The notifiers_ entry will be erased by - * processEvents(). - */ - if (processingEvents_) - return; - - if (!set.notifiers[0] && !set.notifiers[1] && !set.notifiers[2]) - notifiers_.erase(iter); -} - -void EventDispatcherPoll::registerTimer(Timer *timer) -{ - for (auto iter = timers_.begin(); iter != timers_.end(); ++iter) { - if ((*iter)->deadline() > timer->deadline()) { - timers_.insert(iter, timer); - return; - } - } - - timers_.push_back(timer); -} - -void EventDispatcherPoll::unregisterTimer(Timer *timer) -{ - for (auto iter = timers_.begin(); iter != timers_.end(); ++iter) { - if (*iter == timer) { - timers_.erase(iter); - return; - } - - /* - * As the timers list is ordered, we can stop as soon as we go - * past the deadline. - */ - if ((*iter)->deadline() > timer->deadline()) - break; - } -} - -void EventDispatcherPoll::processEvents() -{ - int ret; - - Thread::current()->dispatchMessages(); - - /* Create the pollfd array. */ - std::vector pollfds; - pollfds.reserve(notifiers_.size() + 1); - - for (auto notifier : notifiers_) - pollfds.push_back({ notifier.first, notifier.second.events(), 0 }); - - pollfds.push_back({ eventfd_, POLLIN, 0 }); - - /* Wait for events and process notifiers and timers. */ - do { - ret = poll(&pollfds); - } while (ret == -1 && errno == EINTR); - - if (ret < 0) { - ret = -errno; - LOG(Event, Warning) << "poll() failed with " << strerror(-ret); - } else if (ret > 0) { - processInterrupt(pollfds.back()); - pollfds.pop_back(); - processNotifiers(pollfds); - } - - processTimers(); -} - -void EventDispatcherPoll::interrupt() -{ - uint64_t value = 1; - ssize_t ret = write(eventfd_, &value, sizeof(value)); - if (ret != sizeof(value)) { - if (ret < 0) - ret = -errno; - LOG(Event, Error) - << "Failed to interrupt event dispatcher (" - << ret << ")"; - } -} - -short EventDispatcherPoll::EventNotifierSetPoll::events() const -{ - short events = 0; - - if (notifiers[EventNotifier::Read]) - events |= POLLIN; - if (notifiers[EventNotifier::Write]) - events |= POLLOUT; - if (notifiers[EventNotifier::Exception]) - events |= POLLPRI; - - return events; -} - -int EventDispatcherPoll::poll(std::vector *pollfds) -{ - /* Compute the timeout. */ - Timer *nextTimer = !timers_.empty() ? timers_.front() : nullptr; - struct timespec timeout; - - if (nextTimer) { - utils::time_point now = utils::clock::now(); - - if (nextTimer->deadline() > now) - timeout = utils::duration_to_timespec(nextTimer->deadline() - now); - else - timeout = { 0, 0 }; - - LOG(Event, Debug) - << "timeout " << timeout.tv_sec << "." - << std::setfill('0') << std::setw(9) - << timeout.tv_nsec; - } - - return ppoll(pollfds->data(), pollfds->size(), - nextTimer ? &timeout : nullptr, nullptr); -} - -void EventDispatcherPoll::processInterrupt(const struct pollfd &pfd) -{ - if (!(pfd.revents & POLLIN)) - return; - - uint64_t value; - ssize_t ret = read(eventfd_, &value, sizeof(value)); - if (ret != sizeof(value)) { - if (ret < 0) - ret = -errno; - LOG(Event, Error) - << "Failed to process interrupt (" << ret << ")"; - } -} - -void EventDispatcherPoll::processNotifiers(const std::vector &pollfds) -{ - static const struct { - EventNotifier::Type type; - short events; - } events[] = { - { EventNotifier::Read, POLLIN }, - { EventNotifier::Write, POLLOUT }, - { EventNotifier::Exception, POLLPRI }, - }; - - processingEvents_ = true; - - for (const pollfd &pfd : pollfds) { - auto iter = notifiers_.find(pfd.fd); - ASSERT(iter != notifiers_.end()); - - EventNotifierSetPoll &set = iter->second; - - for (const auto &event : events) { - EventNotifier *notifier = set.notifiers[event.type]; - - if (!notifier) - continue; - - /* - * If the file descriptor is invalid, disable the - * notifier immediately. - */ - if (pfd.revents & POLLNVAL) { - LOG(Event, Warning) - << "Disabling " << notifierType(event.type) - << " due to invalid file descriptor " - << pfd.fd; - unregisterEventNotifier(notifier); - continue; - } - - if (pfd.revents & event.events) - notifier->activated.emit(notifier); - } - - /* Erase the notifiers_ entry if it is now empty. */ - if (!set.notifiers[0] && !set.notifiers[1] && !set.notifiers[2]) - notifiers_.erase(iter); - } - - processingEvents_ = false; -} - -void EventDispatcherPoll::processTimers() -{ - utils::time_point now = utils::clock::now(); - - while (!timers_.empty()) { - Timer *timer = timers_.front(); - if (timer->deadline() > now) - break; - - timers_.pop_front(); - timer->stop(); - timer->timeout.emit(timer); - } -} - -} /* namespace libcamera */ diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index 6b0575c0..784016a9 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include +#include /** * \file event_notifier.h diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index bce2b613..def0f60d 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -14,7 +14,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file file.h diff --git a/src/libcamera/file_descriptor.cpp b/src/libcamera/file_descriptor.cpp index 8b505ed3..638b3bbe 100644 --- a/src/libcamera/file_descriptor.cpp +++ b/src/libcamera/file_descriptor.cpp @@ -11,7 +11,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file file_descriptor.h diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 55822f4c..59a34853 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -10,9 +10,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include /** * \file internal/formats.h diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp index 2fbba37a..86a57923 100644 --- a/src/libcamera/framebuffer_allocator.cpp +++ b/src/libcamera/framebuffer_allocator.cpp @@ -9,11 +9,12 @@ #include +#include + #include #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 13644689..9bbef0b5 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file geometry.h diff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp index 131b3bd6..fb941e6b 100644 --- a/src/libcamera/ipa_data_serializer.cpp +++ b/src/libcamera/ipa_data_serializer.cpp @@ -7,7 +7,7 @@ #include "libcamera/internal/ipa_data_serializer.h" -#include "libcamera/internal/log.h" +#include /** * \file ipa_data_serializer.h diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 263cacd6..35c72598 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -12,12 +12,12 @@ #include #include +#include #include #include "libcamera/internal/file.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index a4e7fb86..7ab55579 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -23,10 +23,10 @@ #include +#include #include #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index ca980ec7..babcc48b 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -12,10 +12,10 @@ #include #include +#include #include #include "libcamera/internal/ipa_module.h" -#include "libcamera/internal/log.h" /** * \file ipa_proxy.h diff --git a/src/libcamera/ipc_pipe.cpp b/src/libcamera/ipc_pipe.cpp index c402c8d0..28e20e03 100644 --- a/src/libcamera/ipc_pipe.cpp +++ b/src/libcamera/ipc_pipe.cpp @@ -7,7 +7,7 @@ #include "libcamera/internal/ipc_pipe.h" -#include "libcamera/internal/log.h" +#include /** * \file ipc_pipe.h diff --git a/src/libcamera/ipc_pipe_unixsocket.cpp b/src/libcamera/ipc_pipe_unixsocket.cpp index db0e260f..4511775f 100644 --- a/src/libcamera/ipc_pipe_unixsocket.cpp +++ b/src/libcamera/ipc_pipe_unixsocket.cpp @@ -9,13 +9,14 @@ #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include +#include + #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" namespace libcamera { diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index fdb359f7..14665970 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -12,8 +12,9 @@ #include #include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" /** * \file ipc_unixsocket.h diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp deleted file mode 100644 index 5ff0e901..00000000 --- a/src/libcamera/log.cpp +++ /dev/null @@ -1,999 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2018, Google Inc. - * - * log.cpp - Logging infrastructure - */ - -#include "libcamera/internal/log.h" - -#include -#if HAVE_BACKTRACE -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include "libcamera/internal/thread.h" - -/** - * \file log.h - * \brief Logging infrastructure - * - * libcamera includes a logging infrastructure used through the library that - * allows inspection of internal operation in a user-configurable way. The log - * messages are grouped in categories that represent areas of libcamera, and - * output of messages for each category can be controlled by independent log - * levels. - * - * The levels are configurable through the LIBCAMERA_LOG_LEVELS environment - * variable that contains a comma-separated list of 'category:level' pairs. - * - * The category names are strings and can include a wildcard ('*') character at - * the end to match multiple categories. - * - * The level are either numeric values, or strings containing the log level - * name. The available log levels are DEBUG, INFO, WARN, ERROR and FATAL. Log - * message with a level higher than or equal to the configured log level for - * their category are output to the log, while other messages are silently - * discarded. - * - * By default log messages are output to stderr. They can be redirected to a log - * file by setting the LIBCAMERA_LOG_FILE environment variable to the name of - * the file. The file must be writable and is truncated if it exists. If any - * error occurs when opening the file, the file is ignored and the log is output - * to stderr. - */ - -/** - * \file logging.h - * \brief Logging management - * - * API to change the logging output destination and log levels programatically. - */ - -namespace libcamera { - -static int log_severity_to_syslog(LogSeverity severity) -{ - switch (severity) { - case LogDebug: - return LOG_DEBUG; - case LogInfo: - return LOG_INFO; - case LogWarning: - return LOG_WARNING; - case LogError: - return LOG_ERR; - case LogFatal: - return LOG_ALERT; - default: - return LOG_NOTICE; - } -} - -static const char *log_severity_name(LogSeverity severity) -{ - static const char *const names[] = { - "DEBUG", - " INFO", - " WARN", - "ERROR", - "FATAL", - }; - - if (static_cast(severity) < std::size(names)) - return names[severity]; - else - return "UNKWN"; -} - -/** - * \brief Log output - * - * The LogOutput class models a log output destination - */ -class LogOutput -{ -public: - LogOutput(const char *path); - LogOutput(std::ostream *stream); - LogOutput(); - ~LogOutput(); - - bool isValid() const; - void write(const LogMessage &msg); - void write(const std::string &msg); - -private: - void writeSyslog(LogSeverity severity, const std::string &msg); - void writeStream(const std::string &msg); - - std::ostream *stream_; - LoggingTarget target_; -}; - -/** - * \brief Construct a log output based on a file - * \param[in] path Full path to log file - */ -LogOutput::LogOutput(const char *path) - : target_(LoggingTargetFile) -{ - stream_ = new std::ofstream(path); -} - -/** - * \brief Construct a log output based on a stream - * \param[in] stream Stream to send log output to - */ -LogOutput::LogOutput(std::ostream *stream) - : stream_(stream), target_(LoggingTargetStream) -{ -} - -/** - * \brief Construct a log output to syslog - */ -LogOutput::LogOutput() - : stream_(nullptr), target_(LoggingTargetSyslog) -{ - openlog("libcamera", LOG_PID, 0); -} - -LogOutput::~LogOutput() -{ - switch (target_) { - case LoggingTargetFile: - delete stream_; - break; - case LoggingTargetSyslog: - closelog(); - break; - default: - break; - } -} - -/** - * \brief Check if the log output is valid - * \return True if the log output is valid - */ -bool LogOutput::isValid() const -{ - switch (target_) { - case LoggingTargetFile: - return stream_->good(); - case LoggingTargetStream: - return stream_ != nullptr; - default: - return true; - } -} - -/** - * \brief Write message to log output - * \param[in] msg Message to write - */ -void LogOutput::write(const LogMessage &msg) -{ - std::string str; - - switch (target_) { - case LoggingTargetSyslog: - str = std::string(log_severity_name(msg.severity())) + " " - + msg.category().name() + " " + msg.fileInfo() + " " - + msg.msg(); - writeSyslog(msg.severity(), str); - break; - case LoggingTargetStream: - case LoggingTargetFile: - str = "[" + utils::time_point_to_string(msg.timestamp()) + "] [" - + std::to_string(Thread::currentId()) + "] " - + log_severity_name(msg.severity()) + " " - + msg.category().name() + " " + msg.fileInfo() + " " - + msg.msg(); - writeStream(str); - break; - default: - break; - } -} - -/** - * \brief Write string to log output - * \param[in] str String to write - */ -void LogOutput::write(const std::string &str) -{ - switch (target_) { - case LoggingTargetSyslog: - writeSyslog(LogDebug, str); - break; - case LoggingTargetStream: - case LoggingTargetFile: - writeStream(str); - break; - default: - break; - } -} - -void LogOutput::writeSyslog(LogSeverity severity, const std::string &str) -{ - syslog(log_severity_to_syslog(severity), "%s", str.c_str()); -} - -void LogOutput::writeStream(const std::string &str) -{ - stream_->write(str.c_str(), str.size()); - stream_->flush(); -} - -/** - * \brief Message logger - * - * The Logger class handles log configuration. - */ -class Logger -{ -public: - ~Logger(); - - static Logger *instance(); - - void write(const LogMessage &msg); - void backtrace(); - - int logSetFile(const char *path); - int logSetStream(std::ostream *stream); - int logSetTarget(LoggingTarget target); - void logSetLevel(const char *category, const char *level); - -private: - Logger(); - - void parseLogFile(); - void parseLogLevels(); - static LogSeverity parseLogLevel(const std::string &level); - - friend LogCategory; - void registerCategory(LogCategory *category); - - std::unordered_set categories_; - std::list> levels_; - - std::shared_ptr output_; -}; - -/** - * \enum LoggingTarget - * \brief Log destination type - * \var LoggingTargetNone - * \brief No logging destination - * \sa Logger::logSetTarget - * \var LoggingTargetSyslog - * \brief Log to syslog - * \sa Logger::logSetTarget - * \var LoggingTargetFile - * \brief Log to file - * \sa Logger::logSetFile - * \var LoggingTargetStream - * \brief Log to stream - * \sa Logger::logSetStream - */ - -/** - * \brief Direct logging to a file - * \param[in] path Full path to the log file - * - * This function directs the log output to the file identified by \a path. The - * previous log target, if any, is closed, and all new log messages will be - * written to the new log file. - * - * If the function returns an error, the log target is not changed. - * - * \return Zero on success, or a negative error code otherwise - */ -int logSetFile(const char *path) -{ - return Logger::instance()->logSetFile(path); -} - -/** - * \brief Direct logging to a stream - * \param[in] stream Stream to send log output to - * - * This function directs the log output to \a stream. The previous log target, - * if any, is closed, and all new log messages will be written to the new log - * stream. - * - * If the function returns an error, the log file is not changed - * - * \return Zero on success, or a negative error code otherwise. - */ -int logSetStream(std::ostream *stream) -{ - return Logger::instance()->logSetStream(stream); -} - -/** - * \brief Set the logging target - * \param[in] target Logging destination - * - * This function sets the logging output to the target specified by \a target. - * The allowed values of \a target are LoggingTargetNone and - * LoggingTargetSyslog. LoggingTargetNone will send the log output to nowhere, - * and LoggingTargetSyslog will send the log output to syslog. The previous - * log target, if any, is closed, and all new log messages will be written to - * the new log destination. - * - * LoggingTargetFile and LoggingTargetStream are not valid values for \a target. - * Use logSetFile() and logSetStream() instead, respectively. - * - * If the function returns an error, the log file is not changed. - * - * \return Zero on success, or a negative error code otherwise. - */ -int logSetTarget(LoggingTarget target) -{ - return Logger::instance()->logSetTarget(target); -} - -/** - * \brief Set the log level - * \param[in] category Logging category - * \param[in] level Log level - * - * This function sets the log level of \a category to \a level. - * \a level shall be one of the following strings: - * - "DEBUG" - * - "INFO" - * - "WARN" - * - "ERROR" - * - "FATAL" - * - * "*" is not a valid \a category for this function. - */ -void logSetLevel(const char *category, const char *level) -{ - Logger::instance()->logSetLevel(category, level); -} - -Logger::~Logger() -{ - for (LogCategory *category : categories_) - delete category; -} - -/** - * \brief Retrieve the logger instance - * - * The Logger is a singleton and can't be constructed manually. This function - * shall instead be used to retrieve the single global instance of the logger. - * - * \return The logger instance - */ -Logger *Logger::instance() -{ - static Logger instance; - return &instance; -} - -/** - * \brief Write a message to the configured logger output - * \param[in] msg The message object - */ -void Logger::write(const LogMessage &msg) -{ - std::shared_ptr output = std::atomic_load(&output_); - if (!output) - return; - - output->write(msg); -} - -/** - * \brief Write a backtrace to the log - */ -void Logger::backtrace() -{ -#if HAVE_BACKTRACE - std::shared_ptr output = std::atomic_load(&output_); - if (!output) - return; - - void *buffer[32]; - int num_entries = ::backtrace(buffer, std::size(buffer)); - char **strings = backtrace_symbols(buffer, num_entries); - if (!strings) - return; - - std::ostringstream msg; - msg << "Backtrace:" << std::endl; - - /* - * Skip the first two entries that correspond to this method and - * ~LogMessage(). - */ - for (int i = 2; i < num_entries; ++i) - msg << strings[i] << std::endl; - - output->write(msg.str()); - - free(strings); -#endif -} - -/** - * \brief Set the log file - * \param[in] path Full path to the log file - * - * \sa libcamera::logSetFile() - * - * \return Zero on success, or a negative error code otherwise. - */ -int Logger::logSetFile(const char *path) -{ - std::shared_ptr output = std::make_shared(path); - if (!output->isValid()) - return -EINVAL; - - std::atomic_store(&output_, output); - return 0; -} - -/** - * \brief Set the log stream - * \param[in] stream Stream to send log output to - * - * \sa libcamera::logSetStream() - * - * \return Zero on success, or a negative error code otherwise. - */ -int Logger::logSetStream(std::ostream *stream) -{ - std::shared_ptr output = std::make_shared(stream); - std::atomic_store(&output_, output); - return 0; -} - -/** - * \brief Set the log target - * \param[in] target Log destination - * - * \sa libcamera::logSetTarget() - * - * \return Zero on success, or a negative error code otherwise. - */ -int Logger::logSetTarget(enum LoggingTarget target) -{ - std::shared_ptr output; - - switch (target) { - case LoggingTargetSyslog: - output = std::make_shared(); - std::atomic_store(&output_, output); - break; - case LoggingTargetNone: - output = nullptr; - std::atomic_store(&output_, std::shared_ptr()); - break; - default: - return -EINVAL; - } - - return 0; -} - -/** - * \brief Set the log level - * \param[in] category Logging category - * \param[in] level Log level - * - * \sa libcamera::logSetLevel() - */ -void Logger::logSetLevel(const char *category, const char *level) -{ - LogSeverity severity = parseLogLevel(level); - if (severity == LogInvalid) - return; - - for (LogCategory *c : categories_) { - if (!strcmp(c->name(), category)) { - c->setSeverity(severity); - break; - } - } -} - -/** - * \brief Construct a logger - */ -Logger::Logger() -{ - parseLogFile(); - parseLogLevels(); -} - -/** - * \brief Parse the log output file from the environment - * - * If the LIBCAMERA_LOG_FILE environment variable is set, open the file it - * points to and redirect the logger output to it. If the environment variable - * is set to "syslog", then the logger output will be directed to syslog. Errors - * are silently ignored and don't affect the logger output (set to stderr). - */ -void Logger::parseLogFile() -{ - const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE"); - if (!file) { - logSetStream(&std::cerr); - return; - } - - if (!strcmp(file, "syslog")) { - logSetTarget(LoggingTargetSyslog); - return; - } - - logSetFile(file); -} - -/** - * \brief Parse the log levels from the environment - * - * The log levels are stored in the LIBCAMERA_LOG_LEVELS environment variable - * as a list of "category:level" pairs, separated by commas (','). Parse the - * variable and store the levels to configure all log categories. - */ -void Logger::parseLogLevels() -{ - const char *debug = utils::secure_getenv("LIBCAMERA_LOG_LEVELS"); - if (!debug) - return; - - for (const char *pair = debug; *debug != '\0'; pair = debug) { - const char *comma = strchrnul(debug, ','); - size_t len = comma - pair; - - /* Skip over the comma. */ - debug = *comma == ',' ? comma + 1 : comma; - - /* Skip to the next pair if the pair is empty. */ - if (!len) - continue; - - std::string category; - std::string level; - - const char *colon = static_cast(memchr(pair, ':', len)); - if (!colon) { - /* 'x' is a shortcut for '*:x'. */ - category = "*"; - level = std::string(pair, len); - } else { - category = std::string(pair, colon - pair); - level = std::string(colon + 1, comma - colon - 1); - } - - /* Both the category and the level must be specified. */ - if (category.empty() || level.empty()) - continue; - - LogSeverity severity = parseLogLevel(level); - if (severity == LogInvalid) - continue; - - levels_.push_back({ category, severity }); - } -} - -/** - * \brief Parse a log level string into a LogSeverity - * \param[in] level The log level string - * - * Log levels can be specified as an integer value in the range from LogDebug to - * LogFatal, or as a string corresponding to the severity name in uppercase. Any - * other value is invalid. - * - * \return The log severity, or LogInvalid if the string is invalid - */ -LogSeverity Logger::parseLogLevel(const std::string &level) -{ - static const char *const names[] = { - "DEBUG", - "INFO", - "WARN", - "ERROR", - "FATAL", - }; - - int severity; - - if (std::isdigit(level[0])) { - char *endptr; - severity = strtoul(level.c_str(), &endptr, 10); - if (*endptr != '\0' || severity > LogFatal) - severity = LogInvalid; - } else { - severity = LogInvalid; - for (unsigned int i = 0; i < std::size(names); ++i) { - if (names[i] == level) { - severity = i; - break; - } - } - } - - return static_cast(severity); -} - -/** - * \brief Register a log category with the logger - * \param[in] category The log category - * - * Log categories must have unique names. If a category with the same name - * already exists this function performs no operation. - */ -void Logger::registerCategory(LogCategory *category) -{ - categories_.insert(category); - - const std::string &name = category->name(); - for (const std::pair &level : levels_) { - bool match = true; - - for (unsigned int i = 0; i < level.first.size(); ++i) { - if (level.first[i] == '*') - break; - - if (i >= name.size() || - name[i] != level.first[i]) { - match = false; - break; - } - } - - if (match) { - category->setSeverity(level.second); - break; - } - } -} - -/** - * \enum LogSeverity - * Log message severity - * \var LogDebug - * Debug message - * \var LogInfo - * Informational message - * \var LogWarning - * Warning message, signals a potential issue - * \var LogError - * Error message, signals an unrecoverable issue - * \var LogFatal - * Fatal message, signals an unrecoverable issue and aborts execution - */ - -/** - * \class LogCategory - * \brief A category of log message - * - * The LogCategory class represents a category of log messages, related to an - * area of the library. It groups all messages belonging to the same category, - * and is used to control the log level per group. - */ - -/** - * \brief Construct a log category - * \param[in] name The category name - */ -LogCategory::LogCategory(const char *name) - : name_(name), severity_(LogSeverity::LogInfo) -{ - Logger::instance()->registerCategory(this); -} - -/** - * \fn LogCategory::name() - * \brief Retrieve the log category name - * \return The log category name - */ - -/** - * \fn LogCategory::severity() - * \brief Retrieve the severity of the log category - * \sa setSeverity() - * \return Return the severity of the log category - */ - -/** - * \brief Set the severity of the log category - * - * Messages of severity higher than or equal to the severity of the log category - * are printed, other messages are discarded. - */ -void LogCategory::setSeverity(LogSeverity severity) -{ - severity_ = severity; -} - -/** - * \brief Retrieve the default log category - * - * The default log category is named "default" and is used by the LOG() macro - * when no log category is specified. - * - * \return A reference to the default log category - */ -const LogCategory &LogCategory::defaultCategory() -{ - static const LogCategory *category = new LogCategory("default"); - return *category; -} - -/** - * \class LogMessage - * \brief Internal log message representation. - * - * The LogMessage class models a single message in the log. It serves as a - * helper to provide the std::ostream API for logging, and must never be used - * directly. Use the LOG() macro instead access the log infrastructure. - */ - -/** - * \brief Construct a log message for a given category - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * \param[in] category The log message category, controlling how the message - * will be displayed - * \param[in] severity The log message severity, controlling how the message - * will be displayed - * - * Create a log message pertaining to line \a line of file \a fileName. The - * \a severity argument sets the message severity to control whether it will be - * output or dropped. - */ -LogMessage::LogMessage(const char *fileName, unsigned int line, - const LogCategory &category, LogSeverity severity) - : category_(category), severity_(severity) -{ - init(fileName, line); -} - -/** - * \brief Move-construct a log message - * \param[in] other The other message - * - * The move constructor is meant to support the _log() functions. Thanks to copy - * elision it will likely never be called, but C++11 only permits copy elision, - * it doesn't enforce it unlike C++17. To avoid potential link errors depending - * on the compiler type and version, and optimization level, the move - * constructor is defined even if it will likely never be called, and ensures - * that the destructor of the \a other message will not output anything to the - * log by setting the severity to LogInvalid. - */ -LogMessage::LogMessage(LogMessage &&other) - : msgStream_(std::move(other.msgStream_)), category_(other.category_), - severity_(other.severity_) -{ - other.severity_ = LogInvalid; -} - -void LogMessage::init(const char *fileName, unsigned int line) -{ - /* Log the timestamp, severity and file information. */ - timestamp_ = utils::clock::now(); - - std::ostringstream ossFileInfo; - ossFileInfo << utils::basename(fileName) << ":" << line; - fileInfo_ = ossFileInfo.str(); -} - -LogMessage::~LogMessage() -{ - /* Don't print anything if we have been moved to another LogMessage. */ - if (severity_ == LogInvalid) - return; - - msgStream_ << std::endl; - - if (severity_ >= category_.severity()) - Logger::instance()->write(*this); - - if (severity_ == LogSeverity::LogFatal) { - Logger::instance()->backtrace(); - std::abort(); - } -} - -/** - * \fn std::ostream& LogMessage::stream() - * - * Data is added to a LogMessage through the stream returned by this function. - * The stream implements the std::ostream API and can be used for logging as - * std::cout. - * - * \return A reference to the log message stream - */ - -/** - * \fn LogMessage::timestamp() - * \brief Retrieve the timestamp of the log message - * \return The timestamp of the message - */ - -/** - * \fn LogMessage::severity() - * \brief Retrieve the severity of the log message - * \return The severity of the message - */ - -/** - * \fn LogMessage::category() - * \brief Retrieve the category of the log message - * \return The category of the message - */ - -/** - * \fn LogMessage::fileInfo() - * \brief Retrieve the file info of the log message - * \return The file info of the message - */ - -/** - * \fn LogMessage::msg() - * \brief Retrieve the message text of the log message - * \return The message text of the message, as a string - */ - -/** - * \class Loggable - * \brief Base class to support log message extensions - * - * The Loggable class allows classes to extend log messages without any change - * to the way the LOG() macro is invoked. By inheriting from Loggable and - * implementing the logPrefix() virtual method, a class can specify extra - * information to be automatically added to messages logged from class member - * methods. - */ - -Loggable::~Loggable() -{ -} - -/** - * \fn Loggable::logPrefix() - * \brief Retrieve a string to be prefixed to the log message - * - * This method allows classes inheriting from the Loggable class to extend the - * logger with an object-specific prefix output right before the log message - * contents. - * - * \return A string to be prefixed to the log message - */ - -/** - * \brief Create a temporary LogMessage object to log a message - * \param[in] category The log message category - * \param[in] severity The log message severity - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * - * This method is used as a backeng by the LOG() macro to create a log message - * for locations inheriting from the Loggable class. - * - * \return A log message - */ -LogMessage Loggable::_log(const LogCategory *category, LogSeverity severity, - const char *fileName, unsigned int line) const -{ - LogMessage msg(fileName, line, - category ? *category : LogCategory::defaultCategory(), - severity); - - msg.stream() << logPrefix() << ": "; - return msg; -} - -/** - * \brief Create a temporary LogMessage object to log a message - * \param[in] category The log message category - * \param[in] severity The log message severity - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * - * This function is used as a backeng by the LOG() macro to create a log - * message for locations not inheriting from the Loggable class. - * - * \return A log message - */ -LogMessage _log(const LogCategory *category, LogSeverity severity, - const char *fileName, unsigned int line) -{ - return LogMessage(fileName, line, - category ? *category : LogCategory::defaultCategory(), - severity); -} - -/** - * \def LOG_DECLARE_CATEGORY(name) - * \hideinitializer - * \brief Declare a category of log messages - * - * This macro is used to declare a log category defined in another compilation - * unit by the LOG_DEFINE_CATEGORY() macro. - * - * The LOG_DECLARE_CATEGORY() macro must be used in the libcamera namespace. - * - * \sa LogCategory - */ - -/** - * \def LOG_DEFINE_CATEGORY(name) - * \hideinitializer - * \brief Define a category of log messages - * - * This macro is used to define a log category that can then be used with the - * LOGC() macro. Category names shall be unique, if a category is shared between - * compilation units, it shall be defined in one compilation unit only and - * declared with LOG_DECLARE_CATEGORY() in the other compilation units. - * - * The LOG_DEFINE_CATEGORY() macro must be used in the libcamera namespace. - * - * \sa LogCategory - */ - -/** - * \def LOG(category, severity) - * \hideinitializer - * \brief Log a message - * \param[in] category Category (optional) - * \param[in] severity Severity - * - * Return an std::ostream reference to which a message can be logged using the - * iostream API. The \a category, if specified, sets the message category. When - * absent the default category is used. The \a severity controls whether the - * message is printed or discarded, depending on the log level for the category. - * - * If the severity is set to Fatal, execution is aborted and the program - * terminates immediately after printing the message. - * - * \warning Logging from the destructor of a global object, either directly or - * indirectly, results in undefined behaviour. - * - * \todo Allow logging from destructors of global objects to the largest - * possible extent - */ - -/** - * \def ASSERT(condition) - * \hideinitializer - * \brief Abort program execution if assertion fails - * - * If \a condition is false, ASSERT() logs an error message with the Fatal log - * level and aborts program execution. - * - * If the macro NDEBUG is defined before including log.h, ASSERT() generates no - * code. - * - * Using conditions that have side effects with ASSERT() is not recommended, as - * these effects would depend on whether NDEBUG is defined or not. Similarly, - * ASSERT() should not be used to check for errors that can occur under normal - * conditions as those checks would then be removed when compiling with NDEBUG. - */ - -} /* namespace libcamera */ diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 9ec84e56..e12ab1ab 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -18,7 +18,7 @@ #include -#include "libcamera/internal/log.h" +#include /** * \file media_device.h diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index 94aeb504..815edc8e 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -15,7 +15,8 @@ #include -#include "libcamera/internal/log.h" +#include + #include "libcamera/internal/media_device.h" /** diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e1252ce4..e915266a 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -2,7 +2,6 @@ libcamera_sources = files([ 'bayer_format.cpp', - 'bound_method.cpp', 'buffer.cpp', 'byte_stream_buffer.cpp', 'camera.cpp', @@ -16,8 +15,6 @@ libcamera_sources = files([ 'delayed_controls.cpp', 'device_enumerator.cpp', 'device_enumerator_sysfs.cpp', - 'event_dispatcher.cpp', - 'event_dispatcher_poll.cpp', 'event_notifier.cpp', 'file.cpp', 'file_descriptor.cpp', @@ -33,23 +30,16 @@ libcamera_sources = files([ 'ipc_pipe.cpp', 'ipc_pipe_unixsocket.cpp', 'ipc_unixsocket.cpp', - 'log.cpp', 'media_device.cpp', 'media_object.cpp', - 'message.cpp', - 'object.cpp', 'pipeline_handler.cpp', 'pixel_format.cpp', 'process.cpp', 'pub_key.cpp', 'request.cpp', - 'semaphore.cpp', - 'signal.cpp', 'source_paths.cpp', 'stream.cpp', 'sysfs.cpp', - 'thread.cpp', - 'timer.cpp', 'transform.cpp', 'v4l2_device.cpp', 'v4l2_pixelformat.cpp', @@ -128,7 +118,6 @@ libcamera_deps = [ libgnutls, liblttng, libudev, - dependency('threads'), ] # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag. diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp deleted file mode 100644 index bc985c07..00000000 --- a/src/libcamera/message.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * message.cpp - Message queue support - */ - -#include "libcamera/internal/message.h" - -#include - -#include "libcamera/internal/log.h" - -/** - * \file message.h - * \brief Message queue support - * - * The messaging API enables inter-thread communication through message - * posting. Messages can be sent from any thread to any recipient deriving from - * the Object class. - * - * To post a message, the sender allocates it dynamically as instance of a class - * derived from Message. It then posts the message to an Object recipient - * through Object::postMessage(). Message ownership is passed to the object, - * thus the message shall not store any temporary data. - * - * The message is delivered in the context of the object's thread, through the - * Object::message() virtual method. After delivery the message is - * automatically deleted. - */ - -namespace libcamera { - -LOG_DEFINE_CATEGORY(Message) - -std::atomic_uint Message::nextUserType_{ Message::UserMessage }; - -/** - * \class Message - * \brief A message that can be posted to a Thread - */ - -/** - * \enum Message::Type - * \brief The message type - * \var Message::None - * \brief Invalid message type - * \var Message::InvokeMessage - * \brief Asynchronous method invocation across threads - * \var Message::ThreadMoveMessage - * \brief Object is being moved to a different thread - * \var Message::DeferredDelete - * \brief Object is scheduled for deletion - * \var Message::UserMessage - * \brief First value available for user-defined messages - */ - -/** - * \brief Construct a message object of type \a type - * \param[in] type The message type - */ -Message::Message(Message::Type type) - : type_(type) -{ -} - -Message::~Message() -{ -} - -/** - * \fn Message::type() - * \brief Retrieve the message type - * \return The message type - */ - -/** - * \fn Message::receiver() - * \brief Retrieve the message receiver - * \return The message receiver - */ - -/** - * \brief Reserve and register a custom user-defined message type - * - * Custom message types use values starting at Message::UserMessage. Assigning - * custom types manually may lead to accidental duplicated types. To avoid this - * problem, this method reserves and returns the next available user-defined - * message type. - * - * The recommended way to use this method is to subclass Message and provide a - * static accessor for the custom message type. - * - * \code{.cpp} - * class MyCustomMessage : public Message - * { - * public: - * MyCustomMessage() : Message(type()) {} - * - * static Message::Type type() - * { - * static MessageType type = registerMessageType(); - * return type; - * } - * }; - * \endcode - * - * \return A new unique message type - */ -Message::Type Message::registerMessageType() -{ - return static_cast(nextUserType_++); -} - -/** - * \class InvokeMessage - * \brief A message carrying a method invocation across threads - */ - -/** - * \brief Construct an InvokeMessage for method invocation on an Object - * \param[in] method The bound method - * \param[in] pack The packed method arguments - * \param[in] semaphore The semaphore used to signal message delivery - * \param[in] deleteMethod True to delete the \a method when the message is - * destroyed - */ -InvokeMessage::InvokeMessage(BoundMethodBase *method, - std::shared_ptr pack, - Semaphore *semaphore, bool deleteMethod) - : Message(Message::InvokeMessage), method_(method), pack_(pack), - semaphore_(semaphore), deleteMethod_(deleteMethod) -{ -} - -InvokeMessage::~InvokeMessage() -{ - if (deleteMethod_) - delete method_; -} - -/** - * \fn InvokeMessage::semaphore() - * \brief Retrieve the message semaphore passed to the constructor - * \return The message semaphore - */ - -/** - * \brief Invoke the method bound to InvokeMessage::method_ with arguments - * InvokeMessage::pack_ - */ -void InvokeMessage::invoke() -{ - method_->invokePack(pack_.get()); -} - -/** - * \var InvokeMessage::method_ - * \brief The method to be invoked - */ - -/** - * \var InvokeMessage::pack_ - * \brief The packed method invocation arguments - */ - -} /* namespace libcamera */ diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp deleted file mode 100644 index 51cac64e..00000000 --- a/src/libcamera/object.cpp +++ /dev/null @@ -1,302 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * object.cpp - Base object - */ - -#include - -#include - -#include - -#include - -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" - -/** - * \file object.h - * \brief Base object to support automatic signal disconnection - */ - -namespace libcamera { - -LOG_DEFINE_CATEGORY(Object) - -/** - * \class Object - * \brief Base object to support automatic signal disconnection - * - * The Object class simplifies signal/slot handling for classes implementing - * slots. By inheriting from Object, an object is automatically disconnected - * from all connected signals when it gets destroyed. - * - * Object instances are bound to the thread of their parent, or the thread in - * which they're created when they have no parent. When a message is posted to - * an object, its handler will run in the object's thread. This allows - * implementing easy message passing between threads by inheriting from the - * Object class. - * - * Deleting an object from a thread other than the one the object is bound to is - * unsafe, unless the caller ensures that the object isn't processing any - * message concurrently. - * - * Object slots connected to signals will also run in the context of the - * object's thread, regardless of whether the signal is emitted in the same or - * in another thread. - * - * \sa Message, Signal, Thread - */ - -/** - * \brief Construct an Object instance - * \param[in] parent The object parent - * - * The new Object instance is bound to the thread of its \a parent, or to the - * current thread if the \a parent is nullptr. - */ -Object::Object(Object *parent) - : parent_(parent), pendingMessages_(0) -{ - thread_ = parent ? parent->thread() : Thread::current(); - - if (parent) - parent->children_.push_back(this); -} - -/** - * \brief Destroy an Object instance - * - * Deleting an Object automatically disconnects all signals from the Object's - * slots. All the Object's children are made orphan, but stay bound to their - * current thread. - * - * Object instances shall be destroyed from the thread they are bound to, - * otherwise undefined behaviour may occur. If deletion of an Object needs to - * be scheduled from a different thread, deleteLater() shall be used. - */ -Object::~Object() -{ - /* - * Move signals to a private list to avoid concurrent iteration and - * deletion of items from Signal::disconnect(). - */ - std::list signals(std::move(signals_)); - for (SignalBase *signal : signals) - signal->disconnect(this); - - if (pendingMessages_) - thread()->removeMessages(this); - - if (parent_) { - auto it = std::find(parent_->children_.begin(), - parent_->children_.end(), this); - ASSERT(it != parent_->children_.end()); - parent_->children_.erase(it); - } - - for (auto child : children_) - child->parent_ = nullptr; -} - -/** - * \brief Schedule deletion of the instance in the thread it belongs to - * - * This function schedules deletion of the Object when control returns to the - * event loop that the object belongs to. This ensures the object is destroyed - * from the right context, as required by the libcamera threading model. - * - * If this function is called before the thread's event loop is started, the - * object will be deleted when the event loop starts. - * - * Deferred deletion can be used to control the destruction context with shared - * pointers. An object managed with shared pointers is deleted when the last - * reference is destroyed, which makes difficult to ensure through software - * design which context the deletion will take place in. With a custom deleter - * for the shared pointer using deleteLater(), the deletion can be guaranteed to - * happen in the thread the object is bound to. - * - * \code{.cpp} - * std::shared_ptr createObject() - * { - * struct Deleter : std::default_delete { - * void operator()(MyObject *obj) - * { - * obj->deleteLater(); - * } - * }; - * - * MyObject *obj = new MyObject(); - * - * return std::shared_ptr(obj, Deleter()); - * } - * \endcode - * - * \context This function is \threadsafe. - */ -void Object::deleteLater() -{ - postMessage(std::make_unique(Message::DeferredDelete)); -} - -/** - * \brief Post a message to the object's thread - * \param[in] msg The message - * - * This method posts the message \a msg to the message queue of the object's - * thread, to be delivered to the object through the message() method in the - * context of its thread. Message ownership is passed to the thread, and the - * message will be deleted after being delivered. - * - * Messages are delivered through the thread's event loop. If the thread is not - * running its event loop the message will not be delivered until the event - * loop gets started. - * - * Due to their asynchronous nature, threads do not provide any guarantee that - * all posted messages are delivered before the thread is stopped. See - * \ref thread-stop for additional information. - * - * \context This function is \threadsafe. - */ -void Object::postMessage(std::unique_ptr msg) -{ - thread()->postMessage(std::move(msg), this); -} - -/** - * \brief Message handler for the object - * \param[in] msg The message - * - * This virtual method receives messages for the object. It is called in the - * context of the object's thread, and can be overridden to process custom - * messages. The parent Object::message() method shall be called for any - * message not handled by the override method. - * - * The message \a msg is valid only for the duration of the call, no reference - * to it shall be kept after this method returns. - */ -void Object::message(Message *msg) -{ - switch (msg->type()) { - case Message::InvokeMessage: { - InvokeMessage *iMsg = static_cast(msg); - Semaphore *semaphore = iMsg->semaphore(); - iMsg->invoke(); - - if (semaphore) - semaphore->release(); - - break; - } - - case Message::DeferredDelete: - delete this; - break; - - default: - break; - } -} - -/** - * \fn R Object::invokeMethod() - * \brief Invoke a method asynchronously on an Object instance - * \param[in] func The object method to invoke - * \param[in] type Connection type for method invocation - * \param[in] args The method arguments - * - * This method invokes the member method \a func with arguments \a args, based - * on the connection \a type. Depending on the type, the method will be called - * synchronously in the same thread or asynchronously in the object's thread. - * - * Arguments \a args passed by value or reference are copied, while pointers - * are passed untouched. The caller shall ensure that any pointer argument - * remains valid until the method is invoked. - * - * Due to the asynchronous nature of threads, functions invoked asynchronously - * with the ConnectionTypeQueued type are not guaranteed to be called before - * the thread is stopped. See \ref thread-stop for additional information. - * - * \context This function is \threadsafe. - * - * \return For connection types ConnectionTypeDirect and - * ConnectionTypeBlocking, return the return value of the invoked method. For - * connection type ConnectionTypeQueued, return a default-constructed R value. - */ - -/** - * \fn Object::thread() - * \brief Retrieve the thread the object is bound to - * \context This function is \threadsafe. - * \return The thread the object is bound to - */ - -/** - * \brief Move the object and all its children to a different thread - * \param[in] thread The target thread - * - * This method moves the object and all its children from the current thread to - * the new \a thread. - * - * Before the object is moved, a Message::ThreadMoveMessage message is sent to - * it. The message() method can be reimplement in derived classes to be notified - * of the upcoming thread move and perform any required processing. - * - * Moving an object that has a parent is not allowed, and causes undefined - * behaviour. - * - * \context This function is thread-bound. - */ -void Object::moveToThread(Thread *thread) -{ - ASSERT(Thread::current() == thread_); - - if (thread_ == thread) - return; - - if (parent_) { - LOG(Object, Error) - << "Moving object to thread with a parent is not permitted"; - return; - } - - notifyThreadMove(); - - thread->moveObject(this); -} - -void Object::notifyThreadMove() -{ - Message msg(Message::ThreadMoveMessage); - message(&msg); - - for (auto child : children_) - child->notifyThreadMove(); -} - -/** - * \fn Object::parent() - * \brief Retrieve the object's parent - * \return The object's parent - */ - -void Object::connect(SignalBase *signal) -{ - signals_.push_back(signal); -} - -void Object::disconnect(SignalBase *signal) -{ - for (auto iter = signals_.begin(); iter != signals_.end(); ) { - if (*iter == signal) - iter = signals_.erase(iter); - else - iter++; - } -} - -} /* namespace libcamera */ diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h index d8d4a181..f28e9f1d 100644 --- a/src/libcamera/pipeline/ipu3/cio2.h +++ b/src/libcamera/pipeline/ipu3/cio2.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h index 59e64e81..3ef7e445 100644 --- a/src/libcamera/pipeline/ipu3/frames.h +++ b/src/libcamera/pipeline/ipu3/frames.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp index 32d143a8..e955bc34 100644 --- a/src/libcamera/pipeline/ipu3/imgu.cpp +++ b/src/libcamera/pipeline/ipu3/imgu.cpp @@ -13,12 +13,12 @@ #include +#include +#include + #include #include -#include - -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 6b43ad2f..76c3bb3d 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -11,6 +11,9 @@ #include #include +#include +#include + #include #include #include @@ -20,13 +23,10 @@ #include #include -#include - #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/delayed_controls.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp index 4d5dd6cb..573ea11d 100644 --- a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp +++ b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp @@ -14,7 +14,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /* * /dev/dma-heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp index f2430415..b3265d0e 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp @@ -6,9 +6,9 @@ */ #include "rpi_stream.h" -#include +#include -#include "libcamera/internal/log.h" +#include namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index c625d724..00df4f0b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -14,6 +14,9 @@ #include +#include +#include + #include #include #include @@ -24,13 +27,10 @@ #include #include -#include - #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/delayed_controls.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/v4l2_subdevice.h" diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h index 3b3e37d2..c185ac39 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -10,10 +10,11 @@ #include #include +#include + #include #include #include -#include #include #include "libcamera/internal/media_object.h" diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 589f185b..9af1096b 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -10,14 +10,14 @@ #include #include +#include +#include +#include + #include #include -#include #include -#include - -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/v4l2_videodevice.h" diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index 480e528d..276a2a29 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -16,9 +16,9 @@ #include #include -#include -#include "libcamera/internal/log.h" +#include +#include namespace libcamera { diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 1894014d..4d78e6fa 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -28,7 +30,6 @@ #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/v4l2_subdevice.h" diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index d8c17dcc..0f634b8d 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -12,6 +12,9 @@ #include #include +#include +#include + #include #include #include @@ -19,10 +22,7 @@ #include #include -#include - #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/sysfs.h" diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 025ca562..12f7517f 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -14,29 +14,29 @@ #include #include +#include +#include + #include #include #include #include -#include -#include #include #include -#include +#include +#include +#include +#include #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" -#include -#include - namespace libcamera { LOG_DEFINE_CATEGORY(VIMC) diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 6fb2a743..f626eddd 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -9,14 +9,14 @@ #include +#include +#include + #include #include #include -#include - #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/tracepoints.h" diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 35091f60..46338029 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -20,10 +20,10 @@ #include #include +#include #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" /** * \file process.h diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 6611e74d..518384eb 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -10,13 +10,14 @@ #include #include +#include + #include #include #include #include #include "libcamera/internal/camera_controls.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/tracepoints.h" /** diff --git a/src/libcamera/semaphore.cpp b/src/libcamera/semaphore.cpp deleted file mode 100644 index d8988a91..00000000 --- a/src/libcamera/semaphore.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * semaphore.cpp - General-purpose counting semaphore - */ - -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" - -/** - * \file semaphore.h - * \brief General-purpose counting semaphore - */ - -namespace libcamera { - -/** - * \class Semaphore - * \brief General-purpose counting semaphore - * - * A semaphore is a locking primitive that protects resources. It is created - * with an initial number of resources (which may be 0), and offers two - * primitives to acquire and release resources. The acquire() method tries to - * acquire a number of resources, and blocks if not enough resources are - * available until they get released. The release() method releases a number of - * resources, waking up any consumer blocked on an acquire() call. - */ - -/** - * \brief Construct a semaphore with \a n resources - * \param[in] n The resource count - */ -Semaphore::Semaphore(unsigned int n) - : available_(n) -{ -} - -/** - * \brief Retrieve the number of available resources - * \return The number of available resources - */ -unsigned int Semaphore::available() -{ - MutexLocker locker(mutex_); - return available_; -} - -/** - * \brief Acquire \a n resources - * \param[in] n The resource count - * - * This method attempts to acquire \a n resources. If \a n is higher than the - * number of available resources, the call will block until enough resources - * become available. - */ -void Semaphore::acquire(unsigned int n) -{ - MutexLocker locker(mutex_); - cv_.wait(locker, [&] { return available_ >= n; }); - available_ -= n; -} - -/** - * \brief Try to acquire \a n resources without blocking - * \param[in] n The resource count - * - * This method attempts to acquire \a n resources. If \a n is higher than the - * number of available resources, it returns false immediately without - * acquiring any resource. Otherwise it acquires the resources and returns - * true. - * - * \return True if the resources have been acquired, false otherwise - */ -bool Semaphore::tryAcquire(unsigned int n) -{ - MutexLocker locker(mutex_); - if (available_ < n) - return false; - - available_ -= n; - return true; -} - -/** - * \brief Release \a n resources - * \param[in] n The resource count - * - * This method releases \a n resources, increasing the available resource count - * by \a n. If the number of available resources becomes large enough for any - * consumer blocked on an acquire() call, those consumers get woken up. - */ -void Semaphore::release(unsigned int n) -{ - { - MutexLocker locker(mutex_); - available_ += n; - } - - cv_.notify_all(); -} - -} /* namespace libcamera */ diff --git a/src/libcamera/signal.cpp b/src/libcamera/signal.cpp deleted file mode 100644 index 2532df3c..00000000 --- a/src/libcamera/signal.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * signal.cpp - Signal & slot implementation - */ - -#include - -#include "libcamera/internal/thread.h" - -/** - * \file signal.h - * \brief Signal & slot implementation - */ - -namespace libcamera { - -namespace { - -/* - * Mutex to protect the SignalBase::slots_ and Object::signals_ lists. If lock - * contention needs to be decreased, this could be replaced with locks in - * Object and SignalBase, or with a mutex pool. - */ -Mutex signalsLock; - -} /* namespace */ - -void SignalBase::connect(BoundMethodBase *slot) -{ - MutexLocker locker(signalsLock); - - Object *object = slot->object(); - if (object) - object->connect(this); - slots_.push_back(slot); -} - -void SignalBase::disconnect(Object *object) -{ - disconnect([object](SlotList::iterator &iter) { - return (*iter)->match(object); - }); -} - -void SignalBase::disconnect(std::function match) -{ - MutexLocker locker(signalsLock); - - for (auto iter = slots_.begin(); iter != slots_.end(); ) { - if (match(iter)) { - Object *object = (*iter)->object(); - if (object) - object->disconnect(this); - - delete *iter; - iter = slots_.erase(iter); - } else { - ++iter; - } - } -} - -SignalBase::SlotList SignalBase::slots() -{ - MutexLocker locker(signalsLock); - return slots_; -} - -/** - * \class Signal - * \brief Generic signal and slot communication mechanism - * - * Signals and slots are a language construct aimed at communication between - * objects through the observer pattern without the need for boilerplate code. - * See http://doc.qt.io/qt-5/signalsandslots.html for more information. - * - * Signals model events that can be observed from objects unrelated to the event - * source. Slots are functions that are called in response to a signal. Signals - * can be connected to and disconnected from slots dynamically at runtime. When - * a signal is emitted, all connected slots are called sequentially in the order - * they have been connected. - * - * Signals are defined with zero, one or more typed parameters. They are emitted - * with a value for each of the parameters, and those values are passed to the - * connected slots. - * - * Slots are normal static or class member functions. In order to be connected - * to a signal, their signature must match the signal type (taking the same - * arguments as the signal and returning void). - * - * Connecting a signal to a slot results in the slot being called with the - * arguments passed to the emit() function when the signal is emitted. Multiple - * slots can be connected to the same signal, and multiple signals can connected - * to the same slot. Duplicate connections between a signal and a slot are - * allowed and result in the slot being called multiple times for the same - * signal emission. - * - * When a slot belongs to an instance of the Object class, the slot is called - * in the context of the thread that the object is bound to. If the signal is - * emitted from the same thread, the slot will be called synchronously, before - * Signal::emit() returns. If the signal is emitted from a different thread, - * the slot will be called asynchronously from the object's thread's event - * loop, after the Signal::emit() method returns, with a copy of the signal's - * arguments. The emitter shall thus ensure that any pointer or reference - * passed through the signal will remain valid after the signal is emitted. - */ - -/** - * \fn Signal::connect(T *object, R (T::*func)(Args...)) - * \brief Connect the signal to a member function slot - * \param[in] object The slot object pointer - * \param[in] func The slot member function - * - * If the typename T inherits from Object, the signal will be automatically - * disconnected from the \a func slot of \a object when \a object is destroyed. - * Otherwise the caller shall disconnect signals manually before destroying \a - * object. - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::connect(R (*func)(Args...)) - * \brief Connect the signal to a static function slot - * \param[in] func The slot static function - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::disconnect() - * \brief Disconnect the signal from all slots - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::disconnect(T *object) - * \brief Disconnect the signal from all slots of the \a object - * \param[in] object The object pointer whose slots to disconnect - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::disconnect(T *object, R (T::*func)(Args...)) - * \brief Disconnect the signal from the \a object slot member function \a func - * \param[in] object The object pointer whose slots to disconnect - * \param[in] func The slot member function to disconnect - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::disconnect(R (*func)(Args...)) - * \brief Disconnect the signal from the slot static function \a func - * \param[in] func The slot static function to disconnect - * - * \context This function is \threadsafe. - */ - -/** - * \fn Signal::emit(Args... args) - * \brief Emit the signal and call all connected slots - * \param args The arguments passed to the connected slots - * - * Emitting a signal calls all connected slots synchronously and sequentially in - * the order the slots have been connected. The arguments passed to the emit() - * function are passed to the slot functions unchanged. If a slot modifies one - * of the arguments (when passed by pointer or reference), the modification is - * thus visible to all subsequently called slots. - * - * This function is not \threadsafe, but thread-safety is guaranteed against - * concurrent connect() and disconnect() calls. - */ - -} /* namespace libcamera */ diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index d5d68427..b8626775 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -15,9 +15,9 @@ #include +#include #include -#include "libcamera/internal/log.h" /** * \file stream.h diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp index e9004b2b..4372b134 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -12,8 +12,9 @@ #include #include +#include + #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" /** * \file sysfs.h diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp deleted file mode 100644 index 91e4737a..00000000 --- a/src/libcamera/thread.cpp +++ /dev/null @@ -1,680 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * thread.cpp - Thread support - */ - -#include "libcamera/internal/thread.h" - -#include -#include -#include -#include -#include -#include - -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/event_dispatcher_poll.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" - -/** - * \page thread Thread Support - * - * libcamera supports multi-threaded applications through a threading model that - * sets precise rules to guarantee thread-safe usage of the API. Additionally, - * libcamera makes internal use of threads, and offers APIs that simplify - * interactions with application threads. Careful compliance with the threading - * model will ensure avoidance of race conditions. - * - * Every thread created by libcamera is associated with an instance of the - * Thread class. Those threads run an internal event loop by default to - * dispatch events to objects. Additionally, the main thread of the application - * (defined as the thread that calls CameraManager::start()) is also associated - * with a Thread instance, but has no event loop accessible to libcamera. Other - * application threads are not visible to libcamera. - * - * \section thread-objects Threads and Objects - * - * Instances of the Object class and all its derived classes are thread-aware - * and are bound to the thread they are created in. They are said to *live* in - * a thread, and they interact with the event loop of their thread for the - * purpose of message passing and signal delivery. Messages posted to the - * object with Object::postMessage() will be delivered from the event loop of - * the thread that the object lives in. Signals delivered to the object, unless - * explicitly connected with ConnectionTypeDirect, will also be delivered from - * the object thread's event loop. - * - * All Object instances created internally by libcamera are bound to internal - * threads. As objects interact with thread event loops for proper operation, - * creating an Object instance in a thread that has no internal event loop (such - * as the main application thread, or libcamera threads that have a custom main - * loop), prevents some features of the Object class from being used. See - * Thread::exec() for more details. - * - * \section thread-signals Threads and Signals - * - * When sent to a receiver that does not inherit from the Object class, signals - * are delivered synchronously in the thread of the sender. When the receiver - * inherits from the Object class, delivery is by default asynchronous if the - * sender and receiver live in different threads. In that case, the signal is - * posted to the receiver's message queue and will be delivered from the - * receiver's event loop, running in the receiver's thread. This mechanism can - * be overridden by selecting a different connection type when calling - * Signal::connect(). - * - * \section thread-reentrancy Reentrancy and Thread-Safety - * - * Through the documentation, several terms are used to define how classes and - * their member functions can be used from multiple threads. - * - * - A **reentrant** function may be called simultaneously from multiple - * threads if and only if each invocation uses a different instance of the - * class. This is the default for all member functions not explictly marked - * otherwise. - * - * - \anchor thread-safe A **thread-safe** function may be called - * simultaneously from multiple threads on the same instance of a class. A - * thread-safe function is thus reentrant. Thread-safe functions may also be - * called simultaneously with any other reentrant function of the same class - * on the same instance. - * - * - \anchor thread-bound A **thread-bound** function may be called only from - * the thread that the class instances lives in (see section \ref - * thread-objects). For instances of classes that do not derive from the - * Object class, this is the thread in which the instance was created. A - * thread-bound function is not thread-safe, and may or may not be reentrant. - * - * Neither reentrancy nor thread-safety, in this context, mean that a function - * may be called simultaneously from the same thread, for instance from a - * callback invoked by the function. This may deadlock and isn't allowed unless - * separately documented. - * - * A class is defined as reentrant, thread-safe or thread-bound if all its - * member functions are reentrant, thread-safe or thread-bound respectively. - * Some member functions may additionally be documented as having additional - * thread-related attributes. - * - * Most classes are reentrant but not thread-safe, as making them fully - * thread-safe would incur locking costs considered prohibitive for the - * expected use cases. - */ - -/** - * \file thread.h - * \brief Thread support - */ - -namespace libcamera { - -LOG_DEFINE_CATEGORY(Thread) - -class ThreadMain; - -/** - * \brief A queue of posted messages - */ -class MessageQueue -{ -public: - /** - * \brief List of queued Message instances - */ - std::list> list_; - /** - * \brief Protects the \ref list_ - */ - Mutex mutex_; -}; - -/** - * \brief Thread-local internal data - */ -class ThreadData -{ -public: - ThreadData() - : thread_(nullptr), running_(false), dispatcher_(nullptr) - { - } - - static ThreadData *current(); - -private: - friend class Thread; - friend class ThreadMain; - - Thread *thread_; - bool running_; - pid_t tid_; - - Mutex mutex_; - - std::atomic dispatcher_; - - std::condition_variable cv_; - std::atomic exit_; - int exitCode_; - - MessageQueue messages_; -}; - -/** - * \brief Thread wrapper for the main thread - */ -class ThreadMain : public Thread -{ -public: - ThreadMain() - { - data_->running_ = true; - } - -protected: - void run() override - { - LOG(Thread, Fatal) << "The main thread can't be restarted"; - } -}; - -static thread_local ThreadData *currentThreadData = nullptr; -static ThreadMain mainThread; - -/** - * \brief Retrieve thread-local internal data for the current thread - * \return The thread-local internal data for the current thread - */ -ThreadData *ThreadData::current() -{ - if (currentThreadData) - return currentThreadData; - - /* - * The main thread doesn't receive thread-local data when it is - * started, set it here. - */ - ThreadData *data = mainThread.data_; - data->tid_ = syscall(SYS_gettid); - currentThreadData = data; - return data; -} - -/** - * \typedef Mutex - * \brief An alias for std::mutex - */ - -/** - * \typedef MutexLocker - * \brief An alias for std::unique_lock - */ - -/** - * \class Thread - * \brief A thread of execution - * - * The Thread class is a wrapper around std::thread that handles integration - * with the Object, Signal and EventDispatcher classes. - * - * Thread instances by default run an event loop until the exit() method is - * called. The event loop dispatches events (messages, notifiers and timers) - * sent to the objects living in the thread. This behaviour can be modified by - * overriding the run() function. - * - * \section thread-stop Stopping Threads - * - * Threads can't be forcibly stopped. Instead, a thread user first requests the - * thread to exit and then waits for the thread's main function to react to the - * request and return, at which points the thread will stop. - * - * For threads running exec(), the exit() function is used to request the thread - * to exit. For threads subclassing the Thread class and implementing a custom - * run() function, a subclass-specific mechanism shall be provided. In either - * case, the wait() function shall be called to wait for the thread to stop. - * - * Due to their asynchronous nature, threads are subject to race conditions when - * they stop. This is of particular importance for messages posted to the thread - * with postMessage() (and the other mechanisms that rely on it, such as - * Object::invokeMethod() or asynchronous signal delivery). To understand the - * issues, three contexts need to be considered: - * - * - The worker is the Thread performing work and being instructed to stop. - * - The controller is the context which instructs the worker thread to stop. - * - The other contexts are any threads other than the worker and controller - * that interact with the worker thread. - * - * Messages posted to the worker thread from the controller context before - * calling exit() are queued to the thread's message queue, and the Thread class - * offers no guarantee that those messages will be processed before the thread - * stops. This allows threads to stop fast. - * - * A thread that requires delivery of messages posted from the controller - * context before exit() should reimplement the run() function and call - * dispatchMessages() after exec(). - * - * Messages posted to the worker thread from the other contexts are asynchronous - * with respect to the exit() call from the controller context. There is no - * guarantee as to whether those messages will be processed or not before the - * thread stops. - * - * Messages that are not processed will stay in the queue, in the exact same way - * as messages posted after the thread has stopped. They will be processed when - * the thread is restarted. If the thread is never restarted, they will be - * deleted without being processed when the Thread instance is destroyed. - */ - -/** - * \brief Create a thread - */ -Thread::Thread() -{ - data_ = new ThreadData; - data_->thread_ = this; -} - -Thread::~Thread() -{ - delete data_->dispatcher_.load(std::memory_order_relaxed); - delete data_; -} - -/** - * \brief Start the thread - */ -void Thread::start() -{ - MutexLocker locker(data_->mutex_); - - if (data_->running_) - return; - - data_->running_ = true; - data_->exitCode_ = -1; - data_->exit_.store(false, std::memory_order_relaxed); - - thread_ = std::thread(&Thread::startThread, this); -} - -void Thread::startThread() -{ - struct ThreadCleaner { - ThreadCleaner(Thread *thread, void (Thread::*cleaner)()) - : thread_(thread), cleaner_(cleaner) - { - } - ~ThreadCleaner() - { - (thread_->*cleaner_)(); - } - - Thread *thread_; - void (Thread::*cleaner_)(); - }; - - /* - * Make sure the thread is cleaned up even if the run method exits - * abnormally (for instance via a direct call to pthread_cancel()). - */ - thread_local ThreadCleaner cleaner(this, &Thread::finishThread); - - data_->tid_ = syscall(SYS_gettid); - currentThreadData = data_; - - run(); -} - -/** - * \brief Enter the event loop - * - * This method enters an event loop based on the event dispatcher instance for - * the thread, and blocks until the exit() method is called. It is meant to be - * called within the thread from the run() method and shall not be called - * outside of the thread. - * - * \return The exit code passed to the exit() method - */ -int Thread::exec() -{ - MutexLocker locker(data_->mutex_); - - EventDispatcher *dispatcher = eventDispatcher(); - - locker.unlock(); - - while (!data_->exit_.load(std::memory_order_acquire)) - dispatcher->processEvents(); - - locker.lock(); - - return data_->exitCode_; -} - -/** - * \brief Main method of the thread - * - * When the thread is started with start(), it calls this method in the context - * of the new thread. The run() method can be overridden to perform custom - * work, either custom initialization and cleanup before and after calling the - * Thread::exec() function, or a custom thread loop altogether. When this - * method returns the thread execution is stopped, and the \ref finished signal - * is emitted. - * - * Note that if this function is overridden and doesn't call Thread::exec(), no - * events will be dispatched to the objects living in the thread. These objects - * will not be able to use the EventNotifier, Timer or Message facilities. This - * includes functions that rely on message dispatching, such as - * Object::deleteLater(). - * - * The base implementation just calls exec(). - */ -void Thread::run() -{ - exec(); -} - -void Thread::finishThread() -{ - data_->mutex_.lock(); - data_->running_ = false; - data_->mutex_.unlock(); - - finished.emit(this); - data_->cv_.notify_all(); -} - -/** - * \brief Stop the thread's event loop - * \param[in] code The exit code - * - * This method interrupts the event loop started by the exec() method, causing - * exec() to return \a code. - * - * Calling exit() on a thread that reimplements the run() method and doesn't - * call exec() will likely have no effect. - * - * \context This function is \threadsafe. - */ -void Thread::exit(int code) -{ - data_->exitCode_ = code; - data_->exit_.store(true, std::memory_order_release); - - EventDispatcher *dispatcher = data_->dispatcher_.load(std::memory_order_relaxed); - if (!dispatcher) - return; - - dispatcher->interrupt(); -} - -/** - * \brief Wait for the thread to finish - * \param[in] duration Maximum wait duration - * - * This function waits until the thread finishes or the \a duration has - * elapsed, whichever happens first. If \a duration is equal to - * utils::duration::max(), the wait never times out. If the thread is not - * running the function returns immediately. - * - * \context This function is \threadsafe. - * - * \return True if the thread has finished, or false if the wait timed out - */ -bool Thread::wait(utils::duration duration) -{ - bool hasFinished = true; - - { - MutexLocker locker(data_->mutex_); - - if (duration == utils::duration::max()) - data_->cv_.wait(locker, [&]() { return !data_->running_; }); - else - hasFinished = data_->cv_.wait_for(locker, duration, - [&]() { return !data_->running_; }); - } - - if (thread_.joinable()) - thread_.join(); - - return hasFinished; -} - -/** - * \brief Check if the thread is running - * - * A Thread instance is considered as running once the underlying thread has - * started. This method guarantees that it returns true after the start() - * method returns, and false after the wait() method returns. - * - * \context This function is \threadsafe. - * - * \return True if the thread is running, false otherwise - */ -bool Thread::isRunning() -{ - MutexLocker locker(data_->mutex_); - return data_->running_; -} - -/** - * \var Thread::finished - * \brief Signal the end of thread execution - */ - -/** - * \brief Retrieve the Thread instance for the current thread - * \context This function is \threadsafe. - * \return The Thread instance for the current thread - */ -Thread *Thread::current() -{ - ThreadData *data = ThreadData::current(); - return data->thread_; -} - -/** - * \brief Retrieve the ID of the current thread - * - * The thread ID corresponds to the Linux thread ID (TID) as returned by the - * gettid system call. - * - * \context This function is \threadsafe. - * - * \return The ID of the current thread - */ -pid_t Thread::currentId() -{ - ThreadData *data = ThreadData::current(); - return data->tid_; -} - -/** - * \brief Retrieve the event dispatcher - * - * This function retrieves the internal event dispatcher for the thread. The - * returned event dispatcher is valid until the thread is destroyed. - * - * \context This function is \threadsafe. - * - * \return Pointer to the event dispatcher - */ -EventDispatcher *Thread::eventDispatcher() -{ - if (!data_->dispatcher_.load(std::memory_order_relaxed)) - data_->dispatcher_.store(new EventDispatcherPoll(), - std::memory_order_release); - - return data_->dispatcher_.load(std::memory_order_relaxed); -} - -/** - * \brief Post a message to the thread for the \a receiver - * \param[in] msg The message - * \param[in] receiver The receiver - * - * This method stores the message \a msg in the message queue of the thread for - * the \a receiver and wake up the thread's event loop. Message ownership is - * passed to the thread, and the message will be deleted after being delivered. - * - * Messages are delivered through the thread's event loop. If the thread is not - * running its event loop the message will not be delivered until the event - * loop gets started. - * - * When the thread is stopped, posted messages may not have all been processed. - * See \ref thread-stop for additional information. - * - * If the \a receiver is not bound to this thread the behaviour is undefined. - * - * \sa exec() - */ -void Thread::postMessage(std::unique_ptr msg, Object *receiver) -{ - msg->receiver_ = receiver; - - ASSERT(data_ == receiver->thread()->data_); - - MutexLocker locker(data_->messages_.mutex_); - data_->messages_.list_.push_back(std::move(msg)); - receiver->pendingMessages_++; - locker.unlock(); - - EventDispatcher *dispatcher = - data_->dispatcher_.load(std::memory_order_acquire); - if (dispatcher) - dispatcher->interrupt(); -} - -/** - * \brief Remove all posted messages for the \a receiver - * \param[in] receiver The receiver - * - * If the \a receiver is not bound to this thread the behaviour is undefined. - */ -void Thread::removeMessages(Object *receiver) -{ - ASSERT(data_ == receiver->thread()->data_); - - MutexLocker locker(data_->messages_.mutex_); - if (!receiver->pendingMessages_) - return; - - std::vector> toDelete; - for (std::unique_ptr &msg : data_->messages_.list_) { - if (!msg) - continue; - if (msg->receiver_ != receiver) - continue; - - /* - * Move the message to the pending deletion list to delete it - * after releasing the lock. The messages list element will - * contain a null pointer, and will be removed when dispatching - * messages. - */ - toDelete.push_back(std::move(msg)); - receiver->pendingMessages_--; - } - - ASSERT(!receiver->pendingMessages_); - locker.unlock(); - - toDelete.clear(); -} - -/** - * \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. - * - * Messages shall only be dispatched from the current thread, typically within - * the thread from the run() function. Calling this function outside of the - * thread results in undefined behaviour. - */ -void Thread::dispatchMessages(Message::Type type) -{ - ASSERT(data_ == ThreadData::current()); - - MutexLocker locker(data_->messages_.mutex_); - - std::list> &messages = data_->messages_.list_; - - for (auto iter = messages.begin(); iter != messages.end(); ) { - std::unique_ptr &msg = *iter; - - if (!msg) { - iter = data_->messages_.list_.erase(iter); - continue; - } - - if (type != Message::Type::None && msg->type() != type) { - ++iter; - continue; - } - - std::unique_ptr 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(message.get()); - message.reset(); - locker.lock(); - } -} - -/** - * \brief Move an \a object and all its children to the thread - * \param[in] object The object - */ -void Thread::moveObject(Object *object) -{ - ThreadData *currentData = object->thread_->data_; - ThreadData *targetData = data_; - - MutexLocker lockerFrom(currentData->messages_.mutex_, std::defer_lock); - MutexLocker lockerTo(targetData->messages_.mutex_, std::defer_lock); - std::lock(lockerFrom, lockerTo); - - moveObject(object, currentData, targetData); -} - -void Thread::moveObject(Object *object, ThreadData *currentData, - ThreadData *targetData) -{ - /* Move pending messages to the message queue of the new thread. */ - if (object->pendingMessages_) { - unsigned int movedMessages = 0; - - for (std::unique_ptr &msg : currentData->messages_.list_) { - if (!msg) - continue; - if (msg->receiver_ != object) - continue; - - targetData->messages_.list_.push_back(std::move(msg)); - movedMessages++; - } - - if (movedMessages) { - EventDispatcher *dispatcher = - targetData->dispatcher_.load(std::memory_order_acquire); - if (dispatcher) - dispatcher->interrupt(); - } - } - - object->thread_ = this; - - /* Move all children. */ - for (auto child : object->children_) - moveObject(child, currentData, targetData); -} - -} /* namespace libcamera */ diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp deleted file mode 100644 index 9496671e..00000000 --- a/src/libcamera/timer.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * timer.cpp - Generic timer - */ - -#include "libcamera/internal/timer.h" - -#include - -#include - -#include - -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" - -/** - * \file timer.h - * \brief Generic timer - */ - -namespace libcamera { - -LOG_DEFINE_CATEGORY(Timer) - -/** - * \class Timer - * \brief Single-shot timer interface - * - * The Timer class models a single-shot timer that is started with start() and - * emits the \ref timeout signal when it times out. - * - * Once started the timer will run until it times out. It can be stopped with - * stop(), and once it times out or is stopped, can be started again with - * start(). - * - * The timer deadline is specified as either a duration in milliseconds or an - * absolute time point. If the deadline is set to the current time or to the - * past, the timer will time out immediately when execution returns to the - * event loop of the timer's thread. - * - * Timers run in the thread they belong to, and thus emit the \a ref timeout - * signal from that thread. To avoid race conditions they must not be started - * or stopped from a different thread, attempts to do so will be rejected and - * logged, and may cause undefined behaviour. - */ - -/** - * \brief Construct a timer - * \param[in] parent The parent Object - */ -Timer::Timer(Object *parent) - : Object(parent), running_(false) -{ -} - -Timer::~Timer() -{ - stop(); -} - -/** - * \fn Timer::start(unsigned int msec) - * \brief Start or restart the timer with a timeout of \a msec - * \param[in] msec The timer duration in milliseconds - * - * If the timer is already running it will be stopped and restarted. - * - * \context This function is \threadbound. - */ - -/** - * \brief Start or restart the timer with a timeout of \a duration - * \param[in] duration The timer duration in milliseconds - * - * If the timer is already running it will be stopped and restarted. - * - * \context This function is \threadbound. - */ -void Timer::start(std::chrono::milliseconds duration) -{ - start(utils::clock::now() + duration); -} - -/** - * \brief Start or restart the timer with a \a deadline - * \param[in] deadline The timer deadline - * - * If the timer is already running it will be stopped and restarted. - * - * \context This function is \threadbound. - */ -void Timer::start(std::chrono::steady_clock::time_point deadline) -{ - if (Thread::current() != thread()) { - LOG(Timer, Error) << "Timer can't be started from another thread"; - return; - } - - deadline_ = deadline; - - LOG(Timer, Debug) - << "Starting timer " << this << ": deadline " - << utils::time_point_to_string(deadline_); - - if (isRunning()) - unregisterTimer(); - - registerTimer(); -} - -/** - * \brief Stop the timer - * - * After this function returns the timer is guaranteed not to emit the - * \ref timeout signal. - * - * If the timer is not running this function performs no operation. - * - * \context This function is \threadbound. - */ -void Timer::stop() -{ - if (!isRunning()) - return; - - if (Thread::current() != thread()) { - LOG(Timer, Error) << "Timer can't be stopped from another thread"; - return; - } - - unregisterTimer(); -} - -void Timer::registerTimer() -{ - thread()->eventDispatcher()->registerTimer(this); - running_ = true; -} - -void Timer::unregisterTimer() -{ - running_ = false; - thread()->eventDispatcher()->unregisterTimer(this); -} - -/** - * \brief Check if the timer is running - * \return True if the timer is running, false otherwise - */ -bool Timer::isRunning() const -{ - return running_; -} - -/** - * \fn Timer::deadline() - * \brief Retrieve the timer deadline - * \return The timer deadline - */ - -/** - * \var Timer::timeout - * \brief Signal emitted when the timer times out - * - * The timer pointer is passed as a parameter. - */ - -void Timer::message(Message *msg) -{ - if (msg->type() == Message::ThreadMoveMessage) { - if (isRunning()) { - unregisterTimer(); - invokeMethod(&Timer::registerTimer, - ConnectionTypeQueued); - } - } - - Object::message(msg); -} - -} /* namespace libcamera */ diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index facb53e1..334b9b78 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/sysfs.h" /** diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 166d93cf..87d728fe 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -12,11 +12,12 @@ #include #include +#include + #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" /** * \file v4l2_pixelformat.h diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 2c56cfaf..8fe5e45b 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -19,9 +19,9 @@ #include +#include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 12c09dc7..dc23510b 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -21,10 +21,11 @@ #include +#include + #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 97825c71..157ab94e 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index d2380462..dbe0573b 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -12,13 +12,13 @@ #include #include +#include + #include #include #include #include -#include "libcamera/internal/semaphore.h" - using namespace libcamera; class V4L2Camera diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index a5a25507..7682c4bd 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -18,12 +18,12 @@ #include #include -#include +#include +#include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "v4l2_camera.h" #include "v4l2_camera_file.h" diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 27de6c50..e566125a 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -19,12 +19,11 @@ #include #include -#include -#include - +#include #include -#include "libcamera/internal/log.h" +#include +#include #include "v4l2_camera_file.h" diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 61f4eb92..c504ea09 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,11 +12,12 @@ #include #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index c4bc2110..238d98db 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 8ae05ac6..1cc17b04 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -10,9 +10,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/event-thread.cpp b/test/event-thread.cpp index aeb8b3bf..05c5d26d 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -10,9 +10,10 @@ #include #include +#include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/event.cpp b/test/event.cpp index 1f16c97b..aa79da99 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -9,10 +9,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp index 94cb8593..bb160537 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -14,10 +14,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/file.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index d6ca6f51..656d8655 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -14,15 +14,16 @@ #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/event_notifier.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index 80157b34..aa35c8f0 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -16,10 +16,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp index 161d09b9..6fe7fd9b 100644 --- a/test/ipc/unixsocket_ipc.cpp +++ b/test/ipc/unixsocket_ipc.cpp @@ -15,19 +15,18 @@ #include #include +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" - using namespace std; using namespace libcamera; diff --git a/test/log/log_api.cpp b/test/log/log_api.cpp index ae3c607a..53118960 100644 --- a/test/log/log_api.cpp +++ b/test/log/log_api.cpp @@ -16,9 +16,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include #include "test.h" diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 413d9207..d138aa7f 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -16,13 +16,13 @@ #include +#include +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/message.cpp b/test/message.cpp index 9553ba8c..eeea57fe 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -9,8 +9,8 @@ #include #include -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include #include "test.h" diff --git a/test/object-delete.cpp b/test/object-delete.cpp index a1a6f5cc..eabefe93 100644 --- a/test/object-delete.cpp +++ b/test/object-delete.cpp @@ -7,9 +7,8 @@ #include -#include - -#include "libcamera/internal/thread.h" +#include +#include #include "test.h" diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index a6f816f3..b1c0f473 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -8,10 +8,9 @@ #include #include -#include - -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" +#include +#include +#include #include "test.h" diff --git a/test/object.cpp b/test/object.cpp index 264659b4..cbd0d3ec 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -7,10 +7,9 @@ #include -#include - -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include +#include #include "test.h" diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index a5155bae..8f7a1f05 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -9,12 +9,13 @@ #include #include + +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/serialization/ipa_data_serializer_test.cpp b/test/serialization/ipa_data_serializer_test.cpp index dbbba891..880bcd02 100644 --- a/test/serialization/ipa_data_serializer_test.cpp +++ b/test/serialization/ipa_data_serializer_test.cpp @@ -17,13 +17,14 @@ #include #include +#include +#include + #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "serialization_test.h" #include "test.h" diff --git a/test/signal-threads.cpp b/test/signal-threads.cpp index 8a96b5d2..d5e2eb66 100644 --- a/test/signal-threads.cpp +++ b/test/signal-threads.cpp @@ -9,11 +9,10 @@ #include #include +#include +#include #include -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" - #include "test.h" using namespace std; diff --git a/test/signal.cpp b/test/signal.cpp index f83ceb05..aceb0278 100644 --- a/test/signal.cpp +++ b/test/signal.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include "test.h" diff --git a/test/threads.cpp b/test/threads.cpp index e0c50dc9..d83b5833 100644 --- a/test/threads.cpp +++ b/test/threads.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/thread.h" +#include #include "test.h" diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index be29eee1..2c14865b 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -8,9 +8,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/timer.cpp b/test/timer.cpp index fc90b110..88f226e7 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -8,9 +8,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index c75259be..91b3e4a0 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -14,9 +14,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index accdb34a..f12c8bef 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index e0f06808..fe4b3cc6 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -9,11 +9,12 @@ #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "test.h" diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl index dc674815..5a64fe9c 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl @@ -23,6 +23,9 @@ #include #include +#include +#include + #include "libcamera/internal/control_serializer.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipa_module.h" @@ -30,9 +33,7 @@ #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" namespace libcamera { diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl index 017b870c..ae168548 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl @@ -19,12 +19,13 @@ #include #include +#include + #include "libcamera/internal/control_serializer.h" #include "libcamera/internal/ipa_proxy.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/thread.h" namespace libcamera { {%- if has_namespace %} diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl index 8a57b6cc..d993e39e 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl @@ -26,17 +26,18 @@ #include #include +#include +#include +#include + #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/control_serializer.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" using namespace libcamera; -- cgit v1.2.1