Removes the name service from the service runtime

src/trusted/service_runtime/sel_ldr.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.
  */
 
 #include <string.h>
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
@@ skipping 33 matching lines @@
 #include "native_client/src/trusted/service_runtime/include/sys/time.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_desc_effector_ldr.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_resource.h"
 #include "native_client/src/trusted/service_runtime/nacl_reverse_quota_interface.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_handlers.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
-#include "native_client/src/trusted/service_runtime/name_service/name_service.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_memory.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr_thread_interface.h"
 #include "native_client/src/trusted/simple_service/nacl_simple_rservice.h"
 #include "native_client/src/trusted/simple_service/nacl_simple_service.h"
 #include "native_client/src/trusted/threading/nacl_thread_interface.h"
 #include "native_client/src/trusted/validator/rich_file_info.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
 
@@ skipping 136 matching lines @@
 #endif
 
   nap->syscall_table = table;
 
   nap->runtime_host_interface = NULL;
   nap->desc_quota_interface = NULL;
 
   nap->module_initialization_state = NACL_MODULE_UNINITIALIZED;
   nap->module_load_status = LOAD_OK;
 
-  nap->name_service = (struct NaClNameService *) malloc(
-      sizeof *nap->name_service);
-  if (NULL == nap->name_service) {
-    goto cleanup_cv;
-  }
-  if (!NaClNameServiceCtor(nap->name_service,
-                           NaClAddrSpSquattingThreadIfFactoryFunction,
-                           (void *) nap)) {
-    free(nap->name_service);
-    goto cleanup_cv;
-  }
-  nap->name_service_conn_cap = NaClDescRef(nap->name_service->
-                                           base.base.bound_and_cap[1]);
-
   nap->ignore_validator_result = 0;
   nap->skip_validator = 0;
   nap->validator_stub_out_mode = 0;
 
   if (IsEnvironmentVariableSet("NACL_DANGEROUS_ENABLE_FILE_ACCESS")) {
     NaClInsecurelyBypassAllAclChecks();
     NaClLog(LOG_INFO, "DANGER: ENABLED FILE ACCESS\n");
   }
 
   nap->enable_list_mappings = 0;
   if (IsEnvironmentVariableSet("NACL_DANGEROUS_ENABLE_LIST_MAPPINGS")) {
     /*
      * This syscall is not actually know to be dangerous, but is not yet
      * exposed by our public API.
      */
     NaClLog(LOG_INFO, "DANGER: ENABLED LIST_MAPPINGS\n");
     nap->enable_list_mappings = 1;
   }
   nap->pnacl_mode = 0;
 
   if (!NaClMutexCtor(&nap->threads_mu)) {
-    goto cleanup_name_service;
+    goto cleanup_cv;
   }
   nap->num_threads = 0;
   if (!NaClFastMutexCtor(&nap->desc_mu)) {
     goto cleanup_threads_mu;
   }
 
   nap->running = 0;
   nap->exit_status = -1;
 
 #if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 32
@@ skipping 45 matching lines @@
   nap->futex_wait_list_head.prev = &nap->futex_wait_list_head;
 
   return 1;
 
  cleanup_exception_mu:
   NaClMutexDtor(&nap->exception_mu);
  cleanup_desc_mu:
   NaClFastMutexDtor(&nap->desc_mu);
  cleanup_threads_mu:
   NaClMutexDtor(&nap->threads_mu);
- cleanup_name_service:
-  NaClDescUnref(nap->name_service_conn_cap);
-  NaClRefCountUnref((struct NaClRefCount *) nap->name_service);
  cleanup_cv:
   NaClCondVarDtor(&nap->cv);
  cleanup_mu:
   NaClMutexDtor(&nap->mu);
  cleanup_dynamic_load_mutex:
   NaClMutexDtor(&nap->dynamic_load_mutex);
  cleanup_effp_free:
   free(nap->effp);
  cleanup_mem_io_regions:
   NaClIntervalMultisetDelete(nap->mem_io_regions);
@@ skipping 972 matching lines @@
   nacl_global_xlate_base = mem_start;
 
   NaClSandboxMemoryStartForValgrind(mem_start);
 
   _ovly_debug_event();
 }
 
 void NaClGdbHook(struct NaClApp const *nap) {
   StopForDebuggerInit(nap->mem_start);
 }