From f4e72a97f6124aa86ee55d2102c99ae7bf90401e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Mon, 30 May 2022 14:00:08 +0200
Subject: [PATCH] [iwyu] Fix includes as per iwyu 0.18
---
emper/Runtime.cpp | 5 +++--
emper/io/GlobalIoContext.cpp | 2 +-
emper/lib/sync/SpuriousFutex2Semaphore.cpp | 1 -
iwyu-mappings.imp | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/emper/Runtime.cpp b/emper/Runtime.cpp
index 8625d704..6510636c 100644
--- a/emper/Runtime.cpp
+++ b/emper/Runtime.cpp
@@ -4,14 +4,13 @@
#include <numa.h>
#include <pthread.h> // for pthread_t, pthread_attr_init
-
-#include <cerrno> // for errno
// Non portable.
#include <sched.h> // for cpu_set_t, CPU_SET, CPU_ZERO
#include <sys/sysinfo.h> // for get_nprocs
#include <unistd.h>
#include <array>
+#include <cerrno>
#include <cstdlib> // for rand, srand, abort
#include <cstring>
#include <fstream> // IWYU pragma: keep
@@ -40,6 +39,7 @@
#include "lib/ShardedFileBuffer.hpp"
#include "lib/env.hpp"
#include "log/LogBuffer.hpp"
+#include "sleep_strategy/SemaphoreWorkerSleepStrategy.hpp"
#include "stats/FromAnywhere.hpp"
#include "stats/Worker.hpp"
@@ -57,6 +57,7 @@
#ifndef EMPER_HAS_GETTID
#include <syscall.h>
+
#define gettid() (syscall(SYS_gettid))
#endif
diff --git a/emper/io/GlobalIoContext.cpp b/emper/io/GlobalIoContext.cpp
index 73452ac0..91e9c60b 100644
--- a/emper/io/GlobalIoContext.cpp
+++ b/emper/io/GlobalIoContext.cpp
@@ -25,7 +25,7 @@
#include "io/SubmitActor.hpp"
#include "lib/TaggedPtr.hpp"
#include "lib/sync/Semaphore.hpp"
-#include "sleep_strategy/WorkerSleepStrategy.hpp"
+#include "sleep_strategy/SemaphoreWorkerSleepStrategy.hpp"
using emper::lib::TaggedPtr;
diff --git a/emper/lib/sync/SpuriousFutex2Semaphore.cpp b/emper/lib/sync/SpuriousFutex2Semaphore.cpp
index 72ffa390..349e0a0b 100644
--- a/emper/lib/sync/SpuriousFutex2Semaphore.cpp
+++ b/emper/lib/sync/SpuriousFutex2Semaphore.cpp
@@ -10,7 +10,6 @@
#include <cerrno>
#include "Worker.hpp"
-#include "emper-config.h"
#ifndef SYS_futex_waitv
#define SYS_futex_waitv 449
diff --git a/iwyu-mappings.imp b/iwyu-mappings.imp
index bbe2308c..a3161cf2 100644
--- a/iwyu-mappings.imp
+++ b/iwyu-mappings.imp
@@ -23,5 +23,6 @@
{ include: ["<boost/cstdint.hpp>", "private", "<cstdint>", "public"], },
{ symbol: ["__kernel_timespec", "private", "<liburing.h>", "public" ] },
+ { symbol: ["__s32", "private", "<liburing.h>", "public" ] },
{ symbol: ["std::filesystem", "private", "<filesystem>", "public" ] },
]
--
GitLab