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

Unified Diff: src/trusted/service_runtime/osx/nacl_ldt.c

Issue 6937003: modified nacl_sync.h to have NACL_WUR for all functions that return a (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 8 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/trusted/service_runtime/nacl_text.c ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/osx/nacl_ldt.c
===================================================================
--- src/trusted/service_runtime/osx/nacl_ldt.c (revision 5177)
+++ src/trusted/service_runtime/osx/nacl_ldt.c (working copy)
@@ -1,7 +1,7 @@
/*
- * 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.
*/
/*
@@ -14,6 +14,7 @@
#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"
@@ -95,7 +96,7 @@
memset(&ldt, 0, sizeof(ldt));
- NaClMutexLock(&nacl_ldt_mutex);
+ NaClXMutexLock(&nacl_ldt_mutex);
switch (type) {
case NACL_LDT_DESCRIPTOR_DATA:
@@ -155,7 +156,7 @@
goto alloc_error;
}
- NaClMutexUnlock(&nacl_ldt_mutex);
+ NaClXMutexUnlock(&nacl_ldt_mutex);
return BuildSelector(sel_index);
@@ -163,7 +164,7 @@
* All error returns go through this epilog.
*/
alloc_error:
- NaClMutexUnlock(&nacl_ldt_mutex);
+ NaClXMutexUnlock(&nacl_ldt_mutex);
return 0;
}
@@ -277,9 +278,9 @@
*/
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);
}
« no previous file with comments | « src/trusted/service_runtime/nacl_text.c ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698