Add missing include statements. Check for atomic wait support.

11 files changed, 16 insertions, 0 deletions

diff --git a/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp b/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp
index 9f251d4d491..953b2e7432e 100644
--- a/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp
+++ b/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp
@@ -11,6 +11,7 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/time.h>
 #include <vespa/fastos/thread.h>
+#include <thread>
 
 using namespace vespalib;
 using vespalib::make_string_short::fmt;
diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp
index 77c674ff1e6..ee18384598e 100644
--- a/storage/src/tests/storageserver/mergethrottlertest.cpp
+++ b/storage/src/tests/storageserver/mergethrottlertest.cpp
@@ -16,6 +16,7 @@
 #include <iterator>
 #include <vector>
 #include <chrono>
+#include <climits>
 #include <thread>
 
 using namespace document;
diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
index c465f974a9b..9a5fb2bdd13 100644
--- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
+++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
@@ -16,6 +16,7 @@
 #include <vespa/storageapi/message/stat.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/messagebus/error.h>
+#include <climits>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".documentapiconverter");
diff --git a/vespalib/src/tests/wakeup/wakeup_bench.cpp b/vespalib/src/tests/wakeup/wakeup_bench.cpp
index c39b8899159..dc6ca70a4d1 100644
--- a/vespalib/src/tests/wakeup/wakeup_bench.cpp
+++ b/vespalib/src/tests/wakeup/wakeup_bench.cpp
@@ -137,6 +137,7 @@ struct UsePipe : State {
     }
 };
 
+#if __cpp_lib_atomic_wait
 struct UseAtomic : State {
     void wakeup() {
         set_wakeup();
@@ -151,6 +152,7 @@ struct UseAtomic : State {
         // assert(!is_ready());
     }
 };
+#endif
 
 #ifdef __linux__
 struct UseFutex : State {
@@ -284,7 +286,9 @@ TEST(WakeupBench, using_spin_yield) { benchmark<Wakeup<UseSpinYield>>(); }
 TEST(WakeupBench, using_cond) { benchmark<Wakeup<UseCond>>(); }
 TEST(WakeupBench, using_cond_nolock) { benchmark<Wakeup<UseCondNolock>>(); }
 TEST(WakeupBench, using_pipe) { benchmark<Wakeup<UsePipe>>(); }
+#if __cpp_lib_atomic_wait
 TEST(WakeupBench, using_atomic) { benchmark<Wakeup<UseAtomic>>(); }
+#endif
 
 #ifdef __linux__
 TEST(WakeupBench, using_futex) { benchmark<Wakeup<UseFutex>>(); }
diff --git a/vespamalloc/src/vespamalloc/malloc/common.h b/vespamalloc/src/vespamalloc/malloc/common.h
index a8bc8b102ec..58e05878f64 100644
--- a/vespamalloc/src/vespamalloc/malloc/common.h
+++ b/vespamalloc/src/vespamalloc/malloc/common.h
@@ -4,7 +4,9 @@
 #include <new>
 #include <atomic>
 #include <cassert>
+#include <cstdio>
 #include <vespamalloc/util/osmem.h>
+#include <thread>
 
 extern "C" void MallocRecurseOnSuspend(bool recurse) __attribute__ ((noinline));
 
diff --git a/vespamalloc/src/vespamalloc/malloc/datasegment.cpp b/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
index 28b69717fb5..4bb36eade43 100644
--- a/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "datasegment.h"
+#include <unistd.h>
 
 namespace vespamalloc::segment {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/freelist.hpp b/vespamalloc/src/vespamalloc/malloc/freelist.hpp
index 0bc812b8ad3..9b18c375804 100644
--- a/vespamalloc/src/vespamalloc/malloc/freelist.hpp
+++ b/vespamalloc/src/vespamalloc/malloc/freelist.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "freelist.h"
+#include <climits>
 
 namespace vespamalloc::segment {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
index 88229aca77a..de72f0f3f2e 100644
--- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
+++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <vespamalloc/malloc/malloc.h>
 #include <vespamalloc/util/callstack.h>
 
diff --git a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
index 30e9985dae3..1d4cb5a6b5e 100644
--- a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
@@ -2,6 +2,7 @@
 #include "mmappool.h"
 #include "common.h"
 #include <sys/mman.h>
+#include <unistd.h>
 
 namespace vespamalloc {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/mmappool.h b/vespamalloc/src/vespamalloc/malloc/mmappool.h
index aa8679c8171..6c06b840b5b 100644
--- a/vespamalloc/src/vespamalloc/malloc/mmappool.h
+++ b/vespamalloc/src/vespamalloc/malloc/mmappool.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <atomic>
+#include <mutex>
 #include <unordered_map>
 
 namespace vespamalloc {
diff --git a/vespamalloc/src/vespamalloc/util/osmem.cpp b/vespamalloc/src/vespamalloc/util/osmem.cpp
index c61926c084b..e0cfbc36938 100644
--- a/vespamalloc/src/vespamalloc/util/osmem.cpp
+++ b/vespamalloc/src/vespamalloc/util/osmem.cpp
@@ -2,6 +2,7 @@
 #include "osmem.h"
 #include <vespamalloc/malloc/common.h>
 #include <cstdio>
+#include <cctype>
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
@@ -10,6 +11,7 @@
 #include <sys/statfs.h>
 #include <sys/mman.h>
 #include <linux/mman.h>
+#include <functional>
 
 namespace vespamalloc {