Skip to content
Snippets Groups Projects

vout: fix deadlock on ICC profile update

Merged Niklas Haas requested to merge haasn/vlc:fix_deadlock into master
All threads resolved!

This was taking more locks than necessary, causing a possible deadlock, because window events are not supposed to lock the window lock.

The display lock is more than sufficient to guard access to this field.

Fixes: 354f3aae

Merge request reports

Merge request pipeline #252255 passed

Merge request pipeline passed for 575bef69

Merged by Jean-Baptiste KempfJean-Baptiste Kempf 2 years ago (Aug 15, 2022 9:49am UTC)

Loading

Pipeline #252261 passed

Pipeline passed for 575bef69 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Steve Lhomme resolved all threads

    resolved all threads

  • Denis Charmet resolved all threads

    resolved all threads

  • Rémi Denis-Courmont approved this merge request

    approved this merge request

  • Jean-Baptiste Kempf approved this merge request

    approved this merge request

  • Niklas Haas mentioned in merge request !2379 (merged)

    mentioned in merge request !2379 (merged)

  • MR Acceptance result

    :tada: This MergeRequest has been Accepted! Congratulations.

    MR acceptance checks details:

    • :white_check_mark: MR should be considered mergeable by Gitlab
    • :white_check_mark: Last pipeline should be successful
    • :white_check_mark: MergeRequest should have at least one external review and/or vote
    • :white_check_mark: All threads should be resolved, have votes and score > 0
    • :white_check_mark: MergeRequest should have no activity (threads/votes) for (72h/72h)

    This message was automatically generated by homer-bot.

  • added 57 commits

    Compare with previous version

  • Jean-Baptiste Kempf enabled an automatic merge when the pipeline for 575bef69 succeeds

    enabled an automatic merge when the pipeline for 575bef69 succeeds

  • Author Contributor

    I didn't want to disturb this MR to get it merged ASAP, but for the record: this also technically fixes a race condition where the old icc_profile could be freed before the display is informed of the new profile, which adds further justification to only changing this state only while holding the display lock.

  • Jean-Baptiste Kempf changed milestone to %4.0

    changed milestone to %4.0

  • Please register or sign in to reply
    Loading