Skip to content

[release/6.0] Delete dangling thread session states #76431

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

Merged
carlossanlop merged 5 commits into from
Oct 7, 2022
Merged

[release/6.0] Delete dangling thread session states #76431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0f2b9d
Delete dangling thread session states
davmason Sep 30, 2022
0d36eab
Add function prototype
davmason Sep 30, 2022
61dee66
Update src/native/eventpipe/ep-session.c
davmason Oct 4, 2022
e182575
Update src/native/eventpipe/ep-session.c
davmason Oct 4, 2022
86e4601
Code review feedback
davmason Oct 4, 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
Prev Previous commit
Code review feedback
  • Loading branch information
@davmason
davmason committed Oct 4, 2022
commit 86e4601468b67f87a6644b87072c26d41144a1c5
2 changes: 2 additions & 0 deletions src/native/eventpipe/ep-buffer-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,7 @@ buffer_manager_try_convert_buffer_to_read_only (
EventPipeThread *thread = ep_buffer_get_writer_thread (new_read_buffer);
EP_SPIN_LOCK_ENTER (ep_thread_get_rt_lock_ref (thread), section1);
EventPipeThreadSessionState *thread_session_state = ep_thread_get_session_state (thread, buffer_manager->session);
EP_ASSERT(thread_session_state != NULL);
if (ep_thread_session_state_get_write_buffer (thread_session_state) == new_read_buffer) {
ep_thread_session_state_set_write_buffer (thread_session_state, NULL);
EP_ASSERT (ep_buffer_get_volatile_state (new_read_buffer) == EP_BUFFER_STATE_READ_ONLY);
Expand Down Expand Up @@ -1091,6 +1092,7 @@ ep_buffer_manager_suspend_write_event (
EventPipeThread *thread = ep_rt_thread_array_iterator_value (&thread_array_iterator);
EP_SPIN_LOCK_ENTER (ep_thread_get_rt_lock_ref (thread), section2)
EventPipeThreadSessionState *thread_session_state = ep_thread_get_session_state (thread, buffer_manager->session);
EP_ASSERT(thread_session_state != NULL);
ep_thread_session_state_set_write_buffer (thread_session_state, NULL);
EP_SPIN_LOCK_EXIT (ep_thread_get_rt_lock_ref (thread), section2)
ep_rt_thread_array_iterator_next (&thread_array_iterator);
Expand Down
29 changes: 14 additions & 15 deletions src/native/eventpipe/ep-session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,20 @@ ep_session_remove_dangling_session_states (EventPipeSession *session)
ep_rt_thread_array_iterator_t threads_iterator = ep_rt_thread_array_iterator_begin (&threads);
while (!ep_rt_thread_array_iterator_end (&threads, &threads_iterator)) {
EventPipeThread *thread = ep_rt_thread_array_iterator_value (&threads_iterator);
if (thread) {
EP_SPIN_LOCK_ENTER (ep_thread_get_rt_lock_ref (thread), section1);
EventPipeThreadSessionState *session_state = ep_thread_get_session_state(thread, session);
if (session_state) {
// If a buffer tries to write event(s) but never gets a buffer because the maximum total buffer size
// has been exceeded, we can leak the EventPipeThreadSessionState* and crash later trying to access
// the session from the thread session state. Whenever we terminate a session we check to make sure
// we haven't leaked any thread session states.
ep_thread_delete_session_state(thread, session);
}
EP_SPIN_LOCK_EXIT (ep_thread_get_rt_lock_ref (thread), section1);

// ep_thread_get_threads calls ep_thread_addref for every entry, need to release it here
ep_thread_release (thread);
}
EP_ASSERT(thread != NULL);
EP_SPIN_LOCK_ENTER (ep_thread_get_rt_lock_ref (thread), section1);
EventPipeThreadSessionState *session_state = ep_thread_get_session_state(thread, session);
if (session_state) {
// If a buffer tries to write event(s) but never gets a buffer because the maximum total buffer size
// has been exceeded, we can leak the EventPipeThreadSessionState* and crash later trying to access
// the session from the thread session state. Whenever we terminate a session we check to make sure
// we haven't leaked any thread session states.
ep_thread_delete_session_state(thread, session);
}
EP_SPIN_LOCK_EXIT (ep_thread_get_rt_lock_ref (thread), section1);

// ep_thread_get_threads calls ep_thread_addref for every entry, need to release it here
ep_thread_release (thread);

ep_rt_thread_array_iterator_next (&threads_iterator);
}
Expand Down