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

Avoid multiple slice calls in the WebSocket reader #9636

Merged
merged 4 commits into from
Nov 3, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 3, 2024

Avoids PySequence_GetSlice(__pyx_v_buf, __pyx_v_start_pos, PY_SSIZE_T_MAX); in most cases when there is no tail

Avoids PySequence_GetSlice(__pyx_v_buf, __pyx_v_start_pos, (__pyx_v_start_pos + 2)); to copy buf to data since data is only used to unpack 2 bytes, and we already know where they are in buf

Copy link

codspeed-hq bot commented Nov 3, 2024

CodSpeed Performance Report

Merging #9636 will improve performances by 15.71%

Comparing avoid_slice_empty_tail (c828cca) with master (c95c025)

Summary

⚡ 1 improvements
✅ 7 untouched benchmarks

Benchmarks breakdown

Benchmark master avoid_slice_empty_tail Change
test_read_one_hundred_websocket_text_messages[pyloop] 544.5 µs 470.6 µs +15.71%

@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Nov 3, 2024
@bdraco bdraco closed this Nov 3, 2024
@bdraco bdraco reopened this Nov 3, 2024
@bdraco bdraco changed the title DNM: Avoid slice in the WebSocket reader when the tail is empty Avoid slice in the WebSocket reader when the tail is empty Nov 3, 2024
@bdraco bdraco changed the title Avoid slice in the WebSocket reader when the tail is empty Avoid multiple slice calls in the WebSocket reader Nov 3, 2024
@bdraco bdraco marked this pull request as ready for review November 3, 2024 02:50
@bdraco bdraco requested a review from asvetlov as a code owner November 3, 2024 02:50
@bdraco bdraco requested a review from webknjaz as a code owner November 3, 2024 02:52
@bdraco bdraco added bot:chronographer:provided There is a change note present in this PR and removed bot:chronographer:skip This PR does not need to include a change note labels Nov 3, 2024
@bdraco bdraco enabled auto-merge (squash) November 3, 2024 03:00
Copy link

codecov bot commented Nov 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.64%. Comparing base (c95c025) to head (c828cca).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9636      +/-   ##
==========================================
- Coverage   98.64%   98.64%   -0.01%     
==========================================
  Files         114      114              
  Lines       35361    35360       -1     
  Branches     4191     4191              
==========================================
- Hits        34882    34881       -1     
  Misses        321      321              
  Partials      158      158              
Flag Coverage Δ
CI-GHA 98.52% <100.00%> (-0.01%) ⬇️
OS-Linux 98.20% <100.00%> (-0.01%) ⬇️
OS-Windows 96.11% <0.00%> (+<0.01%) ⬆️
OS-macOS 97.41% <0.00%> (-0.01%) ⬇️
Py-3.10.11 97.27% <0.00%> (-0.01%) ⬇️
Py-3.10.15 97.68% <100.00%> (-0.01%) ⬇️
Py-3.11.10 97.74% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.36% <0.00%> (+<0.01%) ⬆️
Py-3.12.7 98.23% <100.00%> (-0.01%) ⬇️
Py-3.13.0 98.22% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.19% <0.00%> (+<0.01%) ⬆️
Py-3.9.20 97.59% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.16 97.21% <100.00%> (-0.01%) ⬇️
VM-macos 97.41% <0.00%> (-0.01%) ⬇️
VM-ubuntu 98.20% <100.00%> (-0.01%) ⬇️
VM-windows 96.11% <0.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@bdraco bdraco merged commit 42a69af into master Nov 3, 2024
41 of 42 checks passed
@bdraco bdraco deleted the avoid_slice_empty_tail branch November 3, 2024 03:16
Copy link
Contributor

patchback bot commented Nov 3, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 42a69af on top of patchback/backports/3.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636

Backporting merged PR #9636 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636 upstream/3.10
  4. Now, cherry-pick PR Avoid multiple slice calls in the WebSocket reader #9636 contents into that branch:
    $ git cherry-pick -x 42a69afc99d94f0aae8f4de69f17cd7332f58ff0
    If it'll yell at you with something like fatal: Commit 42a69afc99d94f0aae8f4de69f17cd7332f58ff0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 42a69afc99d94f0aae8f4de69f17cd7332f58ff0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Avoid multiple slice calls in the WebSocket reader #9636 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Nov 3, 2024

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636

Backported as #9637

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Nov 3, 2024
bdraco added a commit that referenced this pull request Nov 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant