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

src/shared/platform/nacl_log.c

 /*
  * 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.
  */
 
 /*
  * NaCl Server Runtime logging code.
  */
 #include "native_client/src/include/portability.h"
@@ skipping 13 matching lines @@
  * If set, check detail_level without grabbing a mutex.  This makes
  * logging much cheaper, but implies that the verbosity level should
  * only be changed prior to going multithreaded.
  */
 
 #include "native_client/src/shared/gio/gio.h"
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_log_intern.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
+#include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/platform/nacl_timestamp.h"
 
 /*
  * All logging is protected by this mutex.
  */
 static struct NaClMutex log_mu;
 static int              tag_output = 0;
 static int              abort_on_unlock = 0;
 
@@ skipping 120 matching lines @@
     log_iob = NaClLogDupFileIo(stderr);
   } else {
     log_iob = NaClLogFileIoBufferFromFile(log_file);
   }
   return NaClLogGioFromFileIoBuffer(log_iob);
 }
 
 void NaClLogModuleInitExtended(int        initial_verbosity,
                                struct Gio *log_gio) {
 
-  NaClMutexCtor(&log_mu);
+  NaClXMutexCtor(&log_mu);
   NaClLogSetVerbosity(initial_verbosity);
   NaClLogSetGio(log_gio);
 }
 
 void NaClLogModuleInit(void) {
   NaClLogModuleInitExtended(NaClLogDefaultLogVerbosity(),
                             NaClLogDefaultLogGio());
 }
 
 void NaClLogModuleFini(void) {
   NaClMutexDtor(&log_mu);
 }
 
 void NaClLogTagNext_mu(void) {
   tag_output = 1;
 }
 
 void NaClLogLock(void) {
-  NaClMutexLock(&log_mu);
+  NaClXMutexLock(&log_mu);
   NaClLogTagNext_mu();
 }
 
 void NaClLogUnlock(void) {
   if (abort_on_unlock) {
     /*
      * include an easy-to-recognize output for the fuzzer to recognize
      */
     NaClLog_mu(LOG_ERROR, "LOG_FATAL abort exit\n");
 #ifdef __COVERITY__
     NaClAbort();  /* help coverity figure out that this is the default */
 #else
     (*gNaClLogAbortBehavior)();
 #endif
   }
-  NaClMutexUnlock(&log_mu);
+  NaClXMutexUnlock(&log_mu);
 }
 
 static INLINE struct Gio *NaClLogGetGio_mu() {
   if (NULL == log_stream) {
     (void) GioFileRefCtor(&log_file_stream, NaClLogDupFileIo(stderr));
     log_stream = (struct Gio *) &log_file_stream;
   }
   return log_stream;
 }
 
@@ skipping 173 matching lines @@
 #if NON_THREAD_SAFE_DETAIL_CHECK
   if (detail_level > verbosity) {
     return;
   }
 #endif
 
   va_start(ap, fmt);
   NaClLogV_mu(detail_level, fmt, ap);
   va_end(ap);
 }