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

Unified Diff: src/trusted/service_runtime/sel_ldr_standard.c

Issue 891603002: Removes the name service from the service runtime (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
Index: src/trusted/service_runtime/sel_ldr_standard.c
diff --git a/src/trusted/service_runtime/sel_ldr_standard.c b/src/trusted/service_runtime/sel_ldr_standard.c
index 42253ced73f92e0db2cbec2f68bca916ea836455..9daceb42712061cc28376bc7b892b54d09c5968d 100644
--- a/src/trusted/service_runtime/sel_ldr_standard.c
+++ b/src/trusted/service_runtime/sel_ldr_standard.c
@@ -484,8 +484,6 @@ int NaClAppLaunchServiceThreads(struct NaClApp *nap) {
NaClLog(4, "NaClAppLaunchServiceThreads: Entered, nap 0x%"NACL_PRIxPTR"\n",
(uintptr_t) nap);
- NaClNameServiceLaunch(nap->name_service);
-
if (LOAD_OK != NaClWaitForStartModuleCommand(nap)) {
return rv;
}
@@ -542,18 +540,6 @@ int NaClAppLaunchServiceThreads(struct NaClApp *nap) {
rv = 1;
done:
- NaClXMutexLock(&nap->mu);
- if (NULL != nap->kernel_service) {
Mark Seaborn 2015/02/01 00:40:53 You or I can remove nap->kernel_service in a follo
Petr Hosek 2015/02/01 01:16:05 Yes, I was planning to do that in a separate chang
- NaClLog(3,
- ("NaClAppLaunchServiceThreads: adding kernel service to"
- " name service\n"));
- (*NACL_VTBL(NaClNameService, nap->name_service)->
- CreateDescEntry)(nap->name_service,
- "KernelService", NACL_ABI_O_RDWR,
- NaClDescRef(nap->kernel_service->base.bound_and_cap[1]));
- }
- NaClXMutexUnlock(&nap->mu);
-
/*
* Single exit path.
*

Powered by Google App Engine
This is Rietveld 408576698