Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #9971: Don't assert that time moves forward #9983

Merged
merged 1 commit into from Aug 27, 2022

Conversation

nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Aug 27, 2022

Motivation / Problem

It seems that if simulation goes too fast, the tick time measurements can get inaccurate and produce measurements that appear to go backwards in time. Maybe it has to do with threads being migrated between CPU cores? No idea.

Description

Just ignore measurements that appear to do time travel. Don't try to draw them.

Limitations

I tried the reproduction given in #9971 and I can't make it crash with or without this patch. I did test with builds with asserts enabled, and reached about 1.3 million ticks/s.
It probably has to do with specific CPU models that have performance counters behaving in specific ways.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems safe to me.

@nielsmh nielsmh merged commit 5a0dd7e into OpenTTD:master Aug 27, 2022
@ldpl
Copy link
Contributor

ldpl commented Aug 27, 2022

May depend on the compiler as high_resolution_clock is not guaranteed to be steady and can alias to system_clock with all the ensuing adjustments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants