[EventPipe][UserEvents] Add copy of user_events structs #116930
Merged
+64
−7
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR introduces fallback definitions for specific user_events structs and associated macros to support cross builds of the Linux .NET SDK when the linux/user_events.h header is unavailable. Key changes include:
- Adding local definitions for user_reg, user_unreg, DIAG_IOCSREG, and DIAG_IOCSUNREG in ep-session-provider.h.
- Removing the direct inclusion of linux/user_events.h in ep-session-provider.c and adapting conditional compilation blocks accordingly.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/native/eventpipe/ep-session-provider.h | Adds fallback user_events definitions with conditional inclusion to support cross builds. |
| src/native/eventpipe/ep-session-provider.c | Removes redundant header inclusion and updates preprocessor conditions for tracepoint support. |
Comments suppressed due to low confidence (2)
src/native/eventpipe/ep-session-provider.h:14
- Consider adding a comment here noting that the local definitions for user_events structures are a fallback for when linux/user_events.h is missing, and they should be maintained in sync with upstream changes.
#if HAVE_LINUX_USER_EVENTS_H
src/native/eventpipe/ep-session-provider.c:148
- Review the updated preprocessor condition that now only checks HAVE_SYS_IOCTL_H rather than both HAVE_LINUX_USER_EVENTS_H and HAVE_SYS_IOCTL_H to ensure this change covers all expected platforms without causing unintended behavior.
#if HAVE_SYS_IOCTL_H
noahfalk
approved these changes
Jun 23, 2025
hoyosjs
reviewed
Jun 23, 2025
This was referenced Jun 23, 2025
__attribute__((__packed__)) isn't declared in src/native uint8_t __reserved as a field name will somehow be interpreted as unsigned char
hoyosjs
approved these changes
Jun 24, 2025
|
/ba-g Failure is unrelated. #116734 (comment) also observed the same failure, and #116746 is suspected to be the same issue. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The Linux .NET SDK build will build with
--cross, which ends up not finding thelinux/user_events.hheader.For now, as only the
user_reg,user_unreg,DIAG_IOCSREG, andDIAG_IOCSUNREGtypes are needed, add a copy of those definitions in the event that thelinux/user_events.hheader is not found.NOTE: DIAG_IOCSREG and DIAG_IOCSUNREG are a user facing ABI value, and I grabbed them by printing out the macros in the linux user_events example here
After figuring out how to properly include the
linux/user_events.hheader in the cross build, this change will be reverted.Testing
Grabbed the Linux daily SDK build, built a simple console app, and sent the IPC Command to enable a user_events eventpipe session, received
0x80004005which corresponds to DS_IPC_E_FAIL for the diagnostic server.Built these changes in a docker container running the same image that the machine that builds the SDK using
ROOTFS_DIR=/crossrootfs/x64 ./build.sh --cross -s clr -c Release, copied over the artifacts into the console app's artifacts, and sent the IPC Command to enable a user_events eventpipe session and received a valid EventPipe Session ID.Enabling the user_events tracepoint enable bits, saw the expected events written to the trace file.