-
Notifications
You must be signed in to change notification settings - Fork 631
socketcan: support use of SO_TIMESTAMPING for hardware timestamps #1882
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
Open
pevsonic
wants to merge
1
commit into
hardbyte:main
Choose a base branch
from
pevsonic:pevsonic/socketcan_enable_hw_timestamps
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -42,9 +42,9 @@ | |||||
|
||||||
|
||||||
# Constants needed for precise handling of timestamps | ||||||
RECEIVED_TIMESTAMP_STRUCT = struct.Struct("@ll") | ||||||
RECEIVED_TIMESPEC_STRUCT = struct.Struct("@ll") | ||||||
RECEIVED_ANCILLARY_BUFFER_SIZE = ( | ||||||
CMSG_SPACE(RECEIVED_TIMESTAMP_STRUCT.size) if CMSG_SPACE_available else 0 | ||||||
CMSG_SPACE(RECEIVED_TIMESPEC_STRUCT.size * 3) if CMSG_SPACE_available else 0 | ||||||
) | ||||||
|
||||||
|
||||||
|
@@ -636,11 +636,24 @@ def capture_message( | |||||
# Fetching the timestamp | ||||||
assert len(ancillary_data) == 1, "only requested a single extra field" | ||||||
cmsg_level, cmsg_type, cmsg_data = ancillary_data[0] | ||||||
assert ( | ||||||
cmsg_level == socket.SOL_SOCKET and cmsg_type == constants.SO_TIMESTAMPNS | ||||||
assert cmsg_level == socket.SOL_SOCKET and cmsg_type in ( | ||||||
constants.SO_TIMESTAMPNS, | ||||||
constants.SO_TIMESTAMPING, | ||||||
), "received control message type that was not requested" | ||||||
# see https://man7.org/linux/man-pages/man3/timespec.3.html -> struct timespec for details | ||||||
seconds, nanoseconds = RECEIVED_TIMESTAMP_STRUCT.unpack_from(cmsg_data) | ||||||
if cmsg_type == constants.SO_TIMESTAMPNS: | ||||||
seconds, nanoseconds = RECEIVED_TIMESPEC_STRUCT.unpack_from(cmsg_data) | ||||||
else: | ||||||
# cmsg_type == constants.SO_TIMESTAMPING | ||||||
# | ||||||
# stamp[0] is the software timestamp | ||||||
# stamp[1] is deprecated | ||||||
# stamp[2] is the raw hardware timestamp | ||||||
offset = struct.calcsize(RECEIVED_TIMESPEC_STRUCT.format) * 2 | ||||||
seconds, nanoseconds = RECEIVED_TIMESPEC_STRUCT.unpack_from( | ||||||
cmsg_data, offset=offset | ||||||
) | ||||||
|
||||||
if nanoseconds >= 1e9: | ||||||
raise can.CanOperationError( | ||||||
f"Timestamp nanoseconds field was out of range: {nanoseconds} not less than 1e9" | ||||||
|
@@ -699,6 +712,7 @@ def __init__( | |||||
self, | ||||||
channel: str = "", | ||||||
receive_own_messages: bool = False, | ||||||
can_hardware_timestamps: bool = False, | ||||||
local_loopback: bool = True, | ||||||
fd: bool = False, | ||||||
can_filters: Optional[CanFilters] = None, | ||||||
|
@@ -722,6 +736,17 @@ def __init__( | |||||
channel using :attr:`can.Message.channel`. | ||||||
:param receive_own_messages: | ||||||
If transmitted messages should also be received by this bus. | ||||||
:param bool can_hardware_timestamps: | ||||||
Use raw hardware timestamp for can messages if available instead | ||||||
of the system timestamp. By default we use the SO_TIMESTAMPNS | ||||||
interface which provides ns resolution but low accuracy. If your | ||||||
can hardware supports it you can use this parameter to | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
alternatively use the SO_TIMESTAMPING interface and request raw | ||||||
hardware timestamps. These are much higher precision but will | ||||||
almost certainly not be referenced to the time of day. There | ||||||
may be other pitfalls to such as loopback packets reporting with | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
no timestamp at all. | ||||||
See https://www.kernel.org/doc/html/latest/networking/timestamping.html | ||||||
:param local_loopback: | ||||||
If local loopback should be enabled on this bus. | ||||||
Please note that local loopback does not mean that messages sent | ||||||
|
@@ -739,6 +764,7 @@ def __init__( | |||||
self.socket = create_socket() | ||||||
self.channel = channel | ||||||
self.channel_info = f"socketcan channel '{channel}'" | ||||||
self._can_hardware_timestamps = can_hardware_timestamps | ||||||
self._bcm_sockets: Dict[str, socket.socket] = {} | ||||||
self._is_filtered = False | ||||||
self._task_id = 0 | ||||||
|
@@ -783,12 +809,25 @@ def __init__( | |||||
except OSError as error: | ||||||
log.error("Could not enable error frames (%s)", error) | ||||||
|
||||||
# enable nanosecond resolution timestamping | ||||||
# we can always do this since | ||||||
# 1) it is guaranteed to be at least as precise as without | ||||||
# 2) it is available since Linux 2.6.22, and CAN support was only added afterward | ||||||
# so this is always supported by the kernel | ||||||
self.socket.setsockopt(socket.SOL_SOCKET, constants.SO_TIMESTAMPNS, 1) | ||||||
if not self._can_hardware_timestamps: | ||||||
# Utilise SO_TIMESTAMPNS interface : | ||||||
# we can always do this since | ||||||
# 1) it is guaranteed to be at least as precise as without | ||||||
# 2) it is available since Linux 2.6.22, and CAN support was only added afterward | ||||||
# so this is always supported by the kernel | ||||||
self.socket.setsockopt(socket.SOL_SOCKET, constants.SO_TIMESTAMPNS, 1) | ||||||
else: | ||||||
# Utilise SO_TIMESTAMPING interface : | ||||||
# Allows us to use raw hardware timestamps where available | ||||||
timestamping_flags = ( | ||||||
constants.SOF_TIMESTAMPING_SOFTWARE | ||||||
| constants.SOF_TIMESTAMPING_RX_SOFTWARE | ||||||
| constants.SOF_TIMESTAMPING_RAW_HARDWARE | ||||||
) | ||||||
|
||||||
self.socket.setsockopt( | ||||||
socket.SOL_SOCKET, constants.SO_TIMESTAMPING, timestamping_flags | ||||||
) | ||||||
|
||||||
try: | ||||||
bind_socket(self.socket, channel) | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.