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

Unified Diff: src/trusted/service_runtime/linux/x86/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/fs/obj_proxy.c ('k') | src/trusted/service_runtime/nacl_globals.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/linux/x86/nacl_ldt.c
===================================================================
--- src/trusted/service_runtime/linux/x86/nacl_ldt.c (revision 5177)
+++ src/trusted/service_runtime/linux/x86/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.
*/
/*
@@ -12,6 +12,7 @@
#include <stdio.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"
@@ -94,7 +95,7 @@
struct user_desc ud;
int retval;
- NaClMutexLock(&nacl_ldt_mutex);
+ NaClXMutexLock(&nacl_ldt_mutex);
if (-1 == entry_number) {
/* -1 means caller did not specify -- allocate */
@@ -153,14 +154,14 @@
/*
* Return an LDT selector with a requested privilege level of 3.
*/
- NaClMutexUnlock(&nacl_ldt_mutex);
+ NaClXMutexUnlock(&nacl_ldt_mutex);
return (ud.entry_number << 3) | 0x7;
/*
* All error returns go through this epilog.
*/
alloc_error:
- NaClMutexUnlock(&nacl_ldt_mutex);
+ NaClXMutexUnlock(&nacl_ldt_mutex);
return 0;
}
@@ -278,7 +279,7 @@
ud.seg_32bit = 0;
ud.useable = 0;
ud.contents = MODIFY_LDT_CONTENTS_DATA;
- NaClMutexLock(&nacl_ldt_mutex);
+ NaClXMutexLock(&nacl_ldt_mutex);
modify_ldt(1, &ud, sizeof ud);
- NaClMutexUnlock(&nacl_ldt_mutex);
+ NaClXMutexUnlock(&nacl_ldt_mutex);
}
« no previous file with comments | « src/trusted/service_runtime/fs/obj_proxy.c ('k') | src/trusted/service_runtime/nacl_globals.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698