modified nacl_sync.h to have NACL_WUR for all functions that return a

src/trusted/service_runtime/osx/nacl_ldt.c

 /*
- * Copyright 2008 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.
+ * 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.
  */
 
 /*
  * Derived from Linux and Windows versions.
  * TODO(jrg): locking is nooped.  PrintSelector() #if 0'd.
  */
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
+#include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/trusted/service_runtime/arch/x86/nacl_ldt_x86.h"
 /* for LDT_ENTRIES */
 #include "native_client/src/trusted/service_runtime/arch/x86/sel_ldr_x86.h"
 
 /* OSX specific */
 #include <architecture/i386/desc.h>  /* ldt_desc, etc */
 #include <architecture/i386/table.h> /* ldt_entry_t */
 #include <architecture/i386/sel.h>   /* sel_t */
 #include <i386/user_ldt.h>           /* i386_set_ldt() */
 
@@ skipping 61 matching lines @@
                                  int size_is_in_pages,
                                  NaClLdtDescriptorType type,
                                  int read_exec_only,
                                  void* base_addr,
                                  uint32_t size_minus_one) {
   ldt_entry_t ldt;
   int sel_index = -1;
 
   memset(&ldt, 0, sizeof(ldt));
 
-  NaClMutexLock(&nacl_ldt_mutex);
+  NaClXMutexLock(&nacl_ldt_mutex);
 
   switch (type) {
     case NACL_LDT_DESCRIPTOR_DATA:
       ldt.data.type = (read_exec_only ? DESC_DATA_RONLY : DESC_DATA_WRITE);
       break;
     case NACL_LDT_DESCRIPTOR_CODE:
       ldt.code.type = (read_exec_only ? DESC_CODE_EXEC : DESC_CODE_READ);
       break;
     default:
       goto alloc_error;
@@ skipping 39 matching lines @@
     }
   } else {
     /* The caller specified an entry number - try only this one. */
     sel_index = i386_set_ldt(entry_number, &ldt, 1);
   }
 
   if (-1 == sel_index) {
     goto alloc_error;
   }
 
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
 
   return BuildSelector(sel_index);
 
   /*
    * All error returns go through this epilog.
    */
  alloc_error:
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
   return 0;
 }
 
 /*
  * Allocates a selector whose size is specified in pages.
  * Page granular protection requires that the start address be page-aligned.
  */
 uint16_t NaClLdtAllocatePageSelector(NaClLdtDescriptorType type,
                                      int read_exec_only,
                                      void* base_addr,
@@ skipping 93 matching lines @@
 #else
   UNREFERENCED_PARAMETER(selector);
 #endif
 }
 
 /*
  * Mark a selector as available for future reuse.
  */
 void NaClLdtDeleteSelector(uint16_t selector) {
 
-  NaClMutexLock(&nacl_ldt_mutex);
+  NaClXMutexLock(&nacl_ldt_mutex);
   if (-1 == i386_set_ldt(selector >> 3, NULL, 1)) {
     perror("NaClLdtDeleteSelector: i386_set_ldt()");
   }
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
 }