Skip to content

Avoid hanging if the client disconnects while self.wants_write() #2060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 1, 2024
Merged

Avoid hanging if the client disconnects while self.wants_write() #2060

merged 1 commit into from
Aug 1, 2024

Conversation

lasiotus
Copy link
Contributor

Similarly to how Ok(0) (zero) is treated during reads below, rustls should exit the loop instead of spinning indefinitely upon receiving Ok(0).

@codecov Codecov
Copy link

codecov bot commented Jul 30, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.47%. Comparing base (858b19d) to head (c5817bc).

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #2060   +/-   ##
=======================================
  Coverage   94.47%   94.47%           
=======================================
  Files         100      100           
  Lines       23248    23251    +3     
=======================================
+ Hits        21963    21966    +3     
  Misses       1285     1285

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ctz
Copy link
Member

ctz commented Jul 30, 2024

I think this is a good change, but some of the justification around it is not correct: if the peer at the other end of a socket disconnects that does not lead to write returning zero, it should return an error (the underlying posix error would be EPIPE, in rust this is ErrorKind::BrokenPipe). Of course, io could be anything that impls io::Write, and io::Cursor on a mutable slice returns Ok(0) when it runs out of space.

I think this deserves a test.

@lasiotus
Copy link
Contributor Author

lasiotus commented Jul 31, 2024 •
edited
Loading

I think this deserves a test.

Done.

ctz
ctz approved these changes Aug 1, 2024
View reviewed changes
Copy link
Member

@ctz ctz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@rustls-benchmarking Rustls Benchmarking
Copy link

rustls-benchmarking bot commented Aug 1, 2024 •
edited
Loading

Benchmark results

Instruction counts

Significant differences

