From 49090d4740462627958feb00ca9280455b933fb5 Mon Sep 17 00:00:00 2001 From: zmstone Date: Mon, 19 Aug 2024 16:29:13 +0200 Subject: [PATCH 1/2] chore: hint +c false in vm.args when monotonic time stepped back --- erts/emulator/beam/erl_time_sup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index 43282ff83c4e..7ef3717978ea 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -266,7 +266,7 @@ update_last_mtime(ErtsSchedulerData *esdp, ErtsMonotonicTime mtime) if (esdp->last_monotonic_time > mtime) { ERTS_ASSERT(esdp == erts_get_scheduler_data()); erts_exit(ERTS_ABORT_EXIT, - "Erlang monotonic time stepped backwards!\n" + "Erlang monotonic time stepped backwards! Maybe add '+c false' in vm.args\n" "Previous time: %b64d\n" "Current time: %b64d\n", esdp->last_monotonic_time, @@ -287,7 +287,7 @@ check_os_monotonic_time(ErtsSchedulerData *esdp, ErtsMonotonicTime mtime) if (esdp->last_os_monotonic_time > mtime) { ERTS_ASSERT(esdp == erts_get_scheduler_data()); erts_exit(ERTS_ABORT_EXIT, - "OS monotonic time stepped backwards!\n" + "OS monotonic time stepped backwards! Maybe add '+c false' in vm.args\n" "Previous time: %b64d\n" "Current time: %b64d\n", esdp->last_os_monotonic_time, @@ -373,7 +373,7 @@ read_corrected_time(int os_drift_corrected, ErtsSchedulerData *esdp) else { if (os_mtime < time_sup.inf.c.parmon.cdata.insts.prev.os_mtime) erts_exit(ERTS_ABORT_EXIT, - "OS monotonic time stepped backwards\n"); + "OS monotonic time stepped backwards, maybe add '+c false' in vm.args\n"); ci = time_sup.inf.c.parmon.cdata.insts.prev; } @@ -472,7 +472,7 @@ check_time_correction(void *vesdp) if (os_mtime < ci.os_mtime) erts_exit(ERTS_ABORT_EXIT, - "OS monotonic time stepped backwards\n"); + "OS monotonic time stepped backwards, maybe add '+c false' in vm.args\n"); erl_mtime = calc_corrected_erl_mtime(os_mtime, &ci, &mdiff, os_drift_corrected); @@ -900,7 +900,7 @@ finalize_corrected_time_offset(ErtsSystemTime *stimep) if (os_mtime < ci.os_mtime) erts_exit(ERTS_ABORT_EXIT, - "OS monotonic time stepped backwards\n"); + "OS monotonic time stepped backwards, maybe add '+c false' in vm.args\n"); return calc_corrected_erl_mtime(os_mtime, &ci, NULL, os_drift_corrected); From 48f1bedf3f734a6ae983b1d3d73b77013d3b834b Mon Sep 17 00:00:00 2001 From: zmstone Date: Mon, 19 Aug 2024 16:30:50 +0200 Subject: [PATCH 2/2] chore: bump TOP_VERSION --- OTP_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 4f52eee7a713..079fd12e43d8 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5-3 +26.2.5-4