Skip to content
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.

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

examples: fix style w.r.t env var usage, const placement #1719

Merged
merged 7 commits into from
Jan 4, 2024

Conversation

cpu
Copy link
Member

@cpu cpu commented Jan 3, 2024

Resolving feedback from djc on #1715

@cpu cpu self-assigned this Jan 3, 2024
@cpu cpu requested a review from djc January 3, 2024 17:49
Copy link

codecov bot commented Jan 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0d4b2df) 96.08% compared to head (3c4f484) 96.08%.
Report is 10 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1719   +/-   ##
=======================================
  Coverage   96.08%   96.08%           
=======================================
  Files          79       79           
  Lines       16911    16911           
=======================================
  Hits        16249    16249           
  Misses        662      662           

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

@cpu cpu force-pushed the cpu-example-env-var-fixes branch from c0d8ed2 to 3c4f484 Compare January 3, 2024 18:10
Copy link

rustls-benchmarking bot commented Jan 3, 2024

Benchmark results

Instruction counts

Significant differences

There are no significant instruction count differences

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server 4111148 4172127 60979 (1.48%) 4.42%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server 33237833 33319186 81353 (0.24%) 0.70%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server 12749843 12720634 -29209 (-0.23%) 0.89%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server 12771359 12744552 -26807 (-0.21%) 1.34%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server 4666856 4657689 -9167 (-0.20%) 3.96%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server 33566377 33598571 32194 (0.10%) 0.49%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server 33307801 33337428 29627 (0.09%) 0.42%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server 57164182 57214658 50476 (0.09%) 0.33%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server 91327005 91381593 54588 (0.06%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server 33558399 33574159 15760 (0.05%) 0.49%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server 57126463 57152763 26300 (0.05%) 0.39%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server 12325490 12331029 5539 (0.04%) 1.24%
handshake_session_id_aws_lc_rs_1.3_ecdsa_chacha_client 30964313 30957286 -7027 (-0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_aes_client 5210398 5211374 976 (0.02%) 0.20%
handshake_tickets_ring_1.3_ecdsa_aes_client 42237337 42233208 -4129 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsa_aes_client 31149407 31147005 -2402 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsa_aes_server 2134321 2134158 -163 (-0.01%) 0.20%
transfer_no_resume_ring_1.3_ecdsa_chacha_client 92374999 92368318 -6681 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsa_chacha_client 31142226 31144388 2162 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client 3174394 3174188 -206 (-0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client 4168964 4169221 257 (0.01%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client 92379746 92385064 5318 (0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsa_chacha_server 2137019 2137140 121 (0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client 4507645 4507892 247 (0.01%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_server 4429467 4429262 -205 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client 92437527 92433573 -3954 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_chacha_client 92438757 92435298 -3459 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_chacha_client 5214450 5214631 181 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsa_aes_client 30972563 30971493 -1070 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_aes_client 57968099 57969546 1447 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_client 4539059 4539164 105 (0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_aes_server 2053453 2053495 42 (0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_chacha_server 2057451 2057493 42 (0.00%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_client 4441832 4441919 87 (0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_client 4442950 4442886 -64 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsa_aes_client 57930269 57930855 586 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsa_chacha_client 14420821 14420966 145 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsa_aes_client 14418289 14418163 -126 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server 12251808 12251901 93 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsa_aes_server 43917544 43917876 332 (0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_server 12045863 12045950 87 (0.00%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_client 4731619 4731652 33 (0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsa_aes_client 42057761 42058035 274 (0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsa_aes_server 43692026 43692270 244 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client 31117127 31117298 171 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_server 12241683 12241746 63 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsa_chacha_server 43877964 43877755 -209 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsa_chacha_client 42011261 42011069 -192 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsa_chacha_server 33274008 33274147 139 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client 57978987 57979218 231 (0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsa_chacha_server 43626269 43626112 -157 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsa_aes_server 33292548 33292434 -114 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client 4549070 4549085 15 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client 68413549 68413750 201 (0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_server 43685052 43685175 123 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client 31337083 31337169 86 (0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_server 43619191 43619303 112 (0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client 3378149 3378141 -8 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_server 43869163 43869061 -102 (-0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsa_aes_server 33545557 33545482 -75 (-0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_server 56968175 56968048 -127 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client 3388924 3388917 -7 (-0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_client 42237960 42237882 -78 (-0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_client 42191136 42191200 64 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_client 57945230 57945317 87 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client 31166144 31166189 45 (0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_client 57844843 57844926 83 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_aes_server 57177340 57177418 78 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client 31355571 31355603 32 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsa_chacha_client 42202302 42202267 -35 (-0.00%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_server 4869195 4869191 -4 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_client 42418485 42418518 33 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_server 57104117 57104157 40 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsa_chacha_server 33557887 33557908 21 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsa_chacha_server 91247579 91247622 43 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsa_aes_server 57083105 57083129 24 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server 91268457 91268427 -30 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_chacha_server 91342040 91342011 -29 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_client 42383352 42383361 9 (0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_server 43909275 43909275 0 (0.00%) 0.20%

Wall-time

Significant differences

There are no significant wall-time differences

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_tickets_ring_1.2_rsa_aes 1.80 ms 1.81 ms 0.01 ms (0.41%) 2.29%
handshake_session_id_ring_1.2_rsa_aes 1.71 ms 1.72 ms 0.01 ms (0.35%) 2.91%
handshake_no_resume_ring_1.3_rsa_chacha 1.08 ms 1.09 ms 0.00 ms (0.23%) 1.64%
handshake_session_id_ring_1.3_rsa_aes 7.49 ms 7.48 ms -0.02 ms (-0.21%) 1.00%
handshake_tickets_aws_lc_rs_1.2_rsa_aes 2.26 ms 2.27 ms 0.00 ms (0.20%) 2.29%
handshake_tickets_ring_1.3_rsa_chacha 7.47 ms 7.46 ms -0.01 ms (-0.17%) 1.79%
handshake_session_id_aws_lc_rs_1.3_ecdsa_chacha 5.55 ms 5.56 ms 0.01 ms (0.17%) 1.00%
handshake_tickets_ring_1.3_rsa_aes 7.51 ms 7.50 ms -0.01 ms (-0.17%) 1.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_aes 5.11 ms 5.11 ms 0.01 ms (0.16%) 6.01%
transfer_no_resume_ring_1.3_ecdsa_aes 7.47 ms 7.46 ms -0.01 ms (-0.16%) 4.71%
handshake_tickets_ring_1.3_ecdsa_aes 7.63 ms 7.62 ms -0.01 ms (-0.14%) 1.42%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha 1.40 ms 1.40 ms 0.00 ms (0.12%) 1.38%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes 1.35 ms 1.35 ms -0.00 ms (-0.12%) 1.06%
transfer_no_resume_ring_1.3_ecdsa_chacha 14.19 ms 14.17 ms -0.02 ms (-0.11%) 2.46%
handshake_session_id_ring_1.3_rsa_chacha 7.46 ms 7.45 ms -0.01 ms (-0.11%) 1.61%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes 1.40 ms 1.41 ms 0.00 ms (0.11%) 1.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha 6.39 ms 6.40 ms 0.01 ms (0.11%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_chacha 653.81 µs 654.48 µs 0.67 µs (0.10%) 2.37%
handshake_session_id_ring_1.3_ecdsa_aes 7.61 ms 7.60 ms -0.01 ms (-0.10%) 1.11%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes 5.87 ms 5.87 ms 0.01 ms (0.09%) 6.04%
handshake_tickets_ring_1.3_ecdsa_chacha 7.59 ms 7.59 ms -0.01 ms (-0.09%) 1.65%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha 6.35 ms 6.36 ms 0.00 ms (0.08%) 1.03%
transfer_no_resume_ring_1.2_rsa_aes 7.20 ms 7.20 ms 0.01 ms (0.07%) 4.36%
handshake_no_resume_aws_lc_rs_1.3_ecdsa_aes 655.17 µs 655.64 µs 0.47 µs (0.07%) 2.88%
handshake_no_resume_ring_1.3_ecdsa_chacha 1.26 ms 1.26 ms 0.00 ms (0.07%) 1.29%
handshake_no_resume_ring_1.3_ecdsa_aes 1.26 ms 1.26 ms 0.00 ms (0.07%) 1.10%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes 5.85 ms 5.86 ms 0.00 ms (0.07%) 5.05%
handshake_session_id_ring_1.3_ecdsa_chacha 7.58 ms 7.58 ms -0.00 ms (-0.06%) 1.46%
handshake_tickets_aws_lc_rs_1.3_ecdsa_chacha 5.57 ms 5.58 ms 0.00 ms (0.06%) 1.00%
handshake_no_resume_ring_1.3_rsa_aes 1.08 ms 1.08 ms -0.00 ms (-0.06%) 1.55%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha 14.35 ms 14.36 ms 0.01 ms (0.06%) 2.36%
transfer_no_resume_ring_1.3_rsa_aes 7.29 ms 7.29 ms -0.00 ms (-0.04%) 4.21%
handshake_tickets_aws_lc_rs_1.3_ecdsa_aes 5.59 ms 5.60 ms 0.00 ms (0.03%) 1.26%
transfer_no_resume_ring_1.3_rsa_chacha 14.01 ms 14.01 ms 0.00 ms (0.01%) 2.42%
handshake_session_id_aws_lc_rs_1.3_ecdsa_aes 5.56 ms 5.56 ms 0.00 ms (0.01%) 1.26%
transfer_no_resume_aws_lc_rs_1.3_ecdsa_chacha 13.59 ms 13.59 ms 0.00 ms (0.01%) 2.40%
handshake_session_id_aws_lc_rs_1.2_rsa_aes 2.09 ms 2.09 ms 0.00 ms (0.01%) 1.76%
handshake_tickets_aws_lc_rs_1.3_rsa_aes 6.40 ms 6.40 ms 0.00 ms (0.01%) 1.08%
handshake_session_id_aws_lc_rs_1.3_rsa_aes 6.37 ms 6.37 ms 0.00 ms (0.00%) 1.23%
handshake_no_resume_ring_1.2_rsa_aes 1.07 ms 1.07 ms 0.00 ms (0.00%) 1.74%

Additional information

Historical results

Checkout details:

@djc
Copy link
Member

djc commented Jan 4, 2024

Eventually I think we should use clap in derive mode for all the examples (especially the ones currently using docopt), but that can probably wait.

@cpu
Copy link
Member Author

cpu commented Jan 4, 2024

Eventually I think we should use clap in derive mode for all the examples (especially the ones currently using docopt)

I agree for the ones using docopt, but I think the "simple" examples benefit from just being dead simple Rust with as few dependencies above/beyond Rustls as possible.

@cpu cpu added this pull request to the merge queue Jan 4, 2024
Merged via the queue into rustls:main with commit ba97712 Jan 4, 2024
23 checks passed
@cpu cpu deleted the cpu-example-env-var-fixes branch January 4, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants