Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: src/shared/srpc/nacl_srpc_ppapi_plugin_internal.c

Issue 871713002: Remove NaClPluginLowLevelInitializationComplete() (caller of "init_done" SRPC) (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 5 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 | « src/shared/srpc/nacl_srpc_ppapi_plugin_internal.h ('k') | src/shared/srpc/srpc.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/shared/srpc/nacl_srpc_ppapi_plugin_internal.c
diff --git a/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.c b/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.c
deleted file mode 100644
index a2f0ca0c738a75e82c1ca591495702efbb296f01..0000000000000000000000000000000000000000
--- a/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2011 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "native_client/src/shared/srpc/nacl_srpc_ppapi_plugin_internal.h"
-
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "native_client/src/public/imc_syscalls.h"
-#include "native_client/src/public/name_service.h"
-#include "native_client/src/shared/platform/nacl_log.h"
-#include "native_client/src/shared/srpc/nacl_srpc.h"
-#include "native_client/src/shared/srpc/nacl_srpc_internal.h"
-#include "native_client/src/trusted/service_runtime/include/sys/nacl_kernel_service.h"
-
-static int gNaClNameServiceConnCapDesc = -1;
-
-void NaClPluginLowLevelInitializationCompleteInternal(void) {
- int nameservice_conn_desc;
- int kernel_service_conn_cap_desc = -1;
- int kernel_service_desc;
- struct NaClSrpcChannel srpc_channel;
- int status;
-
- NaClLog(4, "Entered NaClPluginLowLevelInitializationComplete\n");
-
- if (-1 != gNaClNameServiceConnCapDesc) {
- NaClLog(LOG_ERROR,
- "Double call to NaClPluginLowLevelInitializationComplete?\n");
- return;
- }
- /*
- * The existence of the bootstrap nameservice is independent of
- * whether NaCl is running as a standalone application or running as
- * a untrusted Pepper plugin, browser extension environment.
- */
- if (-1 == nacl_nameservice(&gNaClNameServiceConnCapDesc)) {
- NaClLog(LOG_FATAL,
- "NaClPluginLowLevelInitializationComplete: no name service?!?\n");
- }
-
- nameservice_conn_desc = imc_connect(gNaClNameServiceConnCapDesc);
- if (-1 == nameservice_conn_desc) {
- NaClLog(LOG_FATAL,
- "Could not connect to bootstrap name service\n");
- }
- if (!NaClSrpcClientCtor(&srpc_channel, nameservice_conn_desc)) {
- (void) close(nameservice_conn_desc);
- NaClLog(LOG_FATAL, "SRPC channel ctor to name service failed\n");
- }
- if (NACL_SRPC_RESULT_OK != NaClSrpcInvokeBySignature(
- &srpc_channel,
- NACL_NAME_SERVICE_LOOKUP,
- "KernelService",
- O_RDWR,
- &status,
- &kernel_service_conn_cap_desc)) {
- NaClSrpcDtor(&srpc_channel);
- NaClLog(LOG_FATAL, "Name service lookup RPC for KernelService failed\n");
- }
- NaClSrpcDtor(&srpc_channel);
- if (-1 == kernel_service_conn_cap_desc) {
- NaClLog(LOG_FATAL, "Name service lookup for KernelService failed, %d\n",
- status);
- }
- if (-1 == (kernel_service_desc = imc_connect(kernel_service_conn_cap_desc))) {
- (void) close(kernel_service_conn_cap_desc);
- NaClLog(LOG_FATAL, "Connect to KernelService failed\n");
- }
- (void) close(kernel_service_conn_cap_desc);
- if (!NaClSrpcClientCtor(&srpc_channel, kernel_service_desc)) {
- (void) close(kernel_service_desc);
- NaClLog(LOG_FATAL, "SRPC channel ctor to KernelService failed\n");
- }
- if (NACL_SRPC_RESULT_OK != NaClSrpcInvokeBySignature(
- &srpc_channel,
- NACL_KERNEL_SERVICE_INITIALIZATION_COMPLETE)) {
- NaClLog(LOG_FATAL, "KernelService init_done RPC failed!\n");
- }
- NaClSrpcDtor(&srpc_channel);
-}
« no previous file with comments | « src/shared/srpc/nacl_srpc_ppapi_plugin_internal.h ('k') | src/shared/srpc/srpc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698