5 files changed, 50 insertions, 47 deletions

diff --git a/src/apps/common/dng_writer.h b/src/apps/common/dng_writer.h
index 917713e6..aaa8a852 100644
--- a/src/apps/common/dng_writer.h
+++ b/src/apps/common/dng_writer.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #ifdef HAVE_TIFF
-#define HAVE_DNG
 
 #include <libcamera/camera.h>
 #include <libcamera/controls.h>
diff --git a/src/apps/common/event_loop.cpp b/src/apps/common/event_loop.cpp
index f7f9afa0..b6230f4b 100644
--- a/src/apps/common/event_loop.cpp
+++ b/src/apps/common/event_loop.cpp
@@ -21,12 +21,35 @@ EventLoop::EventLoop()
 	evthread_use_pthreads();
 	base_ = event_base_new();
 	instance_ = this;
+
+	callsTrigger_ = event_new(base_, -1, EV_PERSIST, [](evutil_socket_t, short, void *closure) {
+		auto *self = static_cast<EventLoop *>(closure);
+
+		for (;;) {
+			std::function<void()> call;
+
+			{
+				std::lock_guard locker(self->lock_);
+				if (self->calls_.empty())
+					break;
+
+				call = std::move(self->calls_.front());
+				self->calls_.pop_front();
+			}
+
+			call();
+		}
+	}, this);
+	assert(callsTrigger_);
+	event_add(callsTrigger_, nullptr);
 }
 
 EventLoop::~EventLoop()
 {
 	instance_ = nullptr;
 
+	event_free(callsTrigger_);
+
 	events_.clear();
 	event_base_free(base_);
 	libevent_global_shutdown();
@@ -50,20 +73,20 @@ void EventLoop::exit(int code)
 	event_base_loopbreak(base_);
 }
 
-void EventLoop::callLater(const std::function<void()> &func)
+void EventLoop::callLater(std::function<void()> &&func)
 {
 	{
 		std::unique_lock<std::mutex> locker(lock_);
-		calls_.push_back(func);
+		calls_.push_back(std::move(func));
 	}
 
-	event_base_once(base_, -1, EV_TIMEOUT, dispatchCallback, this, nullptr);
+	event_active(callsTrigger_, 0, 0);
 }
 
 void EventLoop::addFdEvent(int fd, EventType type,
-			   const std::function<void()> &callback)
+			   std::function<void()> &&callback)
 {
-	std::unique_ptr<Event> event = std::make_unique<Event>(callback);
+	std::unique_ptr<Event> event = std::make_unique<Event>(std::move(callback));
 	short events = (type & Read ? EV_READ : 0)
 		     | (type & Write ? EV_WRITE : 0)
 		     | EV_PERSIST;
@@ -85,9 +108,9 @@ void EventLoop::addFdEvent(int fd, EventType type,
 }
 
 void EventLoop::addTimerEvent(const std::chrono::microseconds period,
-			      const std::function<void()> &callback)
+			      std::function<void()> &&callback)
 {
-	std::unique_ptr<Event> event = std::make_unique<Event>(callback);
+	std::unique_ptr<Event> event = std::make_unique<Event>(std::move(callback));
 	event->event_ = event_new(base_, -1, EV_PERSIST, &EventLoop::Event::dispatch,
 				  event.get());
 	if (!event->event_) {
@@ -108,31 +131,8 @@ void EventLoop::addTimerEvent(const std::chrono::microseconds period,
 	events_.push_back(std::move(event));
 }
 
-void EventLoop::dispatchCallback([[maybe_unused]] evutil_socket_t fd,
-				 [[maybe_unused]] short flags, void *param)
-{
-	EventLoop *loop = static_cast<EventLoop *>(param);
-	loop->dispatchCall();
-}
-
-void EventLoop::dispatchCall()
-{
-	std::function<void()> call;
-
-	{
-		std::unique_lock<std::mutex> locker(lock_);
-		if (calls_.empty())
-			return;
-
-		call = calls_.front();
-		calls_.pop_front();
-	}
-
-	call();
-}
-
-EventLoop::Event::Event(const std::function<void()> &callback)
-	: callback_(callback), event_(nullptr)
+EventLoop::Event::Event(std::function<void()> &&callback)
+	: callback_(std::move(callback)), event_(nullptr)
 {
 }
 
diff --git a/src/apps/common/event_loop.h b/src/apps/common/event_loop.h
index ef129b9a..d8b6df2f 100644
--- a/src/apps/common/event_loop.h
+++ b/src/apps/common/event_loop.h
@@ -8,11 +8,14 @@
 #pragma once
 
 #include <chrono>
+#include <deque>
 #include <functional>
 #include <list>
 #include <memory>
 #include <mutex>
 
+#include <libcamera/base/class.h>
+
 #include <event2/util.h>
 
 struct event_base;
@@ -33,18 +36,20 @@ public:
 	int exec();
 	void exit(int code = 0);
 
-	void callLater(const std::function<void()> &func);
+	void callLater(std::function<void()> &&func);
 
 	void addFdEvent(int fd, EventType type,
-			const std::function<void()> &handler);
+			std::function<void()> &&handler);
 
-	using duration = std::chrono::steady_clock::duration;
 	void addTimerEvent(const std::chrono::microseconds period,
-			   const std::function<void()> &handler);
+			   std::function<void()> &&handler);
 
 private:
