Skip to content

Commit bcdff13

Browse files
github-actions[bot]davmasonlambdageek
authored
[release/8.0] Remove public provider from rundown session (#92048)
* add rundown check * Update ep-session.c * Check for rundown provider * Fix * Update src/mono/mono/eventpipe/ep-rt-types-mono.h Co-authored-by: Aleksey Kliger (λgeek) <[email protected]> * Fix cross plat build * Revert previous changes * Remove public provider from rundown session * Finish reverting * Update ep-session.c --------- Co-authored-by: David Mason <[email protected]> Co-authored-by: Aleksey Kliger (λgeek) <[email protected]>
1 parent 4241f1d commit bcdff13

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

src/native/eventpipe/ep-session.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,24 +329,16 @@ ep_session_enable_rundown (EventPipeSession *session)
329329
const uint64_t keywords = 0x80020139;
330330
const EventPipeEventLevel verbose_logging_level = EP_EVENT_LEVEL_VERBOSE;
331331

332-
EventPipeProviderConfiguration rundown_providers [2];
333-
uint32_t rundown_providers_len = (uint32_t)ARRAY_SIZE (rundown_providers);
332+
EventPipeProviderConfiguration rundown_provider;
333+
ep_provider_config_init (&rundown_provider, ep_config_get_rundown_provider_name_utf8 (), keywords, verbose_logging_level, NULL); // Rundown provider.
334334

335-
ep_provider_config_init (&rundown_providers [0], ep_config_get_public_provider_name_utf8 (), keywords, verbose_logging_level, NULL); // Public provider.
336-
ep_provider_config_init (&rundown_providers [1], ep_config_get_rundown_provider_name_utf8 (), keywords, verbose_logging_level, NULL); // Rundown provider.
335+
EventPipeSessionProvider *session_provider = ep_session_provider_alloc (
336+
ep_provider_config_get_provider_name (&rundown_provider),
337+
ep_provider_config_get_keywords (&rundown_provider),
338+
ep_provider_config_get_logging_level (&rundown_provider),
339+
ep_provider_config_get_filter_data (&rundown_provider));
337340

338-
// Update provider list with rundown configuration.
339-
for (uint32_t i = 0; i < rundown_providers_len; ++i) {
340-
const EventPipeProviderConfiguration *config = &rundown_providers [i];
341-
342-
EventPipeSessionProvider *session_provider = ep_session_provider_alloc (
343-
ep_provider_config_get_provider_name (config),
344-
ep_provider_config_get_keywords (config),
345-
ep_provider_config_get_logging_level (config),
346-
ep_provider_config_get_filter_data (config));
347-
348-
ep_raise_error_if_nok (ep_session_add_session_provider (session, session_provider));
349-
}
341+
ep_raise_error_if_nok (ep_session_add_session_provider (session, session_provider));
350342

351343
ep_session_set_rundown_enabled (session, true);
352344
result = true;

0 commit comments

Comments
 (0)