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

Unified Diff: src/trusted/service_runtime/nacl_sync_cond_test.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_globals.c ('k') | src/trusted/service_runtime/nacl_sync_queue.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/nacl_sync_cond_test.c
===================================================================
--- src/trusted/service_runtime/nacl_sync_cond_test.c (revision 5177)
+++ src/trusted/service_runtime/nacl_sync_cond_test.c (working copy)
@@ -90,7 +90,7 @@
void AlarmerStateCtor(struct AlarmerState *sp,
uint64_t sleep_usec,
uint64_t cond_timeout_usec) {
- NaClMutexCtor(&sp->mu);
+ NaClXMutexCtor(&sp->mu);
sp->abort_on_wake = 1;
sp->sleep_usec = sleep_usec;
sp->cond_timeout_usec = cond_timeout_usec;
@@ -101,9 +101,9 @@
}
void AlarmerDisable(struct AlarmerState *sp) {
- NaClMutexLock(&sp->mu);
+ NaClXMutexLock(&sp->mu);
sp->abort_on_wake = 0;
- NaClMutexUnlock(&sp->mu);
+ NaClXMutexUnlock(&sp->mu);
}
static void PrintFailureSuggestions() {
@@ -140,10 +140,10 @@
if (gVerbosity) {
printf("Alarmer %p: woke up\n", (void *) sp);
}
- NaClMutexLock(&sp->mu);
+ NaClXMutexLock(&sp->mu);
should_abort = sp->abort_on_wake;
cond_timeout_usec = sp->cond_timeout_usec;
- NaClMutexUnlock(&sp->mu);
+ NaClXMutexUnlock(&sp->mu);
if (should_abort) {
printf("Alarmer %p: woke up after %"NACL_PRId64".%06"NACL_PRId64" seconds"
" without condition\n",
@@ -255,8 +255,8 @@
struct NaClCondVar gCv;
void TestInit() {
- (void) NaClMutexCtor(&gMu);
- (void) NaClCondVarCtor(&gCv);
+ NaClXMutexCtor(&gMu);
+ NaClXCondVarCtor(&gCv);
}
void TestFini() {
@@ -282,7 +282,7 @@
if (gVerbosity > 1) {
printf("TestRelWait: waiting\n");
}
- NaClCondVarTimedWaitRelative(&gCv, &gMu, &t);
+ NaClXCondVarTimedWaitRelative(&gCv, &gMu, &t);
if (gVerbosity > 1) {
printf("TestRelWait: unlocking\n");
}
@@ -310,7 +310,7 @@
if (gVerbosity > 1) {
printf("TestAbsWait: waiting\n");
}
- NaClCondVarTimedWaitAbsolute(&gCv, &gMu, &t);
+ NaClXCondVarTimedWaitAbsolute(&gCv, &gMu, &t);
if (gVerbosity > 1) {
printf("TestAbsWait: unlocking\n");
}
« no previous file with comments | « src/trusted/service_runtime/nacl_globals.c ('k') | src/trusted/service_runtime/nacl_sync_queue.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698