ozone/wayland: Reset all_bug_fixes_sent_callback on channel destroyed [chromium/src : main]

0 views
Skip to first unread message

Eriko Kurimoto (Gerrit)

unread,
Sep 26, 2023, 10:04:34 AM9/26/23
to ozone-...@chromium.org

Attention is currently required from: Eriko Kurimoto.

Eriko Kurimoto uploaded patch set #3 to this change.

View Change

ozone/wayland: Reset all_bug_fixes_sent_callback on channel destroyed

This CL reset `all_bug_fixes_sent_callback_` when OnChennelDestroyed is
called.

This fixes the flaky crash on compositor_unittests and
TabCapturePerformanceTest.

Bug: 1482740
Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
---
M ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
1 file changed, 1 insertion(+), 0 deletions(-)

To view, visit change 4881242. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newpatchset
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
Gerrit-Change-Number: 4881242
Gerrit-PatchSet: 3
Gerrit-Owner: Eriko Kurimoto <elk...@chromium.org>
Gerrit-Reviewer: Eriko Kurimoto <elk...@chromium.org>
Gerrit-Reviewer: Mitsuru Oshima <osh...@chromium.org>
Gerrit-Attention: Eriko Kurimoto <elk...@chromium.org>

Eriko Kurimoto (Gerrit)

unread,
Sep 26, 2023, 10:05:15 AM9/26/23
to ozone-...@chromium.org, Mitsuru Oshima, Chromium LUCI CQ, chromium...@chromium.org

Attention is currently required from: Mitsuru Oshima.

Patch set 3:Commit-Queue +1

View Change

2 comments:

  • Patchset:

    • Patch Set #1:

      will it be difficult to pass callback in test?

      I think inserting fake callback here is not correct since TestGpuServiceHolder binds new interface as `buffer_manager_gpu_remote` and it should again initialize it.

  • File ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc:

    • Patch Set #1, Line 159: << "see this message except for testing.";

      is it difficult to fix test?

      Actually, resetting callback on channel destruction is enough. Updated the cl.

To view, visit change 4881242. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: comment
Gerrit-Project: chromium/src
Gerrit-Branch: main
Gerrit-Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
Gerrit-Change-Number: 4881242
Gerrit-PatchSet: 3
Gerrit-Owner: Eriko Kurimoto <elk...@chromium.org>
Gerrit-Reviewer: Eriko Kurimoto <elk...@chromium.org>
Gerrit-Reviewer: Mitsuru Oshima <osh...@chromium.org>
Gerrit-Attention: Mitsuru Oshima <osh...@chromium.org>
Gerrit-Comment-Date: Tue, 26 Sep 2023 14:05:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Mitsuru Oshima <osh...@chromium.org>

Mitsuru Oshima (Gerrit)

unread,
Sep 26, 2023, 11:06:21 AM9/26/23
to Eriko Kurimoto, ozone-...@chromium.org, Chromium LUCI CQ, chromium...@chromium.org

Attention is currently required from: Eriko Kurimoto.

Patch set 3:Code-Review +1

View Change

    To view, visit change 4881242. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-MessageType: comment
    Gerrit-Project: chromium/src
    Gerrit-Branch: main
    Gerrit-Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
    Gerrit-Change-Number: 4881242
    Gerrit-PatchSet: 3
    Gerrit-Owner: Eriko Kurimoto <elk...@chromium.org>
    Gerrit-Reviewer: Eriko Kurimoto <elk...@chromium.org>
    Gerrit-Reviewer: Mitsuru Oshima <osh...@chromium.org>
    Gerrit-Attention: Eriko Kurimoto <elk...@chromium.org>
    Gerrit-Comment-Date: Tue, 26 Sep 2023 15:06:09 +0000
    Gerrit-HasComments: No
    Gerrit-Has-Labels: Yes

    Eriko Kurimoto (Gerrit)

    unread,
    Sep 26, 2023, 11:11:44 PM9/26/23
    to ozone-...@chromium.org, Mitsuru Oshima, Chromium LUCI CQ, chromium...@chromium.org

    Patch set 3:Commit-Queue +2

    View Change

      To view, visit change 4881242. To unsubscribe, or for help writing mail filters, visit settings.

      Gerrit-MessageType: comment
      Gerrit-Project: chromium/src
      Gerrit-Branch: main
      Gerrit-Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
      Gerrit-Change-Number: 4881242
      Gerrit-PatchSet: 3
      Gerrit-Owner: Eriko Kurimoto <elk...@chromium.org>
      Gerrit-Reviewer: Eriko Kurimoto <elk...@chromium.org>
      Gerrit-Reviewer: Mitsuru Oshima <osh...@chromium.org>
      Gerrit-Comment-Date: Wed, 27 Sep 2023 03:11:34 +0000
      Gerrit-HasComments: No
      Gerrit-Has-Labels: Yes

      Chromium LUCI CQ (Gerrit)

      unread,
      Sep 26, 2023, 11:16:54 PM9/26/23
      to Eriko Kurimoto, ozone-...@chromium.org, Mitsuru Oshima, chromium...@chromium.org

      Chromium LUCI CQ submitted this change.

      View Change

      Approvals: Mitsuru Oshima: Looks good to me Eriko Kurimoto: Commit
      ozone/wayland: Reset all_bug_fixes_sent_callback on channel destroyed

      This CL reset `all_bug_fixes_sent_callback_` when OnChennelDestroyed is
      called.

      This fixes the flaky crash on compositor_unittests and
      TabCapturePerformanceTest.

      Bug: 1482740
      Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
      Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4881242
      Reviewed-by: Mitsuru Oshima <osh...@chromium.org>
      Commit-Queue: Eriko Kurimoto <elk...@chromium.org>
      Cr-Commit-Position: refs/heads/main@{#1201920}

      ---
      M ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
      1 file changed, 1 insertion(+), 0 deletions(-)

      
      
      diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
      index 6f42199..2ac3e89 100644
      --- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
      +++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
      @@ -114,6 +114,7 @@
      for (auto* window : connection_->window_manager()->GetAllWindows())
      window->OnChannelDestroyed();

      + all_bug_fixes_sent_callback_.Reset();
      buffer_manager_gpu_associated_.reset();
      receiver_.reset();
      }

      To view, visit change 4881242. To unsubscribe, or for help writing mail filters, visit settings.

      Gerrit-MessageType: merged
      Gerrit-Project: chromium/src
      Gerrit-Branch: main
      Gerrit-Change-Id: I32b9c0a56f9ffdd515d5c28106d49c5a43ffd588
      Gerrit-Change-Number: 4881242
      Gerrit-PatchSet: 4
      Gerrit-Owner: Eriko Kurimoto <elk...@chromium.org>
      Gerrit-Reviewer: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
      Gerrit-Reviewer: Eriko Kurimoto <elk...@chromium.org>
      Gerrit-Reviewer: Mitsuru Oshima <osh...@chromium.org>
      Reply all
      Reply to author
      Forward
      0 new messages