[GLIB] WebProcess critical assertion during D-Bus RequestName completion on process shutdown#60411
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Mar 13, 2026
Conversation
Collaborator
|
EWS run on previous version of this PR (hash 616bd88) Details |
csaavedra
reviewed
Mar 12, 2026
Member
csaavedra
left a comment
csaavedra
left a comment
There was a problem hiding this comment.
Just some style comments, not reviewing correctness as I think @GeorgesStavracas should do that.
Comment on lines
+105
to
+108
| if (m_nameOwnerId) { | ||
| g_bus_unown_name(m_nameOwnerId); | ||
| m_nameOwnerId = 0; | ||
| } |
Member
There was a problem hiding this comment.
This could use std::exchange:
Suggested change
| if (m_nameOwnerId) { | |
| g_bus_unown_name(m_nameOwnerId); | |
| m_nameOwnerId = 0; | |
| } | |
| if (auto id = std::exchange(m_nameOwnerId, 0)) | |
| g_bus_unown_name(id); |
Comment on lines
+110
to
+113
| if (m_registry) { | ||
| g_signal_handlers_disconnect_by_data(m_registry.get(), this); | ||
| m_registry = nullptr; | ||
| } |
Comment on lines
+115
to
+122
| if (m_connection) { | ||
| for (auto id : m_clients.values()) | ||
| g_dbus_connection_signal_unsubscribe(m_connection.get(), id); | ||
| m_clients.clear(); | ||
|
|
||
| g_dbus_connection_close_sync(m_connection.get(), nullptr, nullptr); | ||
| m_connection = nullptr; | ||
| } |
Comment on lines
+101
to
+103
| for (auto& pending : m_pendingRootRegistrations) | ||
| pending.completionHandler({ }); | ||
| m_pendingRootRegistrations.clear(); |
Member
There was a problem hiding this comment.
This could also use std::exchange().
GeorgesStavracas
approved these changes
Mar 12, 2026
lauromoura
force-pushed
the
eng/GLIB-WebProcess-critical-assertion-during-D-Bus-RequestName-completion-on-process-shutdown
branch
from
616bd88 to
c577e4a
Compare
Collaborator
|
EWS run on previous version of this PR (hash c577e4a) Details |
csaavedra
approved these changes
Mar 12, 2026
| g_signal_handlers_disconnect_by_data(registry.get(), this); | ||
|
|
||
| if (auto connection = std::exchange(m_connection, nullptr)) { | ||
| for (auto id : moveToVector(std::exchange(m_clients, { }).values())) |
Member
There was a problem hiding this comment.
Is the moveToVector() call really necessary? That's going to iterate over the elements to fill a vector. IIUC this could just be
Suggested change
| for (auto id : moveToVector(std::exchange(m_clients, { }).values())) | |
| for (auto id : std::exchange(m_clients, { }).values()) |
Contributor
Author
There was a problem hiding this comment.
That was my first approach, but the compiler warned of dangling-reference. Different from the other cases, here we're iterating through the values() member, which is LIFETIME_BOUND to the result of std::exchange, which in turn is not held alive by the loop.
Member
There was a problem hiding this comment.
Then maybe it's not worth using std:: exchange in this case.
lauromoura
force-pushed
the
eng/GLIB-WebProcess-critical-assertion-during-D-Bus-RequestName-completion-on-process-shutdown
branch
from
c577e4a to
3fd797f
Compare
Collaborator
|
EWS run on current version of this PR (hash 3fd797f) Details |
…ion on process shutdown https://bugs.webkit.org/show_bug.cgi?id=309693 Reviewed by Claudio Saavedra. While rare, there's a chance that the WebProcess exits while the AccessibilityAtspi dbus name callbacks are still in flight. If we don't close them gracefully, we risk critical errors when the reply arrives. This is likely related to 284894@main, which added the support for well-known bus name to AccessibilityAtspi. This happens, for example, in some WebDriver tests that quickly open and close browsing contexts. A run with release asserts is reporting almost 30 crashes. This commit addresses this issue by adding a graceful cleanup path to AccessibilityAtspi. * Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp: (WebCore::AccessibilityAtspi::didConnect): (WebCore::AccessibilityAtspi::disconnect): * Source/WebCore/accessibility/atspi/AccessibilityAtspi.h: * Source/WebKit/WebProcess/glib/WebProcessGLib.cpp: (WebKit::WebProcess::stopRunLoop): Canonical link: https://commits.webkit.org/309174@main
webkit-commit-queue
force-pushed
the
eng/GLIB-WebProcess-critical-assertion-during-D-Bus-RequestName-completion-on-process-shutdown
branch
from
3fd797f to
57438b0
Compare
Collaborator
|
Committed 309174@main (57438b0): https://commits.webkit.org/309174@main Reviewed commits have been landed. Closing PR #60411 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
aperezdc
added
GLib Suggested Backport - 2.50
Contributor
|
Backported into |
aperezdc
removed
the
GLib Suggested Backport - 2.52
Contributor
|
Backported into |
aperezdc
removed
the
GLib Suggested Backport - 2.50
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
57438b0
3fd797f
🛠 win🧪 win-tests🧪 ios-wk2-wpt🧪 api-mac-debug🛠 ios-safer-cpp