Skip to content
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

Jump to bottom

[release/6.0] Fix in-process decoding of DateTime in EventSource #68352

Merged
merged 3 commits into from
May 4, 2022
Merged

[release/6.0] Fix in-process decoding of DateTime in EventSource #68352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22c2f2f
Fix in-process decoding of DateTime in EventSource
Apr 4, 2022
0630fbd
Update eventlistener test to validate DateTime is correctly decoded i…
Apr 5, 2022
1a86169
Use UTC time everywhere
Apr 6, 2022
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
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,7 +1839,7 @@ private static unsafe void DecodeObjects(object?[] decodedObjects, Type[] parame
}
else if (typeCode == TypeCode.DateTime)
{
decoded = *(DateTime*)dataPointer;
decoded = DateTime.FromFileTimeUtc(*(long*)dataPointer);
}
else if (IntPtr.Size == 8 && dataType == typeof(IntPtr))
{
Expand Down
27 changes: 25 additions & 2 deletions src/tests/tracing/eventlistener/EventListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ public SimpleEventSource() : base(true) { }

[Event(1)]
internal void MathResult(int x, int y, int z, string formula) { this.WriteEvent(1, x, y, z, formula); }

[Event(2)]
internal void DateTimeEvent(DateTime dateTime) => WriteEvent(2, dateTime);


[NonEvent]
private unsafe void WriteEvent(int eventId, DateTime dateTime)
{
EventData* desc = stackalloc EventData[1];
long fileTime = dateTime.ToFileTimeUtc();
desc[0].DataPointer = (IntPtr)(&fileTime);
desc[0].Size = 8;
WriteEventCore(eventId, 1, desc);
}
}

internal sealed class SimpleEventListener : EventListener
Expand All @@ -23,6 +37,7 @@ internal sealed class SimpleEventListener : EventListener
private readonly EventLevel _level;

public int EventCount { get; private set; } = 0;
public DateTime DateObserved { get; private set; } = DateTime.MinValue;

public SimpleEventListener(string targetSourceName, EventLevel level)
{
Expand All @@ -41,13 +56,19 @@ protected override void OnEventSourceCreated(EventSource source)

protected override void OnEventWritten(EventWrittenEventArgs eventData)
{
EventCount++;
if (eventData.EventId == 2)
{
DateObserved = (DateTime)eventData.Payload[0];
}
else
EventCount++;
}
}

class EventPipeSmoke
{
private static int messageIterations = 100;
private static readonly DateTime ThePast = DateTime.UtcNow;

static int Main(string[] args)
{
Expand All @@ -68,10 +89,12 @@ static int Main(string[] args)

eventSource.MathResult(x, y, x+y, formula);
}
eventSource.DateTimeEvent(ThePast);
Console.WriteLine("\tEnd: Messaging.\n");

Console.WriteLine($"\tEventListener received {listener.EventCount} event(s)\n");
pass = listener.EventCount == messageIterations;
Console.WriteLine($"\tEventListener received {listener.DateObserved} vs {ThePast}\n");
pass = listener.EventCount == messageIterations && ThePast == listener.DateObserved;
}

return pass ? 100 : -1;
Expand Down