⚠️ There are significant instruction count differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client 4360803 4320559 ✅ -40244 (-0.92%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_client 4557804 4516434 ✅ -41370 (-0.91%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client 4027245 3994702 ✅ -32543 (-0.81%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_client 4284784 4251536 ✅ -33248 (-0.78%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_server 4272240 4239522 ✅ -32718 (-0.77%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_server 4709160 4677748 ✅ -31412 (-0.67%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client 31215728 31101390 ✅ -114338 (-0.37%) 0.36%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client 31206905 31112766 ✅ -94139 (-0.30%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client 31226739 31133285 ✅ -93454 (-0.30%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client 30736009 30644364 ✅ -91645 (-0.30%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client 30760697 30669474 ✅ -91223 (-0.30%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client 30716537 30629132 ✅ -87405 (-0.28%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client 30743942 30656816 ✅ -87126 (-0.28%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client 31202820 31115707 ✅ -87113 (-0.28%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client 31178405 31096494 ✅ -81911 (-0.26%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client 41889082 41795039 ✅ -94043 (-0.22%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client 41960142 41870584 ✅ -89558 (-0.21%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client 42345729 42257081 ✅ -88648 (-0.21%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client 41877066 41790018 ✅ -87048 (-0.21%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_client 42359148 42271192 ✅ -87956 (-0.21%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_client 42425453 42337451 ✅ -88002 (-0.21%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_client 41894663 41807763 ✅ -86900 (-0.21%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client 42340912 42253544 ✅ -87368 (-0.21%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_client 41975640 41889247 ✅ -86393 (-0.21%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client 42406431 42319155 ✅ -87276 (-0.21%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client 42411406 42325083 ✅ -86323 (-0.20%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_client 41963390 41878323 ✅ -85067 (-0.20%) 0.20%

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server 3950830 3937323 -13507 (-0.34%) 3.84%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server 4498623 4483801 -14822 (-0.33%) 3.47%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 8880577 8851339 -29238 (-0.33%) 0.76%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server 32990189 32882202 -107987 (-0.33%) 0.59%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client 30708613 30629376 -79237 (-0.26%) 0.57%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server 13783386 13815899 32513 (0.24%) 1.07%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client 30697824 30636684 -61140 (-0.20%) 0.41%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 8873610 8857235 -16375 (-0.18%) 1.03%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client 31171011 31117046 -53965 (-0.17%) 0.28%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server 46445918 46365533 -80385 (-0.17%) 0.33%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server 13396593 13373668 -22925 (-0.17%) 0.57%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server 33597194 33544893 -52301 (-0.16%) 0.58%
handshake_no_resume_ring_1.3_ecdsap256_aes_client 3916699 3912525 -4174 (-0.11%) 0.37%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client 2228296 2225937 -2359 (-0.11%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client 2235182 2232951 -2231 (-0.10%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server 33502066 33533531 31465 (0.09%) 0.74%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server 32968899 32938354 -30545 (-0.09%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client 2957713 2954997 -2716 (-0.09%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server 33009057 32979089 -29968 (-0.09%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server 46381704 46423751 42047 (0.09%) 0.43%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 3385959 3382938 -3021 (-0.09%) 0.20%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client 2016967 2015174 -1793 (-0.09%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server 33546437 33516829 -29608 (-0.09%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_client 2951727 2949134 -2593 (-0.09%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server 32967519 32938781 -28738 (-0.09%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server 33008492 32979855 -28637 (-0.09%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server 33546576 33517539 -29037 (-0.09%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server 33579373 33550827 -28546 (-0.09%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server 33580377 33552278 -28099 (-0.08%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server 13781993 13770899 -11094 (-0.08%) 1.06%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server 80677654 80614603 -63051 (-0.08%) 0.23%
handshake_session_id_ring_1.3_ecdsap256_chacha_server 43377403 43343809 -33594 (-0.08%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 1917182 1915741 -1441 (-0.08%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 3383208 3380887 -2321 (-0.07%) 0.22%
handshake_tickets_ring_1.3_ecdsap256_chacha_server 43963549 43933411 -30138 (-0.07%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_client 2853861 2851915 -1946 (-0.07%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_server 43369008 43339677 -29331 (-0.07%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server 43372095 43342921 -29174 (-0.07%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_server 43959938 43931049 -28889 (-0.07%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server 43962549 43933831 -28718 (-0.07%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 58246173 58208879 -37294 (-0.06%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server 43470409 43442581 -27828 (-0.06%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_client 58209173 58172609 -36564 (-0.06%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_server 44040021 44012929 -27092 (-0.06%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client 58328644 58293010 -35634 (-0.06%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server 44043483 44016635 -26848 (-0.06%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_client 58332010 58296894 -35116 (-0.06%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_server 43466619 43440652 -25967 (-0.06%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server 43470177 43444566 -25611 (-0.06%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server 2134462 2133210 -1252 (-0.06%) 0.81%
handshake_tickets_ring_1.3_ecdsap256_aes_server 44041945 44016158 -25787 (-0.06%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 1920049 1918946 -1103 (-0.06%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client 58247595 58214215 -33380 (-0.06%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client 58328850 58298484 -30366 (-0.05%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client 68666212 68633113 -33099 (-0.05%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 92702597 92667622 -34975 (-0.04%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client 92664812 92629983 -34829 (-0.04%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client 92663847 92629431 -34416 (-0.04%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client 92705449 92671224 -34225 (-0.04%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client 92660053 92626206 -33847 (-0.04%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server 2136353 2135615 -738 (-0.03%) 0.78%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 92673763 92700256 26493 (0.03%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 4393870 4392773 -1097 (-0.02%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_server 11992122 11989513 -2609 (-0.02%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server 32947913 32941468 -6445 (-0.02%) 0.79%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 4390342 4389510 -832 (-0.02%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server 12186495 12185314 -1181 (-0.01%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 58231957 58226586 -5371 (-0.01%) 0.24%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server 13744617 13743669 -948 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client 35476326 35473993 -2333 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client 35473790 35471611 -2179 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_server 12180027 12179354 -673 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server 13742281 13741530 -751 (-0.01%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 46427235 46428821 1586 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 80606565 80608265 1700 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client 3915982 3916064 82 (0.00%) 0.31%
transfer_no_resume_ring_1.3_ecdsap256_aes_server 46451123 46451461 338 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server 80508233 80507700 -533 (-0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_server 46368498 46368739 241 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 80607664 80608052 388 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server 80515778 80515919 141 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server 46454726 46454805 79 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server 80504077 80504207 130 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 46428921 46428891 -30 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_server 46462843 46462839 -4 (-0.00%) 0.20%

Wall-time

Significant differences

⚠️ There are significant wall-time differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_session_id_ring_1.3_rsa_aes 7.33 ms 7.25 ms ✅ -0.08 ms (-1.05%) 1.00%
handshake_session_id_ring_1.3_ecdsap256_aes 6.84 ms 6.77 ms ✅ -0.07 ms (-1.01%) 1.00%

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_tickets_ring_1.2_rsa_aes 1.68 ms 1.66 ms -0.02 ms (-1.49%) 1.96%
handshake_session_id_aws_lc_rs_1.2_rsa_aes 2.10 ms 2.07 ms -0.03 ms (-1.46%) 2.28%
handshake_session_id_ring_1.2_rsa_aes 1.59 ms 1.57 ms -0.02 ms (-1.44%) 2.04%
handshake_tickets_aws_lc_rs_1.2_rsa_aes 2.27 ms 2.24 ms -0.03 ms (-1.33%) 3.04%
handshake_no_resume_ring_1.2_rsa_aes 982.68 µs 993.48 µs 10.80 µs (1.10%) 1.25%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes 5.44 ms 5.38 ms -0.06 ms (-1.04%) 1.44%
handshake_session_id_aws_lc_rs_1.3_rsa_aes 6.40 ms 6.34 ms -0.06 ms (-0.97%) 1.16%
handshake_session_id_ring_1.3_ecdsap256_chacha 6.79 ms 6.73 ms -0.06 ms (-0.94%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes 5.49 ms 5.44 ms -0.05 ms (-0.89%) 1.25%
handshake_tickets_aws_lc_rs_1.3_rsa_aes 6.45 ms 6.39 ms -0.06 ms (-0.88%) 1.20%
handshake_tickets_ring_1.3_ecdsap256_aes 6.89 ms 6.83 ms -0.06 ms (-0.88%) 1.00%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha 6.38 ms 6.32 ms -0.05 ms (-0.86%) 1.02%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes 6.15 ms 6.10 ms -0.05 ms (-0.85%) 1.40%
handshake_tickets_ring_1.3_rsa_aes 7.37 ms 7.31 ms -0.06 ms (-0.83%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes 6.21 ms 6.16 ms -0.05 ms (-0.83%) 1.32%
handshake_tickets_ring_1.3_rsa_chacha 7.32 ms 7.26 ms -0.06 ms (-0.82%) 1.00%
handshake_session_id_ring_1.3_rsa_chacha 7.27 ms 7.21 ms -0.06 ms (-0.79%) 1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha 5.42 ms 5.38 ms -0.04 ms (-0.79%) 1.38%
handshake_tickets_ring_1.3_ecdsap256_chacha 6.84 ms 6.78 ms -0.05 ms (-0.78%) 1.00%
handshake_session_id_ring_1.3_ecdsap384_aes 9.92 ms 9.84 ms -0.08 ms (-0.76%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha 6.21 ms 6.17 ms -0.04 ms (-0.72%) 1.11%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha 6.44 ms 6.40 ms -0.05 ms (-0.70%) 1.03%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes 5.24 ms 5.28 ms 0.04 ms (0.69%) 4.46%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes 4.52 ms 4.55 ms 0.03 ms (0.69%) 5.45%
transfer_no_resume_ring_1.2_rsa_aes 6.74 ms 6.79 ms 0.05 ms (0.69%) 2.90%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha 6.13 ms 6.09 ms -0.04 ms (-0.68%) 1.13%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha 5.49 ms 5.45 ms -0.04 ms (-0.66%) 1.37%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha 1.42 ms 1.41 ms -0.01 ms (-0.62%) 6.46%
handshake_session_id_ring_1.3_ecdsap384_chacha 9.87 ms 9.81 ms -0.06 ms (-0.61%) 1.00%
handshake_tickets_ring_1.3_ecdsap384_aes 9.96 ms 9.90 ms -0.06 ms (-0.57%) 1.00%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes 5.45 ms 5.48 ms 0.03 ms (0.52%) 3.67%
handshake_tickets_ring_1.3_ecdsap384_chacha 9.91 ms 9.86 ms -0.05 ms (-0.51%) 1.00%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes 5.46 ms 5.49 ms 0.03 ms (0.50%) 4.29%
transfer_no_resume_ring_1.3_ecdsap256_aes 6.35 ms 6.38 ms 0.03 ms (0.49%) 3.34%
transfer_no_resume_ring_1.3_rsa_aes 6.83 ms 6.87 ms 0.03 ms (0.46%) 3.20%
transfer_no_resume_ring_1.3_ecdsap384_aes 9.44 ms 9.48 ms 0.04 ms (0.44%) 2.41%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes 1.42 ms 1.42 ms -0.01 ms (-0.42%) 5.93%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes 1.37 ms 1.36 ms -0.01 ms (-0.39%) 6.11%
transfer_no_resume_ring_1.3_ecdsap256_chacha 12.99 ms 13.02 ms 0.03 ms (0.27%) 1.55%
transfer_no_resume_ring_1.3_rsa_chacha 13.48 ms 13.51 ms 0.03 ms (0.25%) 1.40%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 12.98 ms 13.02 ms 0.03 ms (0.25%) 1.65%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 484.37 µs 485.47 µs 1.10 µs (0.23%) 2.63%
handshake_no_resume_ring_1.3_rsa_aes 994.93 µs 992.68 µs -2.25 µs (-0.23%) 1.08%
transfer_no_resume_ring_1.3_ecdsap384_chacha 16.08 ms 16.12 ms 0.04 ms (0.22%) 1.27%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes 484.25 µs 485.25 µs 1.00 µs (0.21%) 2.93%
handshake_no_resume_ring_1.3_ecdsap256_chacha 508.59 µs 509.40 µs 0.81 µs (0.16%) 2.23%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes 1.20 ms 1.20 ms 0.00 ms (0.16%) 1.35%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 13.71 ms 13.73 ms 0.02 ms (0.13%) 1.46%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha 13.93 ms 13.95 ms 0.01 ms (0.10%) 2.02%
handshake_no_resume_ring_1.3_rsa_chacha 994.53 µs 995.45 µs 0.92 µs (0.09%) 1.00%
handshake_no_resume_ring_1.3_ecdsap256_aes 511.21 µs 511.42 µs 0.21 µs (0.04%) 2.43%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 1.20 ms 1.20 ms -0.00 ms (-0.03%) 1.30%
handshake_no_resume_ring_1.3_ecdsap384_chacha 3.60 ms 3.60 ms -0.00 ms (-0.02%) 1.00%
handshake_no_resume_ring_1.3_ecdsap384_aes 3.61 ms 3.61 ms 0.00 ms (0.01%) 1.00%

Additional information

Historical results

Checkout details:

cpu
cpu approved these changes Aug 1, 2024
View reviewed changes
Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind squashing your two commits & fixing the commit message typo? Thanks!

djc
djc reviewed Aug 1, 2024
View reviewed changes
@djc djc changed the title Avoid hagning if the client disconnects while self.wants_write(). Avoid hanging if the client disconnects while self.wants_write() Aug 1, 2024
cpu
cpu reviewed Aug 1, 2024
View reviewed changes
cpu
cpu approved these changes Aug 1, 2024
View reviewed changes
Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :-)

@lasiotus @cpu
Avoid spinning if the writer returns OK(0) while self.wants_write().
c5817bc 
Similarly to how Ok(0) (zero) is treated below, rustls should
exit the loop instead of spinning indefinitely upon receiving Ok(0).
@cpu
Copy link
Member

cpu commented Aug 1, 2024

rustls / Build+test (stable, windows-latest) (pull_request) Failing after 3m
...
cpu force-pushed the main branch from 02fb64b to c5817bc

I think this CI err will fall away with a rebase on main so I went ahead and did that. Hope you don't mind :-)

@cpu cpu enabled auto-merge August 1, 2024 18:11
@cpu cpu added this pull request to the merge queue Aug 1, 2024
Merged via the queue into rustls:main with commit 27bce5d Aug 1, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@djc djc djc left review comments

@cpu cpu cpu approved these changes

@ctz ctz ctz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lasiotus @ctz @cpu @djc