This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Conversation
jkotas
reviewed
Jul 30, 2018
| // write out each enum value | ||
| FieldInfo[] staticFields = enumType.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Static); | ||
|
|
||
| // Empty map entries cause Windows to reject the whole manifest. Avoid ths by only writting the |
added 2 commits
July 30, 2018 15:54
vancem
commented
Jul 31, 2018
| { | ||
| if (data is System.Enum) | ||
| { | ||
| Type underlyingType = Enum.GetUnderlyingType(data.GetType()); |
Author
There was a problem hiding this comment.
The fix in this file was prompted by testing where if you have enums that are not based on int or long, then it will serialize it as a string, but the manifest says it decodes like an enum. This fix basically extends the types recognized to be all the integer types. the 64 bit types are handled specially and all others are cast to int (32 bit case).
vancem
commented
Jul 31, 2018
|
|
||
| // write out each enum value | ||
| FieldInfo[] staticFields = enumType.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Static); | ||
| bool anyValuesWritten = false; |
Author
There was a problem hiding this comment.
This fix allows enums with unsigned underlying types. It also insures that if there are no enum values we add one because the windows ETW manifest parser requires it.
Author
|
I have done some ad-hoc testing to confirm this works. |
brianrob
reviewed
Jul 31, 2018
| } | ||
| } | ||
|
|
||
| // the OS requrires that bitmaps and valuemaps have at least one value or it reject the whole manifest. |
| else if (underlyingType == typeof(long)) | ||
| data = (long)data; | ||
| else | ||
| data = (int)Convert.ToInt64(data); // This handles all int/uint or below (we treat them like 32 bit ints) |
Member
There was a problem hiding this comment.
Do we need to modify DecodeObject as well to make sure that data types smaller than 4 bytes are properly handled?
brianrob
approved these changes
Aug 9, 2018
MichalStrehovsky
added a commit
to MichalStrehovsky/runtime
that referenced
this pull request
Jan 27, 2021
We're getting the marshalling size of an enum underlying type - there are not that many of those. I chose not to treat `char` and `bool`, but we could (the only other remaining options). Calling into `Marshal.SizeOf` increases the risk that `EventSource` is going call itself recursively - see the comment at the beginning of the method. This was originally introduced in dotnet/coreclr#19205.
stephentoub
pushed a commit
to dotnet/runtime
that referenced
this pull request
Jan 29, 2021
* Avoid Marshal.SizeOf in EventSource We're getting the marshalling size of an enum underlying type - there are not that many of those. I chose not to treat `char` and `bool`, but we could (the only other remaining options). Calling into `Marshal.SizeOf` increases the risk that `EventSource` is going call itself recursively - see the comment at the beginning of the method. This was originally introduced in dotnet/coreclr#19205. * Update src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs * Update src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs * Update src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Fix for https://github.com/dotnet/coreclr/issues/19204.
Need to do some targeted testing before checkin, but wanted to get it out there, so I don't forget it.
@brianrob