Skip to content

Fix send periodic #1713

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
zariiii9003 merged 4 commits into from
Jan 3, 2024
Merged

Fix send periodic #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbf7332
Add test case
Tbruno25 Dec 26, 2023
8e3792b
Fix bug
Tbruno25 Dec 26, 2023
5d18b4a
Improve unittest
Tbruno25 Dec 27, 2023
3e7b06e
MR feedback
Tbruno25 Jan 2, 2024
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
6 changes: 4 additions & 2 deletions can/broadcastmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ def _run(self) -> None:
win32event.WaitForSingleObject(self.event.handle, 0)

while not self.stopped:
if self.end_time is not None and time.perf_counter() >= self.end_time:
break

# Prevent calling bus.send from multiple threads
with self.send_lock:
try:
Expand All @@ -318,8 +321,7 @@ def _run(self) -> None:

if not USE_WINDOWS_EVENTS:
msg_due_time_ns += self.period_ns
if self.end_time is not None and time.perf_counter() >= self.end_time:
break

msg_index = (msg_index + 1) % len(self.messages)

if USE_WINDOWS_EVENTS:
Expand Down
17 changes: 17 additions & 0 deletions test/back2back_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,23 @@ def test_sub_second_timestamp_resolution(self):
self.bus2.recv(0)
self.bus2.recv(0)

def test_send_periodic_duration(self):
"""
Verify that send_periodic only transmits for the specified duration.

Regression test for #1713.
"""
for params in [(0.01, 0.003), (0.1, 0.011), (1, 0.4)]:
duration, period = params
messages = []

self.bus2.send_periodic(can.Message(), period, duration)
while (msg := self.bus1.recv(period * 1.25)) is not None:
messages.append(msg)

delta_t = round(messages[-1].timestamp - messages[0].timestamp, 2)
assert delta_t <= duration


@unittest.skipUnless(TEST_INTERFACE_SOCKETCAN, "skip testing of socketcan")
class BasicTestSocketCan(Back2BackTestCase):
Expand Down