fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 02:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

printload: reduce memory usage of print_load_s

Browse Source 
assuming CONFIG_MAX_TASKS = 32, this saves 256B of RAM
This commit is contained in:
Beat Küng
2017-04-01 20:19:52 +02:00
committed by Lorenz Meier
parent c46274043f
commit 23d0355979
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/printload.c
+11 -11
View File
@@ -210,21 +210,21 @@ void print_load(uint64_t t, int fd, struct print_load_s *print_state)
} }
interval_runtime = (print_state->last_times[i] > 0 && interval_runtime = (print_state->last_times[i] > 0 &&
system_load.tasks[i].total_runtime > print_state->last_times[i]) system_load.tasks[i].total_runtime / 1000 > print_state->last_times[i])
? (system_load.tasks[i].total_runtime - print_state->last_times[i]) / 1000 ? (system_load.tasks[i].total_runtime / 1000 - print_state->last_times[i])
: 0; : 0;
print_state->last_times[i] = system_load.tasks[i].total_runtime; print_state->last_times[i] = system_load.tasks[i].total_runtime / 1000;
float current_load = 0.f;
if (print_state->new_time > print_state->interval_start_time) { if (print_state->new_time > print_state->interval_start_time) {
print_state->curr_loads[i] = interval_runtime * print_state->interval_time_ms_inv; current_load = interval_runtime * print_state->interval_time_ms_inv;
if (tcb_pid != 0) { if (tcb_pid != 0) {
print_state->total_user_time += interval_runtime; print_state->total_user_time += interval_runtime;
} }
} else {
print_state->curr_loads[i] = 0;
} }
@@ -239,8 +239,8 @@ void print_load(uint64_t t, int fd, struct print_load_s *print_state)
float task_load; float task_load;
float sched_load; float sched_load;
idle = print_state->curr_loads[i]; idle = current_load;
task_load = (float)(print_state->total_user_time) * print_state->interval_time_ms_inv; task_load = (float)(print_state->total_user_time) * print_state->interval_time_ms_inv;
/* this can happen if one tasks total runtime was not computed /* this can happen if one tasks total runtime was not computed
correctly by the scheduler instrumentation TODO */ correctly by the scheduler instrumentation TODO */
@@ -301,8 +301,8 @@ void print_load(uint64_t t, int fd, struct print_load_s *print_state)
tcb_pid, tcb_pid,
CONFIG_TASK_NAME_SIZE, tcb_name, CONFIG_TASK_NAME_SIZE, tcb_name,
(system_load.tasks[i].total_runtime / 1000), (system_load.tasks[i].total_runtime / 1000),
(int)(print_state->curr_loads[i] * 100.0f), (int)(current_load * 100.0f),
(int)((print_state->curr_loads[i] * 100.0f - (int)(print_state->curr_loads[i] * 100.0f)) * 1000), (int)((current_load * 100.0f - (int)(current_load * 100.0f)) * 1000),
stack_size - stack_free, stack_size - stack_free,
stack_size, stack_size,
tcb_sched_priority, tcb_sched_priority,
src/modules/systemlib/printload.h
+1 -2
View File
@@ -57,8 +57,7 @@ struct print_load_s {
uint64_t new_time; uint64_t new_time;
uint64_t interval_start_time; uint64_t interval_start_time;
uint64_t last_times[CONFIG_MAX_TASKS]; uint32_t last_times[CONFIG_MAX_TASKS]; // in [ms]. This wraps if a process needs more than 49 days of CPU
float curr_loads[CONFIG_MAX_TASKS];
float interval_time_ms_inv; float interval_time_ms_inv;
}; };