components/mus/common/gpu_service.cc - Issue 2049083002: Implement MusGpuMemoryBufferManager

Unified Diff: components/mus/common/gpu_service.cc

Issue 2049083002: Implement MusGpuMemoryBufferManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/mus/common/generic_shared_memory_id_generator.cc ('k') | components/mus/gpu/BUILD.gn » ('j') | components/mus/gpu/mus_gpu_memory_buffer_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/mus/common/gpu_service.cc

diff --git a/components/mus/common/gpu_service.cc b/components/mus/common/gpu_service.cc

index 37c0635078b4a1920dddd9241ac26f1b235f6f59..73049e520580245420c5139a0ce9b3e9a5e6b61b 100644

--- a/components/mus/common/gpu_service.cc

+++ b/components/mus/common/gpu_service.cc

@@ -6,6 +6,7 @@

#include "base/command_line.h"

#include "base/memory/singleton.h"

+#include "base/threading/thread_restrictions.h"

#include "components/mus/common/gpu_type_converters.h"

#include "components/mus/common/mojo_gpu_memory_buffer_manager.h"

#include "components/mus/common/switches.h"

@@ -72,10 +73,14 @@ scoped_refptr<gpu::GpuChannelHost> GpuService::EstablishGpuChannel(

gpu::GPUInfo gpu_info;

gpu_service->EstablishGpuChannel(base::Bind(

&GpuChannelEstablishCallback, &client_id, &channel_handle, &gpu_info));

- if (!gpu_service.WaitForIncomingResponse()) {

- DLOG(WARNING)

- << "Channel encountered error while establishing gpu channel.";

- return nullptr;

+ {

+ base::ThreadRestrictions::ScopedAllowWait allow_wait;

jam 2016/06/09 16:01:45 why is this needed? i.e. what's the callstack that

Peng 2016/06/09 17:40:29 The call stack is listed below. I don't think ther

The call stack is listed below. I don't think there is a good place in mojo to add the ScopedAllowWait. WDYT? [32510:32510:0609/133601:ERROR:session_manager_client.cc(657)] Failed to call GetServerBackedStateKeys [32510:32510:0609/133601:FATAL:thread_restrictions.cc(72)] Waiting is not allowed to be used on this thread to prevent jank and deadlock. #0 0x7f16549bd8b6 base::debug::StackTrace::StackTrace() #1 0x7f16549def6e logging::LogMessage::~LogMessage() #2 0x7f1654a4f343 base::ThreadRestrictions::AssertWaitAllowed() #3 0x7f1654a36fd9 base::ConditionVariable::Wait() #4 0x7f164fdf6148 mojo::edk::Waiter::Wait() #5 0x7f164fdd772f mojo::edk::Core::WaitManyInternal() #6 0x7f164fdd7ac3 mojo::edk::Core::Wait() #7 0x7f164f4b613a mojo::internal::Connector::WaitForIncomingMessage() #8 0x7f1650cfba5e mus::GpuService::EstablishGpuChannel() #9 0x7f1650cdfcf7 mus::GLES2Context::Initialize() #10 0x7f1650ce0b68 mus::GLES2Context::CreateOffscreenContext() #11 0x7f1650cdef55 mus::ContextProvider::BindToCurrentThread() #12 0x7f164ee5c3fd cc::OutputSurface::BindToClient() #13 0x7f164ef11535 cc::LayerTreeHostImpl::InitializeRenderer() #14 0x7f164ef4e39e cc::SingleThreadProxy::SetOutputSurface() #15 0x7f164eeff435 cc::LayerTreeHost::SetOutputSurface() #16 0x7f164edb8f19 ui::Compositor::SetOutputSurface() #17 0x7f16523f7376 views::SurfaceContextFactory::CreateOutputSurface() #18 0x7f164edb8cc1 ui::Compositor::RequestNewOutputSurface() #19 0x7f164ef4de24 cc::SingleThreadProxy::RequestNewOutputSurface() #20 0x7f164ef4dcc5 _ZN4base8internal7InvokerINS_13IndexSequenceIJLm0EEEENS0_9BindStateINS0_15RunnableAdapterIMN2cc17SingleThreadProxyEFvvEEEFvPS7_EJNS_7WeakPtrIS7_EEEEELb1EFvvEE3RunEPNS0_13BindStateBaseE #21 0x7f164d6ae435 _ZN4base8internal7InvokerINS_13IndexSequenceIJLm0EEEENS0_9BindStateINS0_15RunnableAdapterIMNS_18CancelableCallbackIFvvEEEKFvvEEEFvPKS8_EJNS_7WeakPtrIS8_EEEEELb1ES7_E3RunEPNS0_13BindStateBaseE #22 0x7f16549bf3aa base::debug::TaskAnnotator::RunTask() #23 0x7f16549ebc52 base::MessageLoop::RunTask() #24 0x7f16549ec0ae base::MessageLoop::DeferOrRunPendingTask() #25 0x7f16549ede44 base::MessageLoop::DoWork() #26 0x7f16549f0739 base::MessagePumpLibevent::Run() #27 0x7f16549eced9 base::MessageLoop::RunHandler() #28 0x7f1654a22428 base::RunLoop::Run() #29 0x7f164d3b41f7 ChromeBrowserMainParts::MainMessageLoopRun() #30 0x7f164f5bada0 content::BrowserMainLoop::RunMainMessageLoopParts() #31 0x7f164f5bd9c0 content::BrowserMainRunnerImpl::Run() #32 0x7f164f5b6279 content::BrowserMain() #33 0x7f16548d8500 content::RunNamedProcessTypeMain() #34 0x7f16548d8645 content::ContentMainRunnerImpl::Run() #35 0x7f16548d6299 content::ContentMain() #36 0x7f164d357d42 ChromeMain #37 0x7f164ae17fb6 __libc_start_main #38 0x7f164d357b7d <unknown>

+ if (!gpu_service.WaitForIncomingResponse()) {

+ DLOG(WARNING)

+ << "Channel encountered error while establishing gpu channel.";

+ return nullptr;

+ }

}

gpu_channel_ = gpu::GpuChannelHost::Create(this, client_id, gpu_info,

channel_handle, &shutdown_event_,