Revert D65605100: Move core functionality to QuicTransportBaseLite [2…

…3/n] Differential Revision: D65605100 Original commit changeset: aaa7f394b669 Original Phabricator Diff: D65605100 fbshipit-source-id: a087043af67d5ea30ab6d040162d1e72fdf67425
facebook · Nov 9, 2024 · f8a5876 · f8a5876
1 parent 3f7555a
commit f8a5876
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 45 deletions.
diff --git a/quic/api/BUCK b/quic/api/BUCK
@@ -45,42 +45,56 @@ mvfst_cpp_library(
 mvfst_cpp_library(
     name = "transport",
     srcs = [
+        "IoBufQuicBatch.cpp",
+        "QuicPacketScheduler.cpp",
         "QuicTransportBase.cpp",
         "QuicTransportBaseLite.cpp",
+        "QuicTransportFunctions.cpp",
     ],
     headers = [
+        "IoBufQuicBatch.h",
+        "QuicPacketScheduler.h",
         "QuicSocket.h",
         "QuicSocketLite.h",
         "QuicTransportBase.h",
         "QuicTransportBaseLite.h",
+        "QuicTransportFunctions.h",
     ],
     deps = [
         ":loop_detector_callback",
-        ":quic_batch_writer",
         "//folly:chrono",
         "//folly:scope_guard",
+        "//folly/tracing:static_tracepoint",
+        "//quic/common:buf_accessor",
+        "//quic/common:socket_util",
         "//quic/common:time_util",
         "//quic/congestion_control:ecn_l4s_tracker",
         "//quic/congestion_control:pacer",
-        "//quic/flowcontrol:flow_control",
+        "//quic/happyeyeballs:happyeyeballs",
         "//quic/logging:qlogger_constants",
         "//quic/loss:loss",
+        "//quic/state:ack_frequency_functions",
+        "//quic/state:ack_handler",
         "//quic/state:pacing_functions",
         "//quic/state:simple_frame_functions",
-        "//quic/state:state_functions",
-        "//quic/state:stream_functions",
         "//quic/state/stream:stream",
     ],
     exported_deps = [
+        ":quic_batch_writer",
         ":quic_callbacks",
-        ":transport_helpers",
         "//folly:exception_wrapper",
+        "//folly:expected",
         "//folly:maybe_managed_ptr",
         "//folly:portability",
         "//folly/io:iobuf",
         "//folly/io/async:async_transport_certificate",
+        "//folly/lang:assume",
         "//quic:constants",
         "//quic:exception",
+        "//quic/client:state_and_handshake",
+        "//quic/codec:codec",
+        "//quic/codec:pktbuilder",
+        "//quic/codec:pktrebuilder",
         "//quic/codec:types",
         "//quic/common:looper",
         "//quic/common:network_data",
@@ -94,6 +108,7 @@ mvfst_cpp_library(
         "//quic/congestion_control:copa",
         "//quic/congestion_control:cubic",
         "//quic/congestion_control:newreno",
+        "//quic/flowcontrol:flow_control",
         "//quic/handshake:transport_parameters",
         "//quic/observer:socket_observer_container",
         "//quic/observer:socket_observer_types",
@@ -102,45 +117,6 @@ mvfst_cpp_library(
         "//quic/state:quic_state_machine",
         "//quic/state:quic_stream_utilities",
         "//quic/state:retransmission_policy",
-    ],
-)
-
-mvfst_cpp_library(
-    name = "transport_helpers",
-    srcs = [
-        "IoBufQuicBatch.cpp",
-        "QuicPacketScheduler.cpp",
-        "QuicTransportFunctions.cpp",
-    ],
-    headers = [
-        "IoBufQuicBatch.h",
-        "QuicPacketScheduler.h",
-        "QuicTransportFunctions.h",
-    ],
-    deps = [
-        "//folly/tracing:static_tracepoint",
-        "//quic/common:buf_accessor",
-        "//quic/common:socket_util",
-        "//quic/happyeyeballs:happyeyeballs",
-        "//quic/state:ack_frequency_functions",
-        "//quic/state:ack_handler",
-        "//quic/state:simple_frame_functions",
-    ],
-    exported_deps = [
-        ":quic_batch_writer",
-        "//folly:expected",
-        "//folly/lang:assume",
-        "//quic:constants",
-        "//quic:exception",
-        "//quic/client:state_and_handshake",
-        "//quic/codec:codec",
-        "//quic/codec:pktbuilder",
-        "//quic/codec:pktrebuilder",
-        "//quic/codec:types",
-        "//quic/common/udpsocket:quic_async_udp_socket",
-        "//quic/flowcontrol:flow_control",
-        "//quic/handshake:transport_parameters",
-        "//quic/state:quic_state_machine",
         "//quic/state:state_functions",
         "//quic/state:stats_callback",
         "//quic/state:stream_functions",

diff --git a/quic/api/QuicTransportBaseLite.cpp b/quic/api/QuicTransportBaseLite.cpp
@@ -247,7 +247,7 @@ bool QuicTransportBaseLite::isBidirectionalStream(StreamId stream) noexcept {
   return quic::isBidirectionalStream(stream);
 }
 
-QuicSocketLite::WriteResult QuicTransportBaseLite::writeChain(
+QuicSocket::WriteResult QuicTransportBaseLite::writeChain(
     StreamId id,
     Buf data,
     bool eof,

diff --git a/quic/api/QuicTransportFunctions.h b/quic/api/QuicTransportFunctions.h
@@ -12,6 +12,7 @@
 #include <quic/QuicException.h>
 #include <quic/api/IoBufQuicBatch.h>
 #include <quic/api/QuicPacketScheduler.h>
+#include <quic/api/QuicSocket.h>
 #include <quic/common/udpsocket/QuicAsyncUDPSocket.h>
 #include <quic/handshake/TransportParameters.h>
 #include <quic/state/StateData.h>