Skip to content

sys/xtimer: compare two offsets rather than absolute times [backport 2020.01]#13237

Merged
aabadie merged 1 commit intoRIOT-OS:2020.01-branchfrom
MichelRottleuthner:pr_bp13212
Jan 30, 2020
Merged

sys/xtimer: compare two offsets rather than absolute times [backport 2020.01]#13237
aabadie merged 1 commit intoRIOT-OS:2020.01-branchfrom
MichelRottleuthner:pr_bp13212

Conversation

@MichelRottleuthner
Copy link
Contributor

@MichelRottleuthner MichelRottleuthner commented Jan 30, 2020 •
edited by miri64
Loading

Backport of #13212

Contribution description

This PR fixes a bug in #9530 reported by #13209, making sure to compare two offsets rather than two absolute times when ordering timers.

Testing procedure

Issues/PRs references

#9530
#13209

@MichelRottleuthner MichelRottleuthner added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: timers Area: timer subsystems Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Area: sys Area: System labels Jan 30, 2020
@MichelRottleuthner MichelRottleuthner changed the title sys/xtimer: compare two offsets rather than absolute times sys/xtimer: compare two offsets rather than absolute times [backport 2020.01] Jan 30, 2020
@aabadie
Copy link
Contributor

aabadie commented Jan 30, 2020

#13234 is not the right origin PR, it should be #13212. @MichelRottleuthner why not simply use the backport_pr.py script ? That would avoid copy-paste mistakes like this.

aabadie
aabadie approved these changes Jan 30, 2020
View reviewed changes
Copy link
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

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

Same changes as in #13212

ACK

@MichelRottleuthner
Copy link
Contributor Author

MichelRottleuthner commented Jan 30, 2020

(...) why not simply use the backport_pr.py script (...)

I didn't even know that exists 😨 thanks for the hint!

@aabadie aabadie merged commit 97f8832 into RIOT-OS:2020.01-branch Jan 30, 2020
@aabadie
Copy link
Contributor

aabadie commented Jan 30, 2020

I didn't even know that exists

No problem. For the next times, try it, and you will love it!

@fjmolinas
Copy link
Contributor

fjmolinas commented Jan 31, 2020

No problem. For the next times, try it, and you will love it!

Game changer! Hahahaha

@aabadie aabadie mentioned this pull request Jul 1, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aabadie aabadie aabadie approved these changes

Assignees

@fjmolinas fjmolinas

Labels

Area: sys Area: System Area: timers Area: timer subsystems CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MichelRottleuthner @aabadie @fjmolinas