-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
fix(cua-driver/linux): retry root-only AT-SPI tree on cold Qt6 launch (#1927) #1998
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚀 Performance & Scalability | 🟠 Major | ⚡ Quick win
Retry heuristic should be cap-aware to avoid forced backoff on intentionally tiny trees.
Line 73 treats
nodes.len() <= 1as a cold-start symptom unconditionally. But callers can intentionally request tiny traversals (max_elements=1/max_depth=1), where a single-node result is expected; this path then always incurs 3 sleeps (~450ms) before returning.Proposed fix
pub fn walk_tree_bounded( pid: u32, xid: u64, query: Option<&str>, max_elements: Option<usize>, max_depth: Option<usize>, ) -> AtspiTreeResult { const MAX_ATTEMPTS: usize = 4; + const BACKOFF_MS: u64 = 150; + let retry_root_only = max_elements.map_or(true, |m| m > 1) + && max_depth.map_or(true, |d| d > 1); + for attempt in 0..MAX_ATTEMPTS { if let Ok(Some((raw_md, nodes))) = native::walk_tree_bounded(pid, max_elements, max_depth) { - if !raw_md.is_empty() && (nodes.len() > 1 || attempt == MAX_ATTEMPTS - 1) { + let root_only = nodes.len() <= 1; + let should_retry = retry_root_only && root_only && attempt < MAX_ATTEMPTS - 1; + if !raw_md.is_empty() && !should_retry { let md = if let Some(q) = query { filter_tree(&raw_md, q) } else { raw_md }; return AtspiTreeResult { tree_markdown: md, nodes }; } } if attempt < MAX_ATTEMPTS - 1 { - std::thread::sleep(std::time::Duration::from_millis(150)); + std::thread::sleep(std::time::Duration::from_millis(BACKOFF_MS)); } }🤖 Prompt for AI Agents