Clean up uring targets from experimental

Summary: Leaving the shim experimental targets, but replacing a bunch of includes and cleaning up deps. Reviewed By: mzlee Differential Revision: D67319596 fbshipit-source-id: 6605f42343b8d3421b614f789be8f8e094475b5c
facebook · Dec 17, 2024 · 074cd40 · 074cd40
1 parent 7d13b57
commit 074cd40
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 59 deletions.
diff --git a/folly/io/async/AsyncIoUringSocket.cpp b/folly/io/async/AsyncIoUringSocket.cpp
@@ -16,10 +16,10 @@
 
 #include <folly/Conv.h>
 #include <folly/detail/SocketFastOpen.h>
-#include <folly/experimental/io/IoUringEventBaseLocal.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/async/AsyncIoUringSocket.h>
 #include <folly/io/async/AsyncSocket.h>
+#include <folly/io/async/IoUringEventBaseLocal.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/SysUio.h>
 

diff --git a/folly/io/async/AsyncIoUringSocket.h b/folly/io/async/AsyncIoUringSocket.h
@@ -24,8 +24,6 @@
 #include <boost/intrusive/slist.hpp>
 #include <folly/Optional.h>
 #include <folly/SocketAddress.h>
-#include <folly/experimental/io/IoUringBase.h>
-#include <folly/experimental/io/Liburing.h>
 #include <folly/futures/Future.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufIovecBuilder.h>
@@ -36,6 +34,8 @@
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/DelayedDestruction.h>
 #include <folly/io/async/EventHandler.h>
+#include <folly/io/async/IoUringBase.h>
+#include <folly/io/async/Liburing.h>
 #include <folly/net/NetOpsDispatcher.h>
 #include <folly/portability/Sockets.h>
 #include <folly/small_vector.h>

diff --git a/folly/io/async/AsyncIoUringSocketFactory.h b/folly/io/async/AsyncIoUringSocketFactory.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/io/Liburing.h>
 #include <folly/io/async/AsyncIoUringSocket.h>
+#include <folly/io/async/Liburing.h>
 
 namespace folly {
 

diff --git a/folly/io/async/BUCK b/folly/io/async/BUCK
@@ -612,16 +612,14 @@ 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",
     ],
     exported_deps = [
         "//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
@@ -25,7 +25,7 @@
 #include <folly/FileUtil.h>
 #include <folly/String.h>
 #include <folly/experimental/io/Epoll.h>
-#include <folly/experimental/io/Liburing.h>
+#include <folly/io/async/Liburing.h>
 #include <folly/lang/Align.h>
 #include <folly/portability/GFlags.h>
 #include <folly/synchronization/Baton.h>

diff --git a/folly/io/async/IoUring.h b/folly/io/async/IoUring.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/SharedMutex.h>
-#include <folly/experimental/io/AsyncBase.h>
-#include <folly/experimental/io/Liburing.h>
+#include <folly/io/async/AsyncBase.h>
+#include <folly/io/async/Liburing.h>
 
 #if FOLLY_HAS_LIBURING
 

diff --git 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 <folly/experimental/io/IoUringProvidedBufferRing.h>
+#include <folly/io/async/IoUringProvidedBufferRing.h>
 #endif
 
 namespace folly {

diff --git a/folly/io/async/IoUringBackend.h b/folly/io/async/IoUringBackend.h
@@ -35,10 +35,10 @@
 #include <folly/Function.h>
 #include <folly/Optional.h>
 #include <folly/Range.h>
-#include <folly/experimental/io/Liburing.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/async/EventBaseBackendBase.h>
 #include <folly/io/async/IoUringBase.h>
+#include <folly/io/async/Liburing.h>
 #include <folly/portability/Asm.h>
 #include <folly/small_vector.h>
 

diff --git a/folly/io/async/IoUringEvent.h b/folly/io/async/IoUringEvent.h
@@ -17,10 +17,10 @@
 #pragma once
 
 #include <folly/File.h>
-#include <folly/experimental/io/IoUringBackend.h>
-#include <folly/experimental/io/Liburing.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventHandler.h>
+#include <folly/io/async/IoUringBackend.h>
+#include <folly/io/async/Liburing.h>
 
 namespace folly {
 

diff --git a/folly/io/async/IoUringEventBaseLocal.cpp b/folly/io/async/IoUringEventBaseLocal.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <folly/Singleton.h>
-#include <folly/experimental/io/IoUringEvent.h>
 #include <folly/io/async/EventBaseLocal.h>
+#include <folly/io/async/IoUringEvent.h>
 #include <folly/io/async/IoUringEventBaseLocal.h>
 
 #if FOLLY_HAS_LIBURING

diff --git a/folly/io/async/IoUringEventBaseLocal.h b/folly/io/async/IoUringEventBaseLocal.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/experimental/io/IoUringBackend.h>
-#include <folly/experimental/io/Liburing.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/io/async/IoUringBackend.h>
+#include <folly/io/async/Liburing.h>
 
 namespace folly {
 

diff --git a/folly/io/async/IoUringProvidedBufferRing.h b/folly/io/async/IoUringProvidedBufferRing.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/io/Liburing.h>
 #include <folly/io/async/IoUringBase.h>
+#include <folly/io/async/Liburing.h>
 #include <folly/portability/SysMman.h>
 
 #if FOLLY_HAS_LIBURING

diff --git a/folly/io/async/SimpleAsyncIO.cpp b/folly/io/async/SimpleAsyncIO.cpp
@@ -19,8 +19,8 @@
 #include <folly/String.h>
 #include <folly/coro/Baton.h>
 #include <folly/experimental/io/AsyncIO.h>
-#include <folly/experimental/io/IoUring.h>
-#include <folly/experimental/io/Liburing.h>
+#include <folly/io/async/IoUring.h>
+#include <folly/io/async/Liburing.h>
 #include <folly/portability/Sockets.h>
 
 namespace folly {

diff --git a/folly/io/async/test/AsyncIoUringSocketTest.cpp b/folly/io/async/test/AsyncIoUringSocketTest.cpp
@@ -23,14 +23,14 @@
 #include <folly/FileUtil.h>
 #include <folly/Subprocess.h>
 #include <folly/executors/GlobalExecutor.h>
-#include <folly/experimental/io/AsyncIoUringSocket.h>
-#include <folly/experimental/io/IoUringBackend.h>
-#include <folly/experimental/io/IoUringEvent.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
+#include <folly/io/async/AsyncIoUringSocket.h>
 #include <folly/io/async/AsyncServerSocket.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/io/async/IoUringBackend.h>
+#include <folly/io/async/IoUringEvent.h>
 #include <folly/portability/GTest.h>
 #include <folly/system/Shell.h>
 #include <folly/test/SocketAddressTestHelper.h>

diff --git 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
@@ -19,9 +19,9 @@
 #include <folly/Benchmark.h>
 #include <folly/FileUtil.h>
 #include <folly/experimental/io/AsyncIO.h>
-#include <folly/experimental/io/IoUring.h>
 #include <folly/experimental/io/test/AsyncBaseTestLib.h>
 #include <folly/experimental/io/test/IoTestTempFileUtil.h>
+#include <folly/io/async/IoUring.h>
 #include <folly/portability/GFlags.h>
 
 namespace {