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

Merged beta into master

Browse Source
This commit is contained in:
Lorenz Meier
2015-08-11 11:03:01 +02:00
parent 7170c76fff fc4754f8e5
commit ea2975c2a9
15 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/cpuload.c
-4
View File
@@ -80,8 +80,6 @@ void cpuload_initialize_once()
system_load.tasks[i].valid = false;
}
uint64_t now = hrt_absolute_time();
int static_tasks_count = 2; // there are at least 2 threads that should be initialized statically - "idle" and "init"
#ifdef CONFIG_PAGING
@@ -96,7 +94,6 @@ void cpuload_initialize_once()
// perform static initialization of "system" threads
for (system_load.total_count = 0; system_load.total_count < static_tasks_count; system_load.total_count++) {
system_load.tasks[system_load.total_count].start_time = now;
system_load.tasks[system_load.total_count].total_runtime = 0;
system_load.tasks[system_load.total_count].curr_start_time = 0;
system_load.tasks[system_load.total_count].tcb = sched_gettcb(
@@ -113,7 +110,6 @@ void sched_note_start(FAR struct tcb_s *tcb)
for (i = 1; i < CONFIG_MAX_TASKS; i++) {
if (!system_load.tasks[i].valid) {
/* slot is available */
system_load.tasks[i].start_time = hrt_absolute_time();
system_load.tasks[i].total_runtime = 0;
system_load.tasks[i].curr_start_time = 0;
system_load.tasks[i].tcb = tcb;
src/modules/systemlib/cpuload.h
-1
View File
@@ -42,7 +42,6 @@ __BEGIN_DECLS
struct system_load_taskinfo_s {
uint64_t total_runtime; ///< Runtime since start (start_time - total_runtime)/(start_time - current_time) = load
uint64_t curr_start_time; ///< Start time of the current scheduling slot
uint64_t start_time; ///< FIRST start time of task
#ifdef __PX4_NUTTX
FAR struct tcb_s *tcb; ///<
#endif