Deduplicates NaClSysSysconf implementation

src/trusted/service_runtime/nacl_syscall_common.c

 /*
  * Copyright (c) 2012 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 service run-time, non-platform specific system call helper routines.
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>
+#if NACL_WINDOWS
+#include <windows.h>
+#endif
 
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 
 #include "native_client/src/include/nacl_assert.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_platform.h"
 #include "native_client/src/include/portability_process.h"
 #include "native_client/src/include/portability_string.h"
 
 #include "native_client/src/shared/platform/nacl_check.h"
@@ skipping 16 matching lines @@
 #include "native_client/src/trusted/desc/nacl_desc_semaphore.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 
 #include "native_client/src/trusted/fault_injection/fault_injection.h"
 
 #include "native_client/src/trusted/service_runtime/include/bits/mman.h"
 #include "native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h"
 #include "native_client/src/trusted/service_runtime/include/sys/errno.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
+#include "native_client/src/trusted/service_runtime/include/sys/unistd.h"
 
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_test_crash.h"
 #include "native_client/src/trusted/service_runtime/internal_errno.h"
 
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_copy.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_handlers.h"
 #include "native_client/src/trusted/service_runtime/nacl_text.h"
@@ skipping 3352 matching lines @@
   return retval;
 }
 
 int32_t NaClSysSchedYield(struct NaClAppThread *natp) {
   UNREFERENCED_PARAMETER(natp);
 
   NaClThreadYield();
   return 0;
 }
 
+int32_t NaClSysSysconf(struct NaClAppThread *natp,
+                       int32_t              name,
+                       int32_t              *result) {
+  struct NaClApp  *nap = natp->nap;
+  int32_t         retval = -NACL_ABI_EINVAL;
+  int32_t         result_value;
+
+  NaClLog(3,
+          ("Entered NaClSysSysconf(%08"NACL_PRIxPTR
+           "x, %d, 0x%08"NACL_PRIxPTR")\n"),
+          (uintptr_t) natp, name, (uintptr_t) result);
+
+  switch (name) {
+    case NACL_ABI__SC_NPROCESSORS_ONLN: {
+#if NACL_WINDOWS
+      if (0 == nap->sc_nprocessors_onln) {

[Mark Seaborn, 2013/09/09 21:39:38]

Double-checking a field like this will still be reported as a data race by
race-checking tools.

Why do you want to cache the result of GetSystemInfo()?  Do you believe it is
slow?

You're still doing >1 thing in one change.  I'd prefer if you left out this
caching change.

[Petr Hosek, 2013/09/09 21:46:54]

Because the original implementation does the some, just uses an extra static
variable instead of the existing field; I have reverted this change if you
prefer the original way.

+        NaClXMutexLock(&nap->mu);
+        if (0 == nap->sc_nprocessors_onln) {
+          SYSTEM_INFO si;
+          GetSystemInfo(&si);
+          nap->sc_nprocessors_onln = (int32_t) si.dwNumberOfProcessors;
+        }
+        NaClXMutexUnlock(&nap->mu);
+      }
+#elif NACL_LINUX || NACL_OSX
+      if (-1 == nap->sc_nprocessors_onln) {
+        /* Unable to get the number of processors at startup. */
+        goto cleanup;
+      }
+#else
+#error Unsupported platform
+#endif
+      result_value = nap->sc_nprocessors_onln;
+      break;
+    }
+    case NACL_ABI__SC_SENDMSG_MAX_SIZE: {
+      /* TODO(sehr,bsy): this value needs to be determined at run time. */
+      const int32_t kImcSendMsgMaxSize = 1 << 16;
+      result_value = kImcSendMsgMaxSize;
+      break;
+    }
+    case NACL_ABI__SC_PAGESIZE: {
+      result_value = 1 << 16;  /* always 64k pages */
+      break;
+    }
+    default: {
+      retval = -NACL_ABI_EINVAL;
+      goto cleanup;
+    }
+  }
+  if (!NaClCopyOutToUser(nap, (uintptr_t) result, &result_value,
+                         sizeof result_value)) {
+    retval = -NACL_ABI_EFAULT;
+    goto cleanup;
+  }
+  retval = 0;
+cleanup:
+  return retval;
+}
+
 int32_t NaClSysExceptionHandler(struct NaClAppThread *natp,
                                 uint32_t             handler_addr,
                                 uint32_t             old_handler) {
   struct NaClApp *nap = natp->nap;
   int32_t rv = -NACL_ABI_EINVAL;
 
   if (!nap->enable_exception_handling) {
     rv = -NACL_ABI_ENOSYS;
     goto no_lock_exit;
   }
@@ skipping 280 matching lines @@
   return NaClSysClockGetCommon(natp, clk_id, (uintptr_t) tsp,
                                      NaClClockGetRes);
 }
 
 int32_t NaClSysClockGetTime(struct NaClAppThread  *natp,
                             int                   clk_id,
                             uint32_t              tsp) {
   return NaClSysClockGetCommon(natp, clk_id, (uintptr_t) tsp,
                                      NaClClockGetTime);
 }