Patch Detail
Show a patch.
GET /api/patches/10418/?format=api
{ "id": 10418, "url": "https://patchwork.libcamera.org/api/patches/10418/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10418/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20201113063815.10288-4-laurent.pinchart@ideasonboard.com>", "date": "2020-11-13T06:38:13", "name": "[libcamera-devel,v1,3/5] libcamera: Move EventDispatcher to internal API", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "93bc8b261b8583d3ec945d6b447931e531778b20", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10418/mbox/", "series": [ { "id": 1458, "url": "https://patchwork.libcamera.org/api/series/1458/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1458", "date": "2020-11-13T06:38:10", "name": "cam: Move request processing to main thread", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1458/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10418/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10418/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5975ABE087\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 13 Nov 2020 06:38:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DC06D631BA;\n\tFri, 13 Nov 2020 07:38:26 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 15E4B63149\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 13 Nov 2020 07:38:25 +0100 (CET)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A3F7F31A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 13 Nov 2020 07:38:24 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"exliK8Hr\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1605249504;\n\tbh=hIZTCPyRR/uYyXkmN/uzw+Ae/aloEStCMJEuVE6JqCw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=exliK8HrUD+0Hl/ipMeYIiYcjigN0ahm0qYVxLDpBWX/Kjh5ajVPLFPw36VGfy/q+\n\tIJwtlWI7CuvYRnhE8r1mgWv8Pq+FlfUekWwo1BsKovHlJiBC407ffZbDRvqLXb/Hve\n\tb7A0Fdzv5aYnn16d3OEy1D8AjugAkKFN2CMXPHd8=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 13 Nov 2020 08:38:13 +0200", "Message-Id": "<20201113063815.10288-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20201113063815.10288-1-laurent.pinchart@ideasonboard.com>", "References": "<20201113063815.10288-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v1 3/5] libcamera: Move EventDispatcher to\n\tinternal API", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "There's no user of the EventDispatcher (and the related EventNotifier\nand Timer classes) outside of libcamera. Move those classes to the\ninternal API.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/camera_manager.h | 4 --\n .../{ => internal}/event_dispatcher.h | 0\n .../internal/event_dispatcher_poll.h | 2 +-\n .../libcamera/{ => internal}/event_notifier.h | 0\n include/libcamera/internal/meson.build | 3 ++\n include/libcamera/{ => internal}/timer.h | 0\n include/libcamera/meson.build | 3 --\n src/libcamera/camera_manager.cpp | 44 +------------------\n src/libcamera/device_enumerator_udev.cpp | 3 +-\n src/libcamera/event_dispatcher.cpp | 2 +-\n src/libcamera/event_dispatcher_poll.cpp | 5 +--\n src/libcamera/event_notifier.cpp | 4 +-\n src/libcamera/ipc_unixsocket.cpp | 3 +-\n src/libcamera/pipeline/rkisp1/timeline.h | 3 +-\n src/libcamera/process.cpp | 3 +-\n .../proxy/worker/ipa_proxy_linux_worker.cpp | 2 +-\n src/libcamera/thread.cpp | 3 +-\n src/libcamera/timer.cpp | 4 +-\n src/libcamera/v4l2_device.cpp | 3 +-\n src/libcamera/v4l2_videodevice.cpp | 2 +-\n test/camera/buffer_import.cpp | 5 +--\n test/camera/capture.cpp | 5 ++-\n test/event-dispatcher.cpp | 5 +--\n test/event-thread.cpp | 5 +--\n test/event.cpp | 7 ++-\n test/hotplug-cameras.cpp | 4 +-\n test/ipa/ipa_interface_test.cpp | 6 +--\n test/ipc/unixsocket.cpp | 5 +--\n test/log/log_process.cpp | 4 +-\n test/object-invoke.cpp | 2 +-\n test/process/process_test.cpp | 5 +--\n test/timer-thread.cpp | 5 +--\n test/timer.cpp | 5 +--\n test/v4l2_videodevice/buffer_sharing.cpp | 4 +-\n test/v4l2_videodevice/capture_async.cpp | 4 +-\n test/v4l2_videodevice/v4l2_m2mdevice.cpp | 4 +-\n 36 files changed, 55 insertions(+), 113 deletions(-)\n rename include/libcamera/{ => internal}/event_dispatcher.h (100%)\n rename include/libcamera/{ => internal}/event_notifier.h (100%)\n rename include/libcamera/{ => internal}/timer.h (100%)", "diff": "diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 6d5341c76412..8c8830e7ff1d 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -19,7 +19,6 @@\n namespace libcamera {\n \n class Camera;\n-class EventDispatcher;\n \n class CameraManager : public Object, public Extensible\n {\n@@ -43,9 +42,6 @@ public:\n \n \tstatic const std::string &version() { return version_; }\n \n-\tvoid setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher);\n-\tEventDispatcher *eventDispatcher();\n-\n \tSignal<std::shared_ptr<Camera>> cameraAdded;\n \tSignal<std::shared_ptr<Camera>> cameraRemoved;\n \ndiff --git a/include/libcamera/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h\nsimilarity index 100%\nrename from include/libcamera/event_dispatcher.h\nrename to include/libcamera/internal/event_dispatcher.h\ndiff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h\nindex 39d9be525dab..33de051de261 100644\n--- a/include/libcamera/internal/event_dispatcher_poll.h\n+++ b/include/libcamera/internal/event_dispatcher_poll.h\n@@ -11,7 +11,7 @@\n #include <map>\n #include <vector>\n \n-#include <libcamera/event_dispatcher.h>\n+#include \"libcamera/internal/event_dispatcher.h\"\n \n struct pollfd;\n \ndiff --git a/include/libcamera/event_notifier.h b/include/libcamera/internal/event_notifier.h\nsimilarity index 100%\nrename from include/libcamera/event_notifier.h\nrename to include/libcamera/internal/event_notifier.h\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 6500fe2a82fb..7cde023f7c3a 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -18,7 +18,9 @@ libcamera_internal_headers = files([\n 'device_enumerator.h',\n 'device_enumerator_sysfs.h',\n 'device_enumerator_udev.h',\n+ 'event_dispatcher.h',\n 'event_dispatcher_poll.h',\n+ 'event_notifier.h',\n 'file.h',\n 'formats.h',\n 'ipa_context_wrapper.h',\n@@ -36,6 +38,7 @@ libcamera_internal_headers = files([\n 'semaphore.h',\n 'sysfs.h',\n 'thread.h',\n+ 'timer.h',\n 'utils.h',\n 'v4l2_controls.h',\n 'v4l2_device.h',\ndiff --git a/include/libcamera/timer.h b/include/libcamera/internal/timer.h\nsimilarity index 100%\nrename from include/libcamera/timer.h\nrename to include/libcamera/internal/timer.h\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex 0b891a8f4f9b..cf2935f1ee95 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -6,8 +6,6 @@ libcamera_public_headers = files([\n 'camera.h',\n 'camera_manager.h',\n 'controls.h',\n- 'event_dispatcher.h',\n- 'event_notifier.h',\n 'extensible.h',\n 'file_descriptor.h',\n 'framebuffer_allocator.h',\n@@ -19,7 +17,6 @@ libcamera_public_headers = files([\n 'signal.h',\n 'span.h',\n 'stream.h',\n- 'timer.h',\n 'transform.h',\n ])\n \ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 427ea5daf671..67641a555e1e 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -11,10 +11,8 @@\n #include <map>\n \n #include <libcamera/camera.h>\n-#include <libcamera/event_dispatcher.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n-#include \"libcamera/internal/event_dispatcher_poll.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n@@ -244,12 +242,8 @@ void CameraManager::Private::removeCamera(Camera *camera)\n * a time. Attempting to create a second instance without first deleting the\n * existing instance results in undefined behaviour.\n *\n- * The manager is initially stopped, and shall be configured before being\n- * started. In particular a custom event dispatcher shall be installed if\n- * needed with CameraManager::setEventDispatcher().\n- *\n- * Once the camera manager is configured, it shall be started with start().\n- * This will enumerate all the cameras present in the system, which can then be\n+ * The manager is initially stopped, and shall be started with start(). This\n+ * will enumerate all the cameras present in the system, which can then be\n * listed with list() and retrieved with get().\n *\n * Cameras are shared through std::shared_ptr<>, ensuring that a camera will\n@@ -477,38 +471,4 @@ void CameraManager::removeCamera(std::shared_ptr<Camera> camera)\n * \\return The libcamera version string\n */\n \n-/**\n- * \\brief Set the event dispatcher\n- * \\param[in] dispatcher Pointer to the event dispatcher\n- *\n- * libcamera requires an event dispatcher to integrate event notification and\n- * timers with the application event loop. Applications that want to provide\n- * their own event dispatcher shall call this function once and only once before\n- * the camera manager is started with start(). If no event dispatcher is\n- * provided, a default poll-based implementation will be used.\n- *\n- * The CameraManager takes ownership of the event dispatcher and will delete it\n- * when the application terminates.\n- */\n-void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher)\n-{\n-\tthread()->setEventDispatcher(std::move(dispatcher));\n-}\n-\n-/**\n- * \\brief Retrieve the event dispatcher\n- *\n- * This function retrieves the event dispatcher set with setEventDispatcher().\n- * If no dispatcher has been set, a default poll-based implementation is created\n- * and returned, and no custom event dispatcher may be installed anymore.\n- *\n- * The returned event dispatcher is valid until the camera manager is destroyed.\n- *\n- * \\return Pointer to the event dispatcher\n- */\n-EventDispatcher *CameraManager::eventDispatcher()\n-{\n-\treturn thread()->eventDispatcher();\n-}\n-\n } /* namespace libcamera */\ndiff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\nindex c6e23a1a7a18..d26fcf10b3c4 100644\n--- a/src/libcamera/device_enumerator_udev.cpp\n+++ b/src/libcamera/device_enumerator_udev.cpp\n@@ -17,8 +17,7 @@\n #include <sys/sysmacros.h>\n #include <unistd.h>\n \n-#include <libcamera/event_notifier.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/media_device.h\"\n \ndiff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/event_dispatcher.cpp\nindex 90bd5daf0612..e0ce1eb3cc04 100644\n--- a/src/libcamera/event_dispatcher.cpp\n+++ b/src/libcamera/event_dispatcher.cpp\n@@ -5,7 +5,7 @@\n * event_dispatcher.cpp - Event dispatcher\n */\n \n-#include <libcamera/event_dispatcher.h>\n+#include \"libcamera/internal/event_dispatcher.h\"\n \n #include \"libcamera/internal/log.h\"\n \ndiff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp\nindex 9ab85da7d75d..456c6def075b 100644\n--- a/src/libcamera/event_dispatcher_poll.cpp\n+++ b/src/libcamera/event_dispatcher_poll.cpp\n@@ -16,11 +16,10 @@\n #include <sys/eventfd.h>\n #include <unistd.h>\n \n-#include <libcamera/event_notifier.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/utils.h\"\n \n /**\ndiff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp\nindex 21c07faf0963..6b0575c0db77 100644\n--- a/src/libcamera/event_notifier.cpp\n+++ b/src/libcamera/event_notifier.cpp\n@@ -5,11 +5,11 @@\n * event_notifier.cpp - File descriptor event notifier\n */\n \n-#include <libcamera/event_notifier.h>\n+#include \"libcamera/internal/event_notifier.h\"\n \n #include <libcamera/camera_manager.h>\n-#include <libcamera/event_dispatcher.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/message.h\"\n #include \"libcamera/internal/thread.h\"\n \ndiff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp\nindex 5c8cce16200e..fdb359f7fcd1 100644\n--- a/src/libcamera/ipc_unixsocket.cpp\n+++ b/src/libcamera/ipc_unixsocket.cpp\n@@ -12,8 +12,7 @@\n #include <sys/socket.h>\n #include <unistd.h>\n \n-#include <libcamera/event_notifier.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n \n /**\ndiff --git a/src/libcamera/pipeline/rkisp1/timeline.h b/src/libcamera/pipeline/rkisp1/timeline.h\nindex 0c37b06fa6df..35a085159b8f 100644\n--- a/src/libcamera/pipeline/rkisp1/timeline.h\n+++ b/src/libcamera/pipeline/rkisp1/timeline.h\n@@ -10,8 +10,7 @@\n #include <list>\n #include <map>\n \n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/utils.h\"\n \n namespace libcamera {\ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex 72b5afe2f9c0..40a434a6b0c2 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -20,8 +20,7 @@\n #include <unistd.h>\n #include <vector>\n \n-#include <libcamera/event_notifier.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/utils.h\"\n \ndiff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\nindex 0c4687f737a3..bdbac988e057 100644\n--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n@@ -9,10 +9,10 @@\n #include <sys/types.h>\n #include <unistd.h>\n \n-#include <libcamera/event_dispatcher.h>\n #include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/logging.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/ipc_unixsocket.h\"\n #include \"libcamera/internal/log.h\"\ndiff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\nindex b5d7103ad341..f339dab165b6 100644\n--- a/src/libcamera/thread.cpp\n+++ b/src/libcamera/thread.cpp\n@@ -14,8 +14,7 @@\n #include <sys/types.h>\n #include <unistd.h>\n \n-#include <libcamera/event_dispatcher.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/event_dispatcher_poll.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/message.h\"\ndiff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp\nindex 24e452eda49e..c242113a782e 100644\n--- a/src/libcamera/timer.cpp\n+++ b/src/libcamera/timer.cpp\n@@ -5,13 +5,13 @@\n * timer.cpp - Generic timer\n */\n \n-#include <libcamera/timer.h>\n+#include \"libcamera/internal/timer.h\"\n \n #include <chrono>\n \n #include <libcamera/camera_manager.h>\n-#include <libcamera/event_dispatcher.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/message.h\"\n #include \"libcamera/internal/thread.h\"\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex fd0b140f8ce7..decd19ef5281 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -16,8 +16,7 @@\n #include <sys/syscall.h>\n #include <unistd.h>\n \n-#include <libcamera/event_notifier.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/sysfs.h\"\n #include \"libcamera/internal/utils.h\"\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 5ee1b479b513..e76fe2dd1f3a 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -20,9 +20,9 @@\n \n #include <linux/version.h>\n \n-#include <libcamera/event_notifier.h>\n #include <libcamera/file_descriptor.h>\n \n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_object.h\"\ndiff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex ccf532d7b7fc..7ff628269c47 100644\n--- a/test/camera/buffer_import.cpp\n+++ b/test/camera/buffer_import.cpp\n@@ -12,12 +12,11 @@\n #include <numeric>\n #include <vector>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n #include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n #include \"buffer_source.h\"\ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex fd5292b7c8c9..ec978068c977 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -7,9 +7,10 @@\n \n #include <iostream>\n \n-#include <libcamera/event_dispatcher.h>\n #include <libcamera/framebuffer_allocator.h>\n-#include <libcamera/timer.h>\n+\n+#include \"libcamera/internal/event_dispatcher.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"libcamera/internal/thread.h\"\n \ndiff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp\nindex 1b61778699ed..8ae05ac62985 100644\n--- a/test/event-dispatcher.cpp\n+++ b/test/event-dispatcher.cpp\n@@ -10,10 +10,9 @@\n #include <signal.h>\n #include <sys/time.h>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/event-thread.cpp b/test/event-thread.cpp\nindex c90e6ac04dd3..aeb8b3bf4bac 100644\n--- a/test/event-thread.cpp\n+++ b/test/event-thread.cpp\n@@ -10,10 +10,9 @@\n #include <string.h>\n #include <unistd.h>\n \n-#include <libcamera/event_notifier.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/event.cpp b/test/event.cpp\nindex c865092c7a8a..1f16c97bbab5 100644\n--- a/test/event.cpp\n+++ b/test/event.cpp\n@@ -9,11 +9,10 @@\n #include <string.h>\n #include <unistd.h>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/event_notifier.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp\nindex 7d551eeb900d..94cb859352ec 100644\n--- a/test/hotplug-cameras.cpp\n+++ b/test/hotplug-cameras.cpp\n@@ -13,11 +13,11 @@\n \n #include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/file.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex 67488409e7ff..9f575f9350ec 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -12,16 +12,16 @@\n #include <sys/types.h>\n #include <unistd.h>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/event_notifier.h>\n #include <libcamera/ipa/vimc.h>\n-#include <libcamera/timer.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/event_dispatcher.h\"\n+#include \"libcamera/internal/event_notifier.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp\nindex 9cd07ce8d415..19a1d7dd8a2d 100644\n--- a/test/ipc/unixsocket.cpp\n+++ b/test/ipc/unixsocket.cpp\n@@ -15,11 +15,10 @@\n #include <sys/wait.h>\n #include <unistd.h>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/ipc_unixsocket.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/utils.h\"\n \n #include \"test.h\"\ndiff --git a/test/log/log_process.cpp b/test/log/log_process.cpp\nindex 2a82622236b4..c0a1a012d366 100644\n--- a/test/log/log_process.cpp\n+++ b/test/log/log_process.cpp\n@@ -14,13 +14,13 @@\n #include <unistd.h>\n #include <vector>\n \n-#include <libcamera/event_dispatcher.h>\n #include <libcamera/logging.h>\n-#include <libcamera/timer.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/process.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/utils.h\"\n \n #include \"test.h\"\ndiff --git a/test/object-invoke.cpp b/test/object-invoke.cpp\nindex f3fd23283239..a6f816f395eb 100644\n--- a/test/object-invoke.cpp\n+++ b/test/object-invoke.cpp\n@@ -8,9 +8,9 @@\n #include <iostream>\n #include <thread>\n \n-#include <libcamera/event_dispatcher.h>\n #include <libcamera/object.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n \n #include \"test.h\"\ndiff --git a/test/process/process_test.cpp b/test/process/process_test.cpp\nindex a3eaef80b2a2..1279d8c17598 100644\n--- a/test/process/process_test.cpp\n+++ b/test/process/process_test.cpp\n@@ -9,11 +9,10 @@\n #include <unistd.h>\n #include <vector>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/process.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/utils.h\"\n \n #include \"test.h\"\ndiff --git a/test/timer-thread.cpp b/test/timer-thread.cpp\nindex f794d8e7dd4e..be29eee1bdb6 100644\n--- a/test/timer-thread.cpp\n+++ b/test/timer-thread.cpp\n@@ -8,10 +8,9 @@\n #include <chrono>\n #include <iostream>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/timer.cpp b/test/timer.cpp\nindex 537489d736ad..fc90b11040d8 100644\n--- a/test/timer.cpp\n+++ b/test/timer.cpp\n@@ -8,10 +8,9 @@\n #include <chrono>\n #include <iostream>\n \n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n-\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"test.h\"\n \ndiff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\nindex 5e7e2d97f011..c75259be0d10 100644\n--- a/test/v4l2_videodevice/buffer_sharing.cpp\n+++ b/test/v4l2_videodevice/buffer_sharing.cpp\n@@ -13,10 +13,10 @@\n #include <iostream>\n \n #include <libcamera/buffer.h>\n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"v4l2_videodevice_test.h\"\n \ndiff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\nindex 2b38102e9cad..accdb34a699c 100644\n--- a/test/v4l2_videodevice/capture_async.cpp\n+++ b/test/v4l2_videodevice/capture_async.cpp\n@@ -8,10 +8,10 @@\n #include <iostream>\n \n #include <libcamera/buffer.h>\n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n \n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n \n #include \"v4l2_videodevice_test.h\"\n \ndiff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\nindex 616261e11c71..e0f068082c01 100644\n--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n@@ -8,12 +8,12 @@\n #include <iostream>\n \n #include <libcamera/buffer.h>\n-#include <libcamera/event_dispatcher.h>\n-#include <libcamera/timer.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/event_dispatcher.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n #include \"test.h\"\n", "prefixes": [ "libcamera-devel", "v1", "3/5" ] }