diff options
author | José Rivero <jorive@microsoft.com> | 2019-04-16 18:58:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-16 18:58:31 -0700 |
commit | b388f6cd87d87f4a07fe966aaa1bc92f245165d9 (patch) | |
tree | 96d38fd71242691b4066ffe8977993b827bdb77a /src/vm/eventpipe.h | |
parent | f360bbc0cf893bcd612516563145729743d3af2b (diff) | |
download | coreclr-b388f6cd87d87f4a07fe966aaa1bc92f245165d9.tar.gz coreclr-b388f6cd87d87f4a07fe966aaa1bc92f245165d9.tar.bz2 coreclr-b388f6cd87d87f4a07fe966aaa1bc92f245165d9.zip |
[EventPipe] Minor bug fixes, and remove redundant/unused code. (#23956)
- Update MicrosoftDiagnosticsTracingTraceEventPackageVersion
- Delete connection if the request is unknown/unhandled
- Adding missing error handling.
- Provider names must be defined.
- Some renaming, error handling, and build warnings.
- Removing test code, and merge EventPipe::Enable functions.
- Remove commented/non-used lines.
Diffstat (limited to 'src/vm/eventpipe.h')
-rw-r--r-- | src/vm/eventpipe.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/vm/eventpipe.h b/src/vm/eventpipe.h index e60c493585..e3704d7763 100644 --- a/src/vm/eventpipe.h +++ b/src/vm/eventpipe.h @@ -21,6 +21,7 @@ class MethodDesc; struct EventPipeProviderConfiguration; class EventPipeSession; class IpcStream; +enum class EventPipeSessionType; // EVENT_FILTER_DESCRIPTOR (This type does not exist on non-Windows platforms.) // https://docs.microsoft.com/en-us/windows/desktop/api/evntprov/ns-evntprov-_event_filter_descriptor @@ -28,6 +29,7 @@ class IpcStream; // determines which events are reported and traced. The structure gives the // event provider greater control over the selection of events for reporting // and tracing. +// TODO: EventFilterDescriptor and EventData (defined below) are the same. struct EventFilterDescriptor { // A pointer to the filter data. @@ -231,7 +233,6 @@ public: }; typedef UINT64 EventPipeSessionID; -typedef void (*FlushTimerCallback)(); class EventPipe { @@ -255,14 +256,9 @@ public: uint32_t circularBufferSizeInMB, uint64_t profilerSamplingRateInNanoseconds, const EventPipeProviderConfiguration *pProviders, - uint32_t numProviders); - - static EventPipeSessionID Enable( - IpcStream *pStream, - uint32_t circularBufferSizeInMB, - uint64_t profilerSamplingRateInNanoseconds, - const EventPipeProviderConfiguration *pProviders, - uint32_t numProviders); + uint32_t numProviders, + EventPipeSessionType sessionType, + IpcStream *const pStream); // Disable tracing via the event pipe. static void Disable(EventPipeSessionID id); @@ -311,12 +307,12 @@ private: // Enable the specified EventPipe session. static EventPipeSessionID Enable( + LPCWSTR strOutputPath, EventPipeSession *const pSession, - WAITORTIMERCALLBACK callback = nullptr, - DWORD dueTime = 0, - DWORD period = 0); + EventPipeSessionType sessionType, + IpcStream *const pStream); - static void CreateFlushTimerCallback(WAITORTIMERCALLBACK Callback, DWORD DueTime, DWORD Period); + static void CreateFlushTimerCallback(); static void DeleteFlushTimerCallback(); |