Disable the mutex protecting multiple-lines of log output from being separated.

src/shared/srpc/utility.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.
  */
 
 /*
  * SRPC utility functions.
  */
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/include/portability_process.h"
 
-#include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/shared/srpc/nacl_srpc_internal.h"
 
-static struct NaClMutex log_mu;
+/* TODO(sehr): Re-enable logging mutex when this does not require C++. */
+/* static struct NaClMutex log_mu; */
 
 #define VERBOSITY_NOT_SET ((int) (((unsigned) -1) >> 1))
 
 static int verbosity = VERBOSITY_NOT_SET;
 
 int NaClSrpcLogInit() {
-  NaClXMutexCtor(&log_mu);
+  /* NaClXMutexCtor(&log_mu); */
   return 1;
 }
 
 void NaClSrpcLogFini() {
-  NaClMutexDtor(&log_mu);
+  /* NaClMutexDtor(&log_mu); */
 }
 
 static int getVerbosity() {
   if (VERBOSITY_NOT_SET == verbosity) {
     const char* env_verbosity = getenv("NACL_SRPC_DEBUG");
     verbosity = 0;
     if (NULL != env_verbosity) {
       int v = strtol(env_verbosity, (char**) 0, 0);
       if (v >= 0) {
         verbosity = v;
       }
     }
   }
   return verbosity;
 }
 
 void NaClSrpcLog(int detail_level, const char* fmt, ...) {
   if (detail_level <= getVerbosity()) {
     int pid = GETPID();
     va_list ap;
 #ifdef __native_client__
     const char* host_or_nacl = "NACL";
 #else
     const char* host_or_nacl = "HOST";
 #endif
     va_start(ap, fmt);
-    NaClXMutexLock(&log_mu);
+    /* NaClXMutexLock(&log_mu); */
     fprintf(stderr, "[SRPC: %08x: %s] ", pid, host_or_nacl);
     vfprintf(stderr, fmt, ap);
-    NaClXMutexUnlock(&log_mu);
+    /* NaClXMutexUnlock(&log_mu); */
     va_end(ap);
   }
 }
 
 static void formatChar(char cval, char** buf, size_t* bytes_remaining) {
   if (cval < ' ' || cval >= 0x7f) {
     static const size_t kBytesRequiredForHex = 4;
     if (*bytes_remaining >= kBytesRequiredForHex) {
       SNPRINTF(*buf, kBytesRequiredForHex, "\\x%02x", cval);
     }
@@ skipping 158 matching lines @@
      return "Output argument type mismatch";
    case NACL_SRPC_RESULT_INTERNAL:
      return "Internal error in rpc method";
    case NACL_SRPC_RESULT_APP_ERROR:
      return "Rpc application returned an error";
    default:
      break;
   }
   return "Unrecognized NaClSrpcError value";
 }