From 39e7b64ddf1171d834e886703ab3dce635e34173 Mon Sep 17 00:00:00 2001 From: Florian Fischer <florian.fischer@muhq.space> Date: Tue, 24 May 2022 12:17:48 +0200 Subject: [PATCH] negate waitfd punt option to fix builds of non waitfd configs --- emper/Emper.hpp | 6 +++--- meson.build | 2 +- meson_options.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emper/Emper.hpp b/emper/Emper.hpp index 3da73f71..4a1cb46d 100644 --- a/emper/Emper.hpp +++ b/emper/Emper.hpp @@ -162,10 +162,10 @@ const bool IO_NOTIFICATION = ; const bool IO_PUNT_WAITFD_READ = -#ifdef EMPER_IO_PUNT_WAITFD_READ - true -#else +#ifdef EMPER_IO_SKIP_WAITFD_READ_PUNT false +#else + true #endif ; diff --git a/meson.build b/meson.build index 97fc65d5..7f83826b 100644 --- a/meson.build +++ b/meson.build @@ -194,7 +194,7 @@ io_bool_options = [ {'option': 'notification', 'dependencies': {'worker_sleep_strategy': 'waitfd'}}, {'option': 'synchronous'}, - {'option': 'punt_waitfd_read', + {'option': 'skip_waitfd_read_punt', 'dependencies': {'worker_sleep_strategy': 'waitfd'}}, ] diff --git a/meson_options.txt b/meson_options.txt index d4c53d3e..feb8782e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -74,10 +74,10 @@ option( value: 'none', ) option( - 'io_punt_waitfd_read', + 'io_skip_waitfd_read_punt', type: 'boolean', - description: 'Punt the sleep watfd read to the io_wq', - value: true, + description: 'Skip punting the sleep waitfd read to the io_wq', + value: false, ) option( 'wakeup_semaphore_implementation', -- GitLab