| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/quic/core/quic_headers_stream.h" | 5 #include "net/quic/core/quic_headers_stream.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "net/quic/core/quic_bug_tracker.h" | 10 #include "net/quic/core/quic_bug_tracker.h" |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 } | 942 } |
| 943 } | 943 } |
| 944 } | 944 } |
| 945 } | 945 } |
| 946 } | 946 } |
| 947 | 947 |
| 948 TEST_P(QuicHeadersStreamTest, WritevStreamData) { | 948 TEST_P(QuicHeadersStreamTest, WritevStreamData) { |
| 949 QuicStreamId id = kClientDataStreamId1; | 949 QuicStreamId id = kClientDataStreamId1; |
| 950 QuicStreamOffset offset = 0; | 950 QuicStreamOffset offset = 0; |
| 951 struct iovec iov; | 951 struct iovec iov; |
| 952 string data; | |
| 953 | 952 |
| 954 // This test will issue a write that will require fragmenting into | 953 // This test will issue a write that will require fragmenting into |
| 955 // multiple HTTP/2 DATA frames. | 954 // multiple HTTP/2 DATA frames. |
| 956 const int kMinDataFrames = 4; | 955 const int kMinDataFrames = 4; |
| 957 const size_t data_len = | 956 const size_t data_len = |
| 958 kSpdyInitialFrameSizeLimit * kMinDataFrames + 1024; | 957 kSpdyInitialFrameSizeLimit * kMinDataFrames + 1024; |
| 959 // Set headers stream send window large enough for data written below. | 958 // Set headers stream send window large enough for data written below. |
| 960 headers_stream_->flow_controller()->UpdateSendWindowOffset(data_len * 2 * 4); | 959 headers_stream_->flow_controller()->UpdateSendWindowOffset(data_len * 2 * 4); |
| 961 test::GenerateBody(&data, data_len); | 960 string data(data_len, 'a'); |
| 962 | 961 |
| 963 for (bool fin : {true, false}) { | 962 for (bool fin : {true, false}) { |
| 964 for (bool use_ack_listener : {true, false}) { | 963 for (bool use_ack_listener : {true, false}) { |
| 965 scoped_refptr<ForceHolAckListener> ack_listener; | 964 scoped_refptr<ForceHolAckListener> ack_listener; |
| 966 if (use_ack_listener) { | 965 if (use_ack_listener) { |
| 967 ack_listener = new ForceHolAckListener(); | 966 ack_listener = new ForceHolAckListener(); |
| 968 } | 967 } |
| 969 EXPECT_CALL(session_, | 968 EXPECT_CALL(session_, |
| 970 WritevData(headers_stream_, kHeadersStreamId, _, _, false, _)) | 969 WritevData(headers_stream_, kHeadersStreamId, _, _, false, _)) |
| 971 .WillRepeatedly(WithArgs<2, 5>(Invoke( | 970 .WillRepeatedly(WithArgs<2, 5>(Invoke( |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 | 1014 |
| 1016 EXPECT_EQ(consumed_data.bytes_consumed, 0u); | 1015 EXPECT_EQ(consumed_data.bytes_consumed, 0u); |
| 1017 EXPECT_EQ(consumed_data.fin_consumed, true); | 1016 EXPECT_EQ(consumed_data.fin_consumed, true); |
| 1018 } | 1017 } |
| 1019 | 1018 |
| 1020 TEST_P(QuicHeadersStreamTest, WritevStreamDataSendBlocked) { | 1019 TEST_P(QuicHeadersStreamTest, WritevStreamDataSendBlocked) { |
| 1021 FLAGS_quic_bugfix_fhol_writev_fin_only_v2 = true; | 1020 FLAGS_quic_bugfix_fhol_writev_fin_only_v2 = true; |
| 1022 QuicStreamId id = kClientDataStreamId1; | 1021 QuicStreamId id = kClientDataStreamId1; |
| 1023 QuicStreamOffset offset = 0; | 1022 QuicStreamOffset offset = 0; |
| 1024 struct iovec iov; | 1023 struct iovec iov; |
| 1025 string data; | |
| 1026 | 1024 |
| 1027 // This test will issue a write that will require fragmenting into | 1025 // This test will issue a write that will require fragmenting into |
| 1028 // multiple HTTP/2 DATA frames. It will ensure that only 1 frame | 1026 // multiple HTTP/2 DATA frames. It will ensure that only 1 frame |
| 1029 // will go out in the case that the underlying session becomes write | 1027 // will go out in the case that the underlying session becomes write |
| 1030 // blocked. Buffering is required to preserve framing, but the | 1028 // blocked. Buffering is required to preserve framing, but the |
| 1031 // amount of buffering is limited to one HTTP/2 data frame. | 1029 // amount of buffering is limited to one HTTP/2 data frame. |
| 1032 const int kMinDataFrames = 4; | 1030 const int kMinDataFrames = 4; |
| 1033 const size_t data_len = kSpdyInitialFrameSizeLimit * kMinDataFrames + 1024; | 1031 const size_t data_len = kSpdyInitialFrameSizeLimit * kMinDataFrames + 1024; |
| 1034 // Set headers stream send window large enough for data written below. | 1032 // Set headers stream send window large enough for data written below. |
| 1035 headers_stream_->flow_controller()->UpdateSendWindowOffset(data_len * 2 * 4); | 1033 headers_stream_->flow_controller()->UpdateSendWindowOffset(data_len * 2 * 4); |
| 1036 test::GenerateBody(&data, data_len); | 1034 string data(data_len, 'a'); |
| 1037 | 1035 |
| 1038 bool fin = true; | 1036 bool fin = true; |
| 1039 // So force the underlying |WritevData| to consume only 1 byte. | 1037 // So force the underlying |WritevData| to consume only 1 byte. |
| 1040 // In that case, |WritevStreamData| should consume just one | 1038 // In that case, |WritevStreamData| should consume just one |
| 1041 // HTTP/2 data frame's worth of data. | 1039 // HTTP/2 data frame's worth of data. |
| 1042 EXPECT_CALL(session_, | 1040 EXPECT_CALL(session_, |
| 1043 WritevData(headers_stream_, kHeadersStreamId, _, _, false, _)) | 1041 WritevData(headers_stream_, kHeadersStreamId, _, _, false, _)) |
| 1044 .WillOnce( | 1042 .WillOnce( |
| 1045 WithArgs<2>(Invoke(this, &QuicHeadersStreamTest::SaveIovShort))); | 1043 WithArgs<2>(Invoke(this, &QuicHeadersStreamTest::SaveIovShort))); |
| 1046 | 1044 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1058 consumed_data = headers_stream_->WritevStreamData( | 1056 consumed_data = headers_stream_->WritevStreamData( |
| 1059 id, MakeIOVector(data, &iov), offset, fin, nullptr); | 1057 id, MakeIOVector(data, &iov), offset, fin, nullptr); |
| 1060 | 1058 |
| 1061 EXPECT_EQ(consumed_data.bytes_consumed, 0u); | 1059 EXPECT_EQ(consumed_data.bytes_consumed, 0u); |
| 1062 EXPECT_EQ(consumed_data.fin_consumed, false); | 1060 EXPECT_EQ(consumed_data.fin_consumed, false); |
| 1063 } | 1061 } |
| 1064 | 1062 |
| 1065 } // namespace | 1063 } // namespace |
| 1066 } // namespace test | 1064 } // namespace test |
| 1067 } // namespace net | 1065 } // namespace net |
| OLD | NEW |