Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Dec 26, 2025

This will work as intended, at least for now...

Summary by Sourcery

Bug Fixes:

  • Prevent dde-session from failing to start after Treeland login by deferring VT signal handler setup until after the user process is spawned.

This will work as intended, at least for now...
@deepin-ci-robot
Copy link

Hi @calsys456. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Dec 26, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adjusts Treeland VT signal handler setup to temporarily disable it during session process startup to avoid a VT RELDISP-induced malloc deadlock, and encapsulates the handler registration in TreelandConnector so it can be reapplied after login.

Sequence diagram for VT signal handler handling during session startup

sequenceDiagram
    participant Display
    participant Auth
    participant VirtualTerminal
    participant DaemonApp
    participant TreelandConnector

    Display->>Auth: connect(userProcessFinished)
    Display->>VirtualTerminal: setVtSignalHandler(nullptr, nullptr)
    Display->>Auth: startUserProcess(sessionExec, cookie)
    Auth-->>Display: userProcessStarted
    Display->>DaemonApp: treelandConnector()
    DaemonApp-->>Display: TreelandConnector
    Display->>TreelandConnector: setSignalHandler()
    TreelandConnector->>VirtualTerminal: setVtSignalHandler(onAcquireDisplay, onReleaseDisplay)
    Auth-->>Display: userProcessFinished(exitCode)
Loading

Updated class diagram for TreelandConnector VT signal handler management

classDiagram
    class Display {
        +userProcessFinished()
    }

    class Auth {
        +startUserProcess(execPath, cookie)
    }

    class VirtualTerminal {
        +setVtSignalHandler(onAcquireCallback, onReleaseCallback)
    }

    class TreelandConnector {
        +TreelandConnector()
        +~TreelandConnector()
        +isConnected() bool
        +setPrivateObject(ddm)
        +setSignalHandler()
        +connect(socketPath)
        +switchToGreeter()
    }

    class DaemonApp {
        +treelandConnector() TreelandConnector*
    }

    Display --> Auth : uses
    Display --> DaemonApp : uses
    DaemonApp --> TreelandConnector : provides
    TreelandConnector --> VirtualTerminal : configures VT signals
    Display --> VirtualTerminal : temporarily disables VT signals
Loading

File-Level Changes

Change Details Files
Temporarily disable VT signal handling during user session process startup and re-enable it afterward via TreelandConnector.
  • Before starting the user desktop process, clear the VirtualTerminal VT signal handler to avoid a RELDISP-triggered glibc malloc arena deadlock during fork()
  • After starting the user desktop process, re-register the VT signal handler by calling the TreelandConnector helper method
src/daemon/Display.cpp
Encapsulate Treeland VT signal handler registration into a dedicated TreelandConnector method so it can be reused.
  • Move the initial VirtualTerminal::setVtSignalHandler(onAcquireDisplay, onReleaseDisplay) call from the TreelandConnector constructor into a new setSignalHandler() method
  • Expose setSignalHandler() in the TreelandConnector header for external callers
  • Use setSignalHandler() in the TreelandConnector constructor to keep existing initialization behavior
src/daemon/TreelandConnector.cpp
src/daemon/TreelandConnector.h

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've left some high level feedback:

  • The FIXME comment about VT RELDISP and glibc malloc deadlock is the only explanation for the change; consider briefly documenting why moving setVtSignalHandler after startUserProcess avoids the deadlock and what assumptions this relies on, so future refactors don’t inadvertently regress it.
  • Now that TreelandConnector’s constructor no longer unconditionally sets the VT signal handler, make it explicit in the class contract (e.g., via naming or comments) that setSignalHandler() must be called after construction, and consider guarding against multiple calls or ensuring it’s safe to call idempotently.
  • Review whether the destructor should explicitly reset or clear the VT signal handler now that it is set later via setSignalHandler() rather than in the constructor, to avoid leaving global state in an unexpected configuration on teardown.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- The FIXME comment about VT RELDISP and glibc malloc deadlock is the only explanation for the change; consider briefly documenting why moving `setVtSignalHandler` after `startUserProcess` avoids the deadlock and what assumptions this relies on, so future refactors don’t inadvertently regress it.
- Now that `TreelandConnector`’s constructor no longer unconditionally sets the VT signal handler, make it explicit in the class contract (e.g., via naming or comments) that `setSignalHandler()` must be called after construction, and consider guarding against multiple calls or ensuring it’s safe to call idempotently.
- Review whether the destructor should explicitly reset or clear the VT signal handler now that it is set later via `setSignalHandler()` rather than in the constructor, to avoid leaving global state in an unexpected configuration on teardown.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: calsys456, zccrs

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@zccrs zccrs merged commit 0340526 into linuxdeepin:master Dec 26, 2025
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants