Merge branch 'rickard/erl-monotonic-time-fix/OTP-19147' into maint-26

* rickard/erl-monotonic-time-fix/OTP-19147: [erts] Fix monotonicity of Erlang monotonic time
erlang · Jul 9, 2024 · 58b71a3 · 58b71a3
2 parents 858efd5 + fee8f70
commit 58b71a3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
@@ -352,7 +352,8 @@ calc_corrected_erl_mtime(ErtsMonotonicTime os_mtime,
 	diff += (cip->correction.drift*diff)/ERTS_MONOTONIC_TIME_UNIT;
     erl_mtime = cip->erl_mtime;
     erl_mtime += diff;
-    erl_mtime += cip->correction.error*(diff/ERTS_TCORR_ERR_UNIT);
+    erl_mtime += (cip->correction.error*diff)/ERTS_TCORR_ERR_UNIT;
+
     if (os_mdiff_p)
 	*os_mdiff_p = diff;
     return erl_mtime;