libcamera: Move EventDispatcher to internal API

There's no user of the EventDispatcher (and the related EventNotifier
and Timer classes) outside of libcamera. Move those classes to the
internal API.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

include/libcamera/camera_manager.h

@@ -19,7 +19,6 @@
 namespace libcamera {
 
 class Camera;
-class EventDispatcher;
 
 class CameraManager : public Object, public Extensible
 {
@@ -43,9 +42,6 @@ public:
 
 	static const std::string &version() { return version_; }
 
-	void setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher);
-	EventDispatcher *eventDispatcher();
-
 	Signal<std::shared_ptr<Camera>> cameraAdded;
 	Signal<std::shared_ptr<Camera>> cameraRemoved;
 

include/libcamera/internal/event_dispatcher_poll.h

@@ -11,7 +11,7 @@
 #include <map>
 #include <vector>
 
-#include <libcamera/event_dispatcher.h>
+#include "libcamera/internal/event_dispatcher.h"
 
 struct pollfd;
 

include/libcamera/internal/meson.build

@@ -18,7 +18,9 @@ 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',
     'ipa_context_wrapper.h',
@@ -36,6 +38,7 @@ libcamera_internal_headers = files([
     'semaphore.h',
     'sysfs.h',
     'thread.h',
+    'timer.h',
     'utils.h',
     'v4l2_controls.h',
     'v4l2_device.h',

include/libcamera/meson.build

@@ -6,8 +6,6 @@ libcamera_public_headers = files([
     'camera.h',
     'camera_manager.h',
     'controls.h',
-    'event_dispatcher.h',
-    'event_notifier.h',
     'extensible.h',
     'file_descriptor.h',
     'framebuffer_allocator.h',
@@ -19,7 +17,6 @@ libcamera_public_headers = files([
     'signal.h',
     'span.h',
     'stream.h',
-    'timer.h',
     'transform.h',
 ])
 

src/libcamera/camera_manager.cpp

@@ -11,10 +11,8 @@
 #include <map>
 
 #include <libcamera/camera.h>
-#include <libcamera/event_dispatcher.h>
 
 #include "libcamera/internal/device_enumerator.h"
-#include "libcamera/internal/event_dispatcher_poll.h"
 #include "libcamera/internal/ipa_manager.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/pipeline_handler.h"
@@ -244,12 +242,8 @@ void CameraManager::Private::removeCamera(Camera *camera)
  * a time. Attempting to create a second instance without first deleting the
  * existing instance results in undefined behaviour.
  *
- * The manager is initially stopped, and shall be configured before being
- * started. In particular a custom event dispatcher shall be installed if
- * needed with CameraManager::setEventDispatcher().
- *
- * Once the camera manager is configured, it shall be started with start().
- * This will enumerate all the cameras present in the system, which can then be
+ * The manager is initially stopped, and shall be started with start(). This
+ * will enumerate all the cameras present in the system, which can then be
  * listed with list() and retrieved with get().
  *
  * Cameras are shared through std::shared_ptr<>, ensuring that a camera will
@@ -477,38 +471,4 @@ void CameraManager::removeCamera(std::shared_ptr<Camera> camera)
  * \return The libcamera version string
  */
 
-/**
- * \brief Set the event dispatcher
- * \param[in] dispatcher Pointer to the event dispatcher
- *
- * libcamera requires an event dispatcher to integrate event notification and
- * timers with the application event loop. Applications that want to provide
- * their own event dispatcher shall call this function once and only once before
- * the camera manager is started with start(). If no event dispatcher is
- * provided, a default poll-based implementation will be used.
- *
- * The CameraManager takes ownership of the event dispatcher and will delete it
- * when the application terminates.
- */
-void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher)
-{
-	thread()->setEventDispatcher(std::move(dispatcher));
-}
-
-/**
- * \brief Retrieve the event dispatcher
- *
- * This function retrieves the event dispatcher set with setEventDispatcher().
- * If no dispatcher has been set, a default poll-based implementation is created
- * and returned, and no custom event dispatcher may be installed anymore.
- *
- * The returned event dispatcher is valid until the camera manager is destroyed.
- *
- * \return Pointer to the event dispatcher
- */
-EventDispatcher *CameraManager::eventDispatcher()
-{
-	return thread()->eventDispatcher();
-}
-
 } /* namespace libcamera */

src/libcamera/device_enumerator_udev.cpp

@@ -17,8 +17,7 @@
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
-#include <libcamera/event_notifier.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/media_device.h"
 

src/libcamera/event_dispatcher.cpp

@@ -5,7 +5,7 @@
  * event_dispatcher.cpp - Event dispatcher
  */
 
-#include <libcamera/event_dispatcher.h>
+#include "libcamera/internal/event_dispatcher.h"
 
 #include "libcamera/internal/log.h"
 

src/libcamera/event_dispatcher_poll.cpp

@@ -16,11 +16,10 @@
 #include <sys/eventfd.h>
 #include <unistd.h>
 
-#include <libcamera/event_notifier.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 #include "libcamera/internal/utils.h"
 
 /**

src/libcamera/event_notifier.cpp

@@ -5,11 +5,11 @@
  * event_notifier.cpp - File descriptor event notifier
  */
 
-#include <libcamera/event_notifier.h>
+#include "libcamera/internal/event_notifier.h"
 
 #include <libcamera/camera_manager.h>
-#include <libcamera/event_dispatcher.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/message.h"
 #include "libcamera/internal/thread.h"
 

src/libcamera/ipc_unixsocket.cpp

@@ -12,8 +12,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <libcamera/event_notifier.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 
 /**

src/libcamera/pipeline/rkisp1/timeline.h

@@ -10,8 +10,7 @@
 #include <list>
 #include <map>
 
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/timer.h"
 #include "libcamera/internal/utils.h"
 
 namespace libcamera {

src/libcamera/process.cpp

@@ -20,8 +20,7 @@
 #include <unistd.h>
 #include <vector>
 
-#include <libcamera/event_notifier.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/utils.h"
 

src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp

@@ -9,10 +9,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libcamera/event_dispatcher.h>
 #include <libcamera/ipa/ipa_interface.h>
 #include <libcamera/logging.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/ipa_module.h"
 #include "libcamera/internal/ipc_unixsocket.h"
 #include "libcamera/internal/log.h"

src/libcamera/thread.cpp

@@ -14,8 +14,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libcamera/event_dispatcher.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/event_dispatcher_poll.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/message.h"

src/libcamera/timer.cpp

@@ -5,13 +5,13 @@
  * timer.cpp - Generic timer
  */
 
-#include <libcamera/timer.h>
+#include "libcamera/internal/timer.h"
 
 #include <chrono>
 
 #include <libcamera/camera_manager.h>
-#include <libcamera/event_dispatcher.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/message.h"
 #include "libcamera/internal/thread.h"

src/libcamera/v4l2_device.cpp

@@ -16,8 +16,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#include <libcamera/event_notifier.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/sysfs.h"
 #include "libcamera/internal/utils.h"

src/libcamera/v4l2_videodevice.cpp

@@ -20,9 +20,9 @@
 
 #include <linux/version.h>
 
-#include <libcamera/event_notifier.h>
 #include <libcamera/file_descriptor.h>
 
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/media_device.h"
 #include "libcamera/internal/media_object.h"

test/camera/buffer_import.cpp

@@ -12,12 +12,11 @@
 #include <numeric>
 #include <vector>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
 #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"

test/camera/capture.cpp

@@ -7,11 +7,11 @@
 
 #include <iostream>
 
-#include <libcamera/event_dispatcher.h>
 #include <libcamera/framebuffer_allocator.h>
-#include <libcamera/timer.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "camera_test.h"
 #include "test.h"

test/event-dispatcher.cpp

@@ -10,10 +10,9 @@
 #include <signal.h>
 #include <sys/time.h>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/event-thread.cpp

@@ -10,10 +10,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libcamera/event_notifier.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/event.cpp

@@ -9,11 +9,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/event_notifier.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
+#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/hotplug-cameras.cpp

@@ -13,11 +13,11 @@
 
 #include <libcamera/camera.h>
 #include <libcamera/camera_manager.h>
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/file.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/ipa/ipa_interface_test.cpp

@@ -12,16 +12,16 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/event_notifier.h>
 #include <libcamera/ipa/vimc.h>
-#include <libcamera/timer.h>
 
 #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/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/ipc/unixsocket.cpp

@@ -15,11 +15,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/ipc_unixsocket.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 #include "libcamera/internal/utils.h"
 
 #include "test.h"

test/log/log_process.cpp

@@ -14,13 +14,13 @@
 #include <unistd.h>
 #include <vector>
 
-#include <libcamera/event_dispatcher.h>
 #include <libcamera/logging.h>
-#include <libcamera/timer.h>
 
+#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 "libcamera/internal/utils.h"
 
 #include "test.h"

test/object-invoke.cpp

@@ -8,9 +8,9 @@
 #include <iostream>
 #include <thread>
 
-#include <libcamera/event_dispatcher.h>
 #include <libcamera/object.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
 
 #include "test.h"

test/process/process_test.cpp

@@ -9,11 +9,10 @@
 #include <unistd.h>
 #include <vector>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/process.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 #include "libcamera/internal/utils.h"
 
 #include "test.h"

test/timer-thread.cpp

@@ -8,10 +8,9 @@
 #include <chrono>
 #include <iostream>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/timer.cpp

@@ -8,10 +8,9 @@
 #include <chrono>
 #include <iostream>
 
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
-
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "test.h"
 

test/v4l2_videodevice/buffer_sharing.cpp

@@ -13,10 +13,10 @@
 #include <iostream>
 
 #include <libcamera/buffer.h>
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "v4l2_videodevice_test.h"
 

test/v4l2_videodevice/capture_async.cpp

@@ -8,10 +8,10 @@
 #include <iostream>
 
 #include <libcamera/buffer.h>
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
 
+#include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/thread.h"
+#include "libcamera/internal/timer.h"
 
 #include "v4l2_videodevice_test.h"
 

test/v4l2_videodevice/v4l2_m2mdevice.cpp

@@ -8,12 +8,12 @@
 #include <iostream>
 
 #include <libcamera/buffer.h>
-#include <libcamera/event_dispatcher.h>
-#include <libcamera/timer.h>
 
 #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"