Skip to content

Fix stream id generation #331

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

Merged
merged 6 commits into from
Sep 5, 2025
+22 −4
Merged

Fix stream id generation #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2eb348e
Use python do-while loop equivalent in stream id allocation
km-64 Sep 4, 2025
dd7b414
Decrement _first_stream_id by 2 to retain behaviour of first_stream_id
km-64 Sep 4, 2025
a2d3def
Mask _self_stream_id after decrementing in __init__
km-64 Sep 4, 2025
0269115
Remove comment and invert logic for do-while behaviour
km-64 Sep 5, 2025
42a8f5f
Add test case for issue #330
km-64 Sep 5, 2025
0941bf3
Merge branch 'master' into fix-stream-id-generation
jell-o-fishi Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions rsocket/stream_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,27 @@

class StreamControl:
def __init__(self, first_stream_id: int):
self._first_stream_id = first_stream_id
self._first_stream_id = (first_stream_id - 2) & MAX_STREAM_ID
self._current_stream_id = self._first_stream_id
self._streams: Dict[int, StreamHandler] = {}
self._maximum_stream_id = MAX_STREAM_ID

def allocate_stream(self) -> int:
attempt_counter = 0

while (self._current_stream_id == CONNECTION_STREAM_ID
or self._current_stream_id in self._streams):

available_stream_id_found = False
while not available_stream_id_found:
if attempt_counter > self._maximum_stream_id / 2:
raise RSocketStreamAllocationFailure()

self._increment_stream_id()
attempt_counter += 1

available_stream_id_found = not (
self._current_stream_id == CONNECTION_STREAM_ID
or self._current_stream_id in self._streams
)

return self._current_stream_id

def _increment_stream_id(self):
Expand Down
14 changes: 14 additions & 0 deletions tests/rsocket/test_stream_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,20 @@ def test_stream_control_reuse_old_stream_ids():
assert next_stream == 5


@pytest.mark.parametrize('first_stream_id', (1, 2))
def test_stream_id_increments_after_allocation_and_registration_followed_by_finishing(first_stream_id: int):
control = StreamControl(first_stream_id)
dummy_stream = object()

allocated_id = control.allocate_stream()
control.register_stream(allocated_id, dummy_stream)

control.finish_stream(allocated_id)
new_allocated_id = control.allocate_stream()

assert new_allocated_id != allocated_id


def test_stream_in_use():
control = StreamControl(1)

Expand Down
Loading