Removes the name service from the service runtime

src/trusted/service_runtime/sel_ldr_standard.c

 /*
  * Copyright (c) 2012 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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 
@@ skipping 466 matching lines @@
   return addr < nap->static_text_end;
 }
 
 int NaClAppLaunchServiceThreads(struct NaClApp *nap) {
   struct NaClKernelService  *kernel_service = NULL;
   int                       rv = 0;
 
   NaClLog(4, "NaClAppLaunchServiceThreads: Entered, nap 0x%"NACL_PRIxPTR"\n",
           (uintptr_t) nap);
 
-  NaClNameServiceLaunch(nap->name_service);
-
   if (LOAD_OK != NaClWaitForStartModuleCommand(nap)) {
     return rv;
   }
 
   NaClXMutexLock(&nap->mu);
   if (NULL == nap->runtime_host_interface) {
     nap->runtime_host_interface = malloc(sizeof *nap->runtime_host_interface);
     if (NULL == nap->runtime_host_interface ||
         !NaClRuntimeHostInterfaceCtor_protected(nap->runtime_host_interface)) {
       NaClLog(LOG_ERROR, "NaClAppLaunchServiceThreads:"
@@ skipping 36 matching lines @@
 
   NaClXMutexLock(&nap->mu);
   CHECK(NULL == nap->kernel_service);
 
   nap->kernel_service = kernel_service;
   kernel_service = NULL;
   NaClXMutexUnlock(&nap->mu);
   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 follow-on change...

[Petr Hosek, 2015/02/01 01:16:05]

Yes, I was planning to do that in a separate change.

-    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.
    *
    * Error cleanup invariant.  No service thread should be running
    * (modulo asynchronous shutdown).  Automatic variables refer to
    * fully constructed objects if non-NULL, and when ownership is
    * transferred to the NaClApp object the corresponding automatic
    * variable is set to NULL.
    */
   NaClRefCountSafeUnref((struct NaClRefCount *) kernel_service);
@@ skipping 298 matching lines @@
                           NaClSysToUserStackAddr(nap, sys_stack_ptr),
                           user_tls1,
                           user_tls2)) {
     NaClLog(LOG_WARNING,
             ("NaClCreateAdditionalThread: could not allocate thread."
              "  Returning EAGAIN per POSIX specs.\n"));
     return -NACL_ABI_EAGAIN;
   }
   return 0;
 }