+	LIBCAMERA_DISABLE_COPY_AND_MOVE(EventLoop)
+
 	struct Event {
-		Event(const std::function<void()> &callback);
+		Event(std::function<void()> &&callback);
+		LIBCAMERA_DISABLE_COPY_AND_MOVE(Event)
 		~Event();
 
 		static void dispatch(int fd, short events, void *arg);
@@ -58,11 +63,9 @@ private:
 	struct event_base *base_;
 	int exitCode_;
 
-	std::list<std::function<void()>> calls_;
+	std::deque<std::function<void()>> calls_;
+	struct event *callsTrigger_ = nullptr;
+
 	std::list<std::unique_ptr<Event>> events_;
 	std::mutex lock_;
-
-	static void dispatchCallback(evutil_socket_t fd, short flags,
-				     void *param);
-	void dispatchCall();
 };
diff --git a/src/apps/common/options.cpp b/src/apps/common/options.cpp
index ece268d0..cae193cc 100644
--- a/src/apps/common/options.cpp
+++ b/src/apps/common/options.cpp
@@ -1040,7 +1040,7 @@ void OptionsParser::usageOptions(const std::list<Option> &options,
 
 		std::cerr << std::setw(indent) << argument;
 
-		for (const char *help = option.help, *end = help; end; ) {
+		for (const char *help = option.help, *end = help; end;) {
 			end = strchr(help, '\n');
 			if (end) {
 				std::cerr << std::string(help, end - help + 1);
diff --git a/src/apps/common/ppm_writer.cpp b/src/apps/common/ppm_writer.cpp
index d6c8641d..368de8bf 100644
--- a/src/apps/common/ppm_writer.cpp
+++ b/src/apps/common/ppm_writer.cpp
@@ -7,6 +7,7 @@
 
 #include "ppm_writer.h"
 
+#include <errno.h>
 #include <fstream>
 #include <iostream>
 
@@ -28,7 +29,7 @@ int PPMWriter::write(const char *filename,
 	std::ofstream output(filename, std::ios::binary);
 	if (!output) {
 		std::cerr << "Failed to open ppm file: " << filename << std::endl;
-		return -EINVAL;
+		return -EIO;
 	}
 
 	output << "P6" << std::endl
@@ -36,7 +37,7 @@ int PPMWriter::write(const char *filename,
 	       << "255" << std::endl;
 	if (!output) {
 		std::cerr << "Failed to write the file header" << std::endl;
-		return -EINVAL;
+		return -EIO;
 	}
 
 	const unsigned int rowLength = config.size.width * 3;
@@ -45,7 +46,7 @@ int PPMWriter::write(const char *filename,
 		output.write(row, rowLength);
 		if (!output) {
 			std::cerr << "Failed to write image data at row " << y << std::endl;
-			return -EINVAL;
+			return -EIO;
 		}
 	}