Always define CLOCK_BOOTTIME, CLOCK_BOOTTIME_ALARM and CLOCK_REALTIME…

…_ALARM * Giving a non-existing clock to clock_gettime() raises Errno::EINVAL, which seems fairly harmless. * Fixes oracle#1480
Strech · May 23, 2022 · 1349708 · 1349708
1 parent 995a7bd
commit 1349708
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ Compatibility:
 * `Process.euid=` should accept String (#2615, @ngtban).
 * Fix `instance_variable_get` and `instance_variable_set` for immutable objects (@bjfish).
 * `Thread#raise(exc, message)` now calls `exc.exception` in the target thread like CRuby (@eregon).
+* Define `Process::{CLOCK_BOOTTIME,CLOCK_BOOTTIME_ALARM,CLOCK_REALTIME_ALARM}` (#1480, @eregon).
 
 Performance:
 

diff --git a/spec/tags/core/process/clock_gettime_tags.txt b/spec/tags/core/process/clock_gettime_tags.txt
diff --git a/src/main/java/org/truffleruby/platform/LinuxAMD64NativeConfiguration.java b/src/main/java/org/truffleruby/platform/LinuxAMD64NativeConfiguration.java
@@ -744,6 +744,9 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.clocks.CLOCK_REALTIME", 0);
         configuration.config("platform.clocks.CLOCK_REALTIME_COARSE", 5);
         configuration.config("platform.clocks.CLOCK_THREAD_CPUTIME_ID", 3);
+        configuration.config("platform.clocks.CLOCK_BOOTTIME", 7);
+        configuration.config("platform.clocks.CLOCK_REALTIME_ALARM", 8);
+        configuration.config("platform.clocks.CLOCK_BOOTTIME_ALARM", 9);
         configuration.config("platform.typedef.int8_t", string(context, "char"));
         configuration.config("platform.typedef.int16_t", string(context, "short"));
         configuration.config("platform.typedef.int32_t", string(context, "int"));

diff --git a/src/main/java/org/truffleruby/platform/LinuxARM64NativeConfiguration.java b/src/main/java/org/truffleruby/platform/LinuxARM64NativeConfiguration.java
@@ -760,16 +760,16 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.dlopen.RTLD_GLOBAL", 256);
         configuration.config("platform.dlopen.RTLD_NEXT", -1);
         configuration.config("platform.dlopen.RTLD_DEFAULT", 0);
-        configuration.config("platform.clocks.CLOCK_BOOTTIME", 7);
-        configuration.config("platform.clocks.CLOCK_BOOTTIME_ALARM", 9);
         configuration.config("platform.clocks.CLOCK_MONOTONIC", 1);
         configuration.config("platform.clocks.CLOCK_MONOTONIC_COARSE", 6);
         configuration.config("platform.clocks.CLOCK_MONOTONIC_RAW", 4);
         configuration.config("platform.clocks.CLOCK_PROCESS_CPUTIME_ID", 2);
         configuration.config("platform.clocks.CLOCK_REALTIME", 0);
-        configuration.config("platform.clocks.CLOCK_REALTIME_ALARM", 8);
         configuration.config("platform.clocks.CLOCK_REALTIME_COARSE", 5);
         configuration.config("platform.clocks.CLOCK_THREAD_CPUTIME_ID", 3);
+        configuration.config("platform.clocks.CLOCK_BOOTTIME", 7);
+        configuration.config("platform.clocks.CLOCK_REALTIME_ALARM", 8);
+        configuration.config("platform.clocks.CLOCK_BOOTTIME_ALARM", 9);
         configuration.config("platform.typedef.int8_t", string(context, "char"));
         configuration.config("platform.typedef.int16_t", string(context, "short"));
         configuration.config("platform.typedef.int32_t", string(context, "int"));

diff --git a/tool/generate-native-config.rb b/tool/generate-native-config.rb
@@ -266,9 +266,13 @@ def initialize(group)
     @constants = {}
   end
 
+  def const(name, default_value = nil, format = '%ld', cast = '(long)')
+    @constants[name] = Constant.new(name, format, cast, default_value)
+  end
+
   def consts(names, format = '%ld', cast = '(long)')
     names.each do |name|
-      @constants[name] = Constant.new(name, format, cast, nil)
+      const(name, nil, format, cast)
     end
   end
 
@@ -774,8 +778,6 @@ def constants(name)
 constants 'clocks' do |cg|
   cg.include 'time.h'
   cg.consts %w[
-    CLOCK_BOOTTIME
-    CLOCK_BOOTTIME_ALARM
     CLOCK_MONOTONIC
     CLOCK_MONOTONIC_COARSE
     CLOCK_MONOTONIC_FAST
@@ -785,7 +787,6 @@ def constants(name)
     CLOCK_PROCESS_CPUTIME_ID
     CLOCK_PROF
     CLOCK_REALTIME
-    CLOCK_REALTIME_ALARM
     CLOCK_REALTIME_COARSE
     CLOCK_REALTIME_FAST
     CLOCK_REALTIME_PRECISE
@@ -797,7 +798,15 @@ def constants(name)
     CLOCK_UPTIME_RAW
     CLOCK_UPTIME_RAW_APPROX
     CLOCK_VIRTUAL
-]
+  ]
+
+  # Give the following clock ids a default so they works on newer Linux built by older Linux:
+  # https://github.com/oracle/truffleruby/issues/1480
+  cg.const 'CLOCK_BOOTTIME', (7 if RUBY_PLATFORM =~ /linux/)
+  # These 2 are not supported on linux-aarch64:
+  # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20171031183306.81375-1-salyzyn@android.com/#21274245
+  cg.const 'CLOCK_REALTIME_ALARM', (8 if RUBY_PLATFORM =~ /x86_64-linux/)
+  cg.const 'CLOCK_BOOTTIME_ALARM', (9 if RUBY_PLATFORM =~ /x86_64-linux/)
 end
 
 TypesGenerator.new.generate