diff --git a/folly/io/async/AsyncIoUringSocket.cpp b/folly/io/async/AsyncIoUringSocket.cpp index dff6bd12dbc..9a95fcf2799 100644 --- a/folly/io/async/AsyncIoUringSocket.cpp +++ b/folly/io/async/AsyncIoUringSocket.cpp @@ -16,10 +16,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/folly/io/async/AsyncIoUringSocket.h b/folly/io/async/AsyncIoUringSocket.h index 06c9662b32b..9ec3cf5ddc8 100644 --- a/folly/io/async/AsyncIoUringSocket.h +++ b/folly/io/async/AsyncIoUringSocket.h @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include @@ -36,6 +34,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/folly/io/async/AsyncIoUringSocketFactory.h b/folly/io/async/AsyncIoUringSocketFactory.h index 9df4e13310c..15a7ff142bb 100644 --- a/folly/io/async/AsyncIoUringSocketFactory.h +++ b/folly/io/async/AsyncIoUringSocketFactory.h @@ -16,8 +16,8 @@ #pragma once -#include #include +#include namespace folly { diff --git a/folly/io/async/BUCK b/folly/io/async/BUCK index 1709388261c..69576411a84 100644 --- a/folly/io/async/BUCK +++ b/folly/io/async/BUCK @@ -612,7 +612,7 @@ cpp_library( deps = [ "//folly:conv", "//folly/detail:socket_fast_open", - "//folly/experimental/io:io_uring_event_base_local", + "//folly/io/async:io_uring_event_base_local", "//folly/memory:malloc", "//folly/portability:sys_uio", ], @@ -620,8 +620,6 @@ cpp_library( "//folly:network_address", "//folly:optional", "//folly:small_vector", - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:liburing", "//folly/futures:core", "//folly/io:iobuf", "//folly/io:socket_option_map", @@ -630,6 +628,8 @@ cpp_library( "//folly/io/async:async_socket_exception", "//folly/io/async:async_transport", "//folly/io/async:delayed_destruction", + "//folly/io/async:io_uring_backend", + "//folly/io/async:liburing", "//folly/net:net_ops_dispatcher", "//folly/portability:sockets", ], @@ -646,8 +646,8 @@ cpp_library( "//folly:string", "//folly/coro:baton", "//folly/experimental/io:async_io", - "//folly/experimental/io:io_uring", - "//folly/experimental/io:liburing", + "//folly/io/async:io_uring", + "//folly/io/async:liburing", "//folly/portability:sockets", ], exported_deps = [ @@ -700,7 +700,7 @@ cpp_library( "//folly:file_util", "//folly:string", "//folly/experimental/io:epoll", - "//folly/experimental/io:liburing", + "//folly/io/async:liburing", "//folly/lang:align", "//folly/portability:gflags", "//folly/synchronization:baton", @@ -755,9 +755,9 @@ cpp_library( "//folly/portability:unistd", ], exported_deps = [ + ":async_base_class", + ":liburing", "//folly:shared_mutex", - "//folly/experimental/io:async_base", - "//folly/experimental/io:liburing", ], external_deps = [ "boost", @@ -783,7 +783,7 @@ cpp_library( "//folly:spin_lock", "//folly:string", "//folly/container:f14_hash", - "//folly/experimental/io:io_uring_provided_buffer_ring", + "//folly/io/async:io_uring_provided_buffer_ring", "//folly/lang:bits", "//folly/portability:gflags", "//folly/portability:sockets", @@ -801,10 +801,10 @@ cpp_library( "//folly:optional", "//folly:range", "//folly:small_vector", - "//folly/experimental/io:liburing", "//folly/io:iobuf", "//folly/io/async:async_base", "//folly/io/async:delayed_destruction", + "//folly/io/async:liburing", "//folly/portability:asm", ], exported_external_deps = [ @@ -829,9 +829,9 @@ cpp_library( "//folly:string", ], exported_deps = [ - "//folly/experimental/io:liburing", "//folly/io:iobuf", "//folly/io/async:delayed_destruction", + "//folly/io/async:liburing", "//folly/portability:sys_mman", ], exported_external_deps = [ @@ -850,9 +850,9 @@ cpp_library( modular_headers = False, exported_deps = [ "//folly:file", - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:liburing", "//folly/io/async:async_base", + "//folly/io/async:io_uring_backend", + "//folly/io/async:liburing", ], ) @@ -867,12 +867,12 @@ cpp_library( modular_headers = False, deps = [ "//folly:singleton", - "//folly/experimental/io:io_uring_event", + "//folly/io/async:io_uring_event", ], exported_deps = [ - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:liburing", "//folly/io/async:async_base", + "//folly/io/async:io_uring_backend", + "//folly/io/async:liburing", ], exported_external_deps = [ ], diff --git a/folly/io/async/EventBasePoller.cpp b/folly/io/async/EventBasePoller.cpp index e783b99f3ed..d51f3b58177 100644 --- a/folly/io/async/EventBasePoller.cpp +++ b/folly/io/async/EventBasePoller.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/folly/io/async/IoUring.h b/folly/io/async/IoUring.h index 88f34ab51e6..009fdb76c81 100644 --- a/folly/io/async/IoUring.h +++ b/folly/io/async/IoUring.h @@ -17,8 +17,8 @@ #pragma once #include -#include -#include +#include +#include #if FOLLY_HAS_LIBURING diff --git a/folly/io/async/IoUringBackend.cpp b/folly/io/async/IoUringBackend.cpp index 2f9f451057e..1b780312138 100644 --- a/folly/io/async/IoUringBackend.cpp +++ b/folly/io/async/IoUringBackend.cpp @@ -55,7 +55,7 @@ extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_post_hook( #endif #if FOLLY_IO_URING_UP_TO_DATE -#include +#include #endif namespace folly { diff --git a/folly/io/async/IoUringBackend.h b/folly/io/async/IoUringBackend.h index cb2f322ab2d..873a24aa1a5 100644 --- a/folly/io/async/IoUringBackend.h +++ b/folly/io/async/IoUringBackend.h @@ -35,10 +35,10 @@ #include #include #include -#include #include #include #include +#include #include #include diff --git a/folly/io/async/IoUringEvent.h b/folly/io/async/IoUringEvent.h index c048aaffb6c..ddc9db00472 100644 --- a/folly/io/async/IoUringEvent.h +++ b/folly/io/async/IoUringEvent.h @@ -17,10 +17,10 @@ #pragma once #include -#include -#include #include #include +#include +#include namespace folly { diff --git a/folly/io/async/IoUringEventBaseLocal.cpp b/folly/io/async/IoUringEventBaseLocal.cpp index bfbb00bba0d..603f17bf5e5 100644 --- a/folly/io/async/IoUringEventBaseLocal.cpp +++ b/folly/io/async/IoUringEventBaseLocal.cpp @@ -15,8 +15,8 @@ */ #include -#include #include +#include #include #if FOLLY_HAS_LIBURING diff --git a/folly/io/async/IoUringEventBaseLocal.h b/folly/io/async/IoUringEventBaseLocal.h index 745d9149aa1..ff6da06763f 100644 --- a/folly/io/async/IoUringEventBaseLocal.h +++ b/folly/io/async/IoUringEventBaseLocal.h @@ -16,9 +16,9 @@ #pragma once -#include -#include #include +#include +#include namespace folly { diff --git a/folly/io/async/IoUringProvidedBufferRing.h b/folly/io/async/IoUringProvidedBufferRing.h index fdcb6c10bd0..b7184a40f06 100644 --- a/folly/io/async/IoUringProvidedBufferRing.h +++ b/folly/io/async/IoUringProvidedBufferRing.h @@ -16,8 +16,8 @@ #pragma once -#include #include +#include #include #if FOLLY_HAS_LIBURING diff --git a/folly/io/async/SimpleAsyncIO.cpp b/folly/io/async/SimpleAsyncIO.cpp index d86d80ab297..807a2be8b14 100644 --- a/folly/io/async/SimpleAsyncIO.cpp +++ b/folly/io/async/SimpleAsyncIO.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include namespace folly { diff --git a/folly/io/async/test/AsyncIoUringSocketTest.cpp b/folly/io/async/test/AsyncIoUringSocketTest.cpp index 9596b89266e..59e931c0791 100644 --- a/folly/io/async/test/AsyncIoUringSocketTest.cpp +++ b/folly/io/async/test/AsyncIoUringSocketTest.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include -#include #include #include +#include #include #include #include +#include +#include #include #include #include diff --git a/folly/io/async/test/BUCK b/folly/io/async/test/BUCK index 69870263632..41dd3111e79 100644 --- a/folly/io/async/test/BUCK +++ b/folly/io/async/test/BUCK @@ -977,12 +977,12 @@ cpp_unittest( "//folly:file_util", "//folly:subprocess", "//folly/executors:global_executor", - "//folly/experimental/io:async_io_uring_socket", - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:io_uring_event", "//folly/futures:core", "//folly/io/async:async_base", + "//folly/io/async:async_io_uring_socket", "//folly/io/async:async_socket", + "//folly/io/async:io_uring_backend", + "//folly/io/async:io_uring_event", "//folly/io/async:server_socket", "//folly/portability:gtest", "//folly/system:shell", @@ -1014,9 +1014,9 @@ cpp_binary( "//folly:benchmark", "//folly:file_util", "//folly/experimental/io:async_io", - "//folly/experimental/io:io_uring", "//folly/experimental/io/test:async_base_test_lib", "//folly/experimental/io/test:io_test_temp_file_util_lib", + "//folly/io/async:io_uring", "//folly/portability:gflags", ], ) @@ -1029,9 +1029,9 @@ cpp_binary( "//folly:benchmark", "//folly:file_util", "//folly/experimental/io:epoll_backend", - "//folly/experimental/io:io_uring_backend", "//folly/init:init", "//folly/io/async:async_base", + "//folly/io/async:io_uring_backend", "//folly/io/async:scoped_event_base_thread", "//folly/portability:gflags", ], @@ -1042,7 +1042,7 @@ cpp_unittest( srcs = ["IoUringBackendSetupTest.cpp"], owner = "kvigor@xmail.facebook.com", deps = [ - "//folly/experimental/io:io_uring_backend", + "//folly/io/async:io_uring_backend", "//folly/portability:gtest", ], ) @@ -1062,12 +1062,12 @@ cpp_unittest( "//folly:file_util", "//folly:function", "//folly:string", - "//folly/experimental/io:io_uring_backend", "//folly/experimental/io/test:io_test_temp_file_util_lib", "//folly/init:init", "//folly/io/async:async_base", "//folly/io/async:async_udp_server_socket", "//folly/io/async:async_udp_socket", + "//folly/io/async:io_uring_backend", "//folly/io/async/test:async_signal_handler_test_lib", "//folly/io/async/test:event_base_test_lib", "//folly/portability:gtest", @@ -1079,9 +1079,9 @@ cpp_unittest( srcs = ["IoUringEventBaseLocalTest.cpp"], owner = "dylany@xmail.facebook.com", deps = [ - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:io_uring_event_base_local", "//folly/futures:core", + "//folly/io/async:io_uring_backend", + "//folly/io/async:io_uring_event_base_local", "//folly/portability:gtest", ], ) @@ -1092,10 +1092,10 @@ cpp_unittest( owner = "dylany@xmail.facebook.com", supports_static_listing = False, deps = [ - "//folly/experimental/io:io_uring_backend", - "//folly/experimental/io:io_uring_event", "//folly/futures:core", "//folly/io/async:async_base", + "//folly/io/async:io_uring_backend", + "//folly/io/async:io_uring_event", "//folly/portability:gtest", ], ) @@ -1107,9 +1107,9 @@ cpp_unittest( owner = "dmm@xmail.facebook.com", supports_static_listing = False, deps = [ - "//folly/experimental/io:io_uring", "//folly/experimental/io/test:async_base_test_lib", "//folly/init:init", + "//folly/io/async:io_uring", ], ) @@ -1120,8 +1120,8 @@ cpp_binary( deps = [ "//folly:benchmark", "//folly:file_util", - "//folly/experimental/io:io_uring_backend", "//folly/io/async:async_base", + "//folly/io/async:io_uring_backend", "//folly/portability:gflags", ], ) diff --git a/folly/io/async/test/IOBenchmark.cpp b/folly/io/async/test/IOBenchmark.cpp index e2421cf569b..7fd52fc3218 100644 --- a/folly/io/async/test/IOBenchmark.cpp +++ b/folly/io/async/test/IOBenchmark.cpp @@ -19,9 +19,9 @@ #include #include #include -#include #include #include +#include #include namespace { diff --git a/folly/io/async/test/IoUringBackendBench.cpp b/folly/io/async/test/IoUringBackendBench.cpp index 127fcbe56bb..033a8c5793a 100644 --- a/folly/io/async/test/IoUringBackendBench.cpp +++ b/folly/io/async/test/IoUringBackendBench.cpp @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include #include #include diff --git a/folly/io/async/test/IoUringBackendSetupTest.cpp b/folly/io/async/test/IoUringBackendSetupTest.cpp index 35b6fc8c890..4b6d3c2a1fe 100644 --- a/folly/io/async/test/IoUringBackendSetupTest.cpp +++ b/folly/io/async/test/IoUringBackendSetupTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include namespace folly::test { diff --git a/folly/io/async/test/IoUringBackendTest.cpp b/folly/io/async/test/IoUringBackendTest.cpp index 4dd6c018c64..75cd85ff4e6 100644 --- a/folly/io/async/test/IoUringBackendTest.cpp +++ b/folly/io/async/test/IoUringBackendTest.cpp @@ -20,12 +20,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/folly/io/async/test/IoUringEventBaseLocalTest.cpp b/folly/io/async/test/IoUringEventBaseLocalTest.cpp index 1c46c18dcad..c44387120f0 100644 --- a/folly/io/async/test/IoUringEventBaseLocalTest.cpp +++ b/folly/io/async/test/IoUringEventBaseLocalTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include #include #include +#include +#include #include namespace folly { diff --git a/folly/io/async/test/IoUringEventTest.cpp b/folly/io/async/test/IoUringEventTest.cpp index 8ffe7519a93..4e2652507aa 100644 --- a/folly/io/async/test/IoUringEventTest.cpp +++ b/folly/io/async/test/IoUringEventTest.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include #include #include #include +#include +#include #include namespace folly { diff --git a/folly/io/async/test/IoUringTest.cpp b/folly/io/async/test/IoUringTest.cpp index 09d0ec28e90..288fbaab582 100644 --- a/folly/io/async/test/IoUringTest.cpp +++ b/folly/io/async/test/IoUringTest.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include using folly::IoUring; diff --git a/folly/io/async/test/RegisteredFdBenchmark.cpp b/folly/io/async/test/RegisteredFdBenchmark.cpp index a1444c9d4ab..78a35565938 100644 --- a/folly/io/async/test/RegisteredFdBenchmark.cpp +++ b/folly/io/async/test/RegisteredFdBenchmark.cpp @@ -18,9 +18,9 @@ #include #include -#include #include #include +#include #include using namespace folly;