ppapi/native_client/src/trusted/plugin/plugin.cc - Issue 11761025: When launching PNaCl helper nexes, explicitly disable IRT loading.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 11761025: When launching PNaCl helper nexes, explicitly disable IRT loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't forget to serialize Created 7 years, 11 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 | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/trusted/plugin/plugin.cc

diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc

index c8c919420ac3daeae0f6b37a37d7cfc6aba04dfc..09e037d93630a6a3f4717d27a84ab228f7d0ff31 100644

--- a/ppapi/native_client/src/trusted/plugin/plugin.cc

+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc

@@ -544,6 +544,7 @@ bool Plugin::LoadNaClModuleCommon(nacl::DescWrapper* wrapper,

NaClSubprocess* subprocess,

const Manifest* manifest,

bool should_report_uma,

+ bool uses_irt,

bool uses_ppapi,

ErrorInfo* error_info,

pp::CompletionCallback init_done_cb,

@@ -564,6 +565,7 @@ bool Plugin::LoadNaClModuleCommon(nacl::DescWrapper* wrapper,

new_service_runtime->Start(wrapper,

error_info,

manifest_base_url(),

+ uses_irt,

uses_ppapi,

enable_dev_interfaces_,

crash_cb);

@@ -586,6 +588,7 @@ bool Plugin::LoadNaClModule(nacl::DescWrapper* wrapper,

ShutDownSubprocesses();

if (!LoadNaClModuleCommon(wrapper, &main_subprocess_, manifest_.get(),

true /* should_report_uma */,

+ true /* uses_irt */,

true /* uses_ppapi */,

error_info, init_done_cb, crash_cb)) {

return false;

@@ -647,8 +650,13 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(nacl::DescWrapper* wrapper,

// Do not report UMA stats for translator-related nexes.

// TODO(sehr): define new UMA stats for translator related nexe events.

+ // NOTE: The PNaCl translator nexes are not built to use the IRT. This is

+ // done to save on address space and swap space. The PNaCl translator

+ // nexes also do not use PPAPI. That allows the nexes to be launched

+ // off of the main thread and not block the UI.

if (!LoadNaClModuleCommon(wrapper, nacl_subprocess.get(), manifest,

false /* should_report_uma */,

+ false /* uses_irt */,

false /* uses_ppapi */,

error_info,

pp::BlockUntilComplete(),