Non-SFI NaCl: Allow CLOCK_SYSTEM_TRACE on Chrome OS

base/time/time.h

Index: base/time/time.h
diff --git a/base/time/time.h b/base/time/time.h
index f08ba68495cd773a77d92fb19ad15807950e4f99..12a5f16e42be5e76a4b11c020637b1b6ee989379 100644
--- a/base/time/time.h
+++ b/base/time/time.h
@@ -576,6 +576,14 @@ inline Time TimeDelta::operator+(Time t) const {
 
 class BASE_EXPORT TimeTicks {
  public:
+  // We define this even on Linux for seccomp sandbox testing.
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)

[Mark Seaborn, 2014/05/30 16:38:20]

Shouldn't this be "#if defined(OS_LINUX)", since OS_CHROMEOS implies OS_LINUX?

[hamaji, 2014/06/02 08:15:04]

I tried OS_LINUX-only first and I was surprised the build failed. It seems
build_nexe.py sets only OS_CHROMEOS, without any other OS_*. If we remove
OS_CHROMEOS from here, we need !defined(__native_client__) in time_posix.cc.

I'll upload the version which does not specify OS_CHROMEOS here, but I'm not
sure if this is the right approach. I'm not sure if build_nexe.py should specify
OS_CHROMEOS.

[Mark Seaborn, 2014/06/03 17:23:28]

What part of the code is setting OS_CHROMEOS?  build_nexe.py itself doesn't do
that -- nothing in the NaCl repo mentions OS_CHROMEOS.

OS_CHROMEOS shouldn't even be defined when compiling untrusted code, which
should only get OS_NACL.

I suppose it's this part in build/common.gypi?
      ['chromeos==1', {
        'defines': ['OS_CHROMEOS=1'],
      }],

+  // Force definition of the system trace clock; it is a chromeos-only api
+  // at the moment and surfacing it in the right place requires mucking
+  // with glibc et al.
+  static const clockid_t kClockSystemTrace = 11;
+#endif
+
   TimeTicks() : ticks_(0) {
   }