diff options
| author | mseaborn <mseaborn@chromium.org> | 2014-12-18 09:41:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-18 17:42:15 +0000 |
| commit | d75cf36e6fcd69ef5790061cce45bd84350fbac0 (patch) | |
| tree | 122e43503f9fdff335c14a0728783a01a1dbc50e /ppapi/nacl_irt | |
| parent | bdf9b23b61068e1b32de11ce150c98a8e2f05f52 (diff) | |
| download | chromium_src-d75cf36e6fcd69ef5790061cce45bd84350fbac0.zip chromium_src-d75cf36e6fcd69ef5790061cce45bd84350fbac0.tar.gz chromium_src-d75cf36e6fcd69ef5790061cce45bd84350fbac0.tar.bz2 | |
NaCl cleanup: Remove an unused SRPC channel
plugin.cc was connecting to a channel that it never uses, and
plugin_main.cc had code for listening on that channel.
Note that NaClSrpcAcceptClientOnThread() did two things:
* Called NaClPluginLowLevelInitializationComplete(), which unblocks
part of startup. We need to keep this for now (until further
simplifications are made).
* Accepted an SRPC connection and spawned a thread to listen on it.
It's this part that we're removing.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3864
TEST=NaCl tests in browser_tests
Review URL: https://codereview.chromium.org/813943002
Cr-Commit-Position: refs/heads/master@{#309028}
Diffstat (limited to 'ppapi/nacl_irt')
| -rw-r--r-- | ppapi/nacl_irt/DEPS | 2 | ||||
| -rw-r--r-- | ppapi/nacl_irt/plugin_main.cc | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/ppapi/nacl_irt/DEPS b/ppapi/nacl_irt/DEPS index 62d1f31..7117740 100644 --- a/ppapi/nacl_irt/DEPS +++ b/ppapi/nacl_irt/DEPS @@ -7,7 +7,7 @@ include_rules = [ # The untrusted build references the NaCl integrated runtime (IRT). "+native_client/src/public", - "+native_client/src/shared/srpc/nacl_srpc.h", + "+native_client/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.h", "+native_client/src/untrusted/irt/irt.h", # The IRT also needs to know the errno and sysconf enums. "+native_client/src/trusted/service_runtime/include/sys/errno.h", diff --git a/ppapi/nacl_irt/plugin_main.cc b/ppapi/nacl_irt/plugin_main.cc index 2b5e3b1..244bcbf 100644 --- a/ppapi/nacl_irt/plugin_main.cc +++ b/ppapi/nacl_irt/plugin_main.cc @@ -19,7 +19,7 @@ #include "ppapi/shared_impl/ppb_audio_shared.h" #if defined(__native_client__) -#include "native_client/src/shared/srpc/nacl_srpc.h" +#include "native_client/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.h" #endif void PpapiPluginRegisterThreadCreator( @@ -34,17 +34,11 @@ int PpapiPluginMain() { ppapi::proxy::PluginGlobals plugin_globals; #if defined(OS_NACL_SFI) - // Currently on non-SFI mode, we don't use SRPC server on plugin. - // TODO(hidehiko): Make sure this SRPC is actually used on SFI-mode. - - // Start up the SRPC server on another thread. Otherwise, when it blocks - // on an RPC, the PPAPI proxy will hang. Do this before we initialize the - // module and start the PPAPI proxy so that the NaCl plugin can continue - // loading the app. - static struct NaClSrpcHandlerDesc srpc_methods[] = { { NULL, NULL } }; - if (!NaClSrpcAcceptClientOnThread(srpc_methods)) { - return 1; - } + // This is currently needed so that the NaCl reverse service calls the + // StartupInitializationComplete() SRPC method, which unblocks plugin + // startup on the Chromium side. + // TODO(mseaborn): Remove the need to call this. + NaClPluginLowLevelInitializationComplete(); #endif ppapi::PpapiDispatcher ppapi_dispatcher( |