Skip to content

Commit

Permalink
Merge pull request #58 from emqx/0819-monotonic-time-step-back-exit-l…
Browse files Browse the repository at this point in the history
…og-msg

0819 monotonic time step back exit log msg
  • Loading branch information
zmstone authored Aug 19, 2024
2 parents e6c6b1a + 48f1bed commit 9b73e1a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion OTP_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26.2.5-3
26.2.5-4
10 changes: 5 additions & 5 deletions erts/emulator/beam/erl_time_sup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9b73e1a

Please sign in to comment.