From e8f718846f982bd206e5a00c6b5731fd9b03c530 Mon Sep 17 00:00:00 2001
From: Yingchun Lai <laiyingchun@apache.org>
Date: Sun, 10 Sep 2023 15:29:54 +0800
Subject: [PATCH] iwyu

---
 src/nfs/nfs_server_impl.cpp          | 1 -
 src/replica/mutation_cache.cpp       | 1 +
 src/runtime/rpc/asio_rpc_session.cpp | 1 +
 src/runtime/scheduler.cpp            | 8 ++++----
 src/utils/alloc.h                    | 1 -
 src/utils/test/nth_element_utils.h   | 6 +++++-
 src/utils/utils.h                    | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/nfs/nfs_server_impl.cpp b/src/nfs/nfs_server_impl.cpp
index 41835e13bb..cadacba1a3 100644
--- a/src/nfs/nfs_server_impl.cpp
+++ b/src/nfs/nfs_server_impl.cpp
@@ -32,7 +32,6 @@
 #include <chrono>
 #include <cstdint>
 #include <mutex>
-#include <type_traits>
 #include <vector>
 
 #include "nfs/nfs_code_definition.h"
diff --git a/src/replica/mutation_cache.cpp b/src/replica/mutation_cache.cpp
index 5eeae83d34..4ce5c89b0b 100644
--- a/src/replica/mutation_cache.cpp
+++ b/src/replica/mutation_cache.cpp
@@ -26,6 +26,7 @@
 
 #include "mutation_cache.h"
 
+// IWYU pragma: no_include  <ext/alloc_traits.h>
 #include "consensus_types.h"
 #include "mutation.h"
 #include "utils/autoref_ptr.h"
diff --git a/src/runtime/rpc/asio_rpc_session.cpp b/src/runtime/rpc/asio_rpc_session.cpp
index f66ba4c703..2381ff4100 100644
--- a/src/runtime/rpc/asio_rpc_session.cpp
+++ b/src/runtime/rpc/asio_rpc_session.cpp
@@ -27,6 +27,7 @@
 #include "asio_rpc_session.h"
 
 #include <boost/asio.hpp> // IWYU pragma: keep
+// IWYU pragma: no_include  <ext/alloc_traits.h>
 #include <cstddef>
 #include <iterator>
 #include <new>
diff --git a/src/runtime/scheduler.cpp b/src/runtime/scheduler.cpp
index 9ccc20afad..458dde7163 100644
--- a/src/runtime/scheduler.cpp
+++ b/src/runtime/scheduler.cpp
@@ -36,6 +36,7 @@
 #include <stddef.h>
 #include <algorithm>
 #include <chrono>
+#include <random>
 #include <thread>
 #include <type_traits>
 #include <utility>
@@ -276,10 +277,9 @@ void scheduler::schedule()
                 _time_ns = ts;
             }
 
-            // randomize the events, and see
-            std::random_shuffle(
-                events->begin(), events->end(), [](int n) { return rand::next_u32(0, n - 1); });
-
+            std::random_device rd;
+            std::mt19937 g(rd());
+            std::shuffle(events->begin(), events->end(), g);
             for (auto e : *events) {
                 if (e.app_task != nullptr) {
                     task *t = e.app_task;
diff --git a/src/utils/alloc.h b/src/utils/alloc.h
index 195f740f6b..5934ae8d32 100644
--- a/src/utils/alloc.h
+++ b/src/utils/alloc.h
@@ -24,7 +24,6 @@
 #ifdef CACHELINE_SIZE
 
 #include <stddef.h>
-#include <algorithm>
 #include <functional>
 #include <memory>
 #include <new>
diff --git a/src/utils/test/nth_element_utils.h b/src/utils/test/nth_element_utils.h
index e8fdc9320f..85e618a318 100644
--- a/src/utils/test/nth_element_utils.h
+++ b/src/utils/test/nth_element_utils.h
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <memory>
+#include <random>
 #include <type_traits>
 #include <utility>
 #include <vector>
@@ -93,7 +94,10 @@ class nth_element_case_generator
             auto delta = _rand(_range_size);
             value += delta;
         }
-        std::random_shuffle(array.begin(), array.end());
+
+        std::random_device rd;
+        std::mt19937 g(rd());
+        std::shuffle(array.begin(), array.end(), g);
     }
 
 private:
diff --git a/src/utils/utils.h b/src/utils/utils.h
index f624ba48f2..fd40cb136f 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -28,7 +28,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <algorithm>
+#include <algorithm> // IWYU pragma: keep
 #include <iterator>
 #include <map>
 #include <memory>