Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Bugfix:hrt is used before it is initalized.

Browse Source 
sched_note_{suspend|resume} were calling hrt_absolute_time before
   it hrt_init is called. This can lead to register access before
   clocking is enabled. The result is a hardfault.
This commit is contained in:
David Sidrane
2017-04-21 17:33:11 -10:00
committed by Lorenz Meier
parent 6c6cfd4f65
commit 0754e8f8bc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/cpuload.c
+4 -2
View File
@@ -145,9 +145,10 @@ void sched_note_stop(FAR struct tcb_s *tcb)
void sched_note_suspend(FAR struct tcb_s *tcb) void sched_note_suspend(FAR struct tcb_s *tcb)
{ {
uint64_t new_time = hrt_absolute_time();
if (system_load.initialized) { if (system_load.initialized) {
uint64_t new_time = hrt_absolute_time();
for (int i = 0; i < CONFIG_MAX_TASKS; i++) { for (int i = 0; i < CONFIG_MAX_TASKS; i++) {
/* Task ending its current scheduling run */ /* Task ending its current scheduling run */
if (system_load.tasks[i].valid && system_load.tasks[i].tcb != 0 && system_load.tasks[i].tcb->pid == tcb->pid) { if (system_load.tasks[i].valid && system_load.tasks[i].tcb != 0 && system_load.tasks[i].tcb->pid == tcb->pid) {
@@ -160,9 +161,10 @@ void sched_note_suspend(FAR struct tcb_s *tcb)
void sched_note_resume(FAR struct tcb_s *tcb) void sched_note_resume(FAR struct tcb_s *tcb)
{ {
uint64_t new_time = hrt_absolute_time();
if (system_load.initialized) { if (system_load.initialized) {
uint64_t new_time = hrt_absolute_time();
for (int i = 0; i < CONFIG_MAX_TASKS; i++) { for (int i = 0; i < CONFIG_MAX_TASKS; i++) {
if (system_load.tasks[i].valid && system_load.tasks[i].tcb->pid == tcb->pid) { if (system_load.tasks[i].valid && system_load.tasks[i].tcb->pid == tcb->pid) {
system_load.tasks[i].curr_start_time = new_time; system_load.tasks[i].curr_start_time = new_time;