diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-30 23:07:28 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-30 23:07:28 +0100 |
| commit | 7274c0ce3010c6f3292081a96cbd003e2d6bcefa (patch) | |
| tree | 1ececc8e17bfe0fc308f211dff9d665352bbd8cb /src/modules/systemlib | |
| parent | 9cbc31b588f3bac6d3b03870801c97068a4b4ecc (diff) | |
| parent | 8d79d919504b4b92ad05a7ebc12334083ae0f4b9 (diff) | |
| download | px4-firmware-7274c0ce3010c6f3292081a96cbd003e2d6bcefa.tar.gz px4-firmware-7274c0ce3010c6f3292081a96cbd003e2d6bcefa.tar.bz2 px4-firmware-7274c0ce3010c6f3292081a96cbd003e2d6bcefa.zip | |
Merge branch 'master' into beta
Diffstat (limited to 'src/modules/systemlib')
| -rw-r--r-- | src/modules/systemlib/cpuload.c | 3 | ||||
| -rw-r--r-- | src/modules/systemlib/cpuload.h | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/modules/systemlib/cpuload.c b/src/modules/systemlib/cpuload.c index afc5b072c..ccc516f39 100644 --- a/src/modules/systemlib/cpuload.c +++ b/src/modules/systemlib/cpuload.c @@ -93,8 +93,7 @@ void cpuload_initialize_once() #endif /* CONFIG_SCHED_WORKQUEUE */ // perform static initialization of "system" threads - for (system_load.total_count = 0; system_load.total_count < static_tasks_count; system_load.total_count++) - { + 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; diff --git a/src/modules/systemlib/cpuload.h b/src/modules/systemlib/cpuload.h index c7aa18d3c..16d132fdb 100644 --- a/src/modules/systemlib/cpuload.h +++ b/src/modules/systemlib/cpuload.h @@ -40,15 +40,15 @@ __BEGIN_DECLS #include <nuttx/sched.h> 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 - FAR struct tcb_s *tcb; ///< - bool valid; ///< Task is currently active / valid + 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 + FAR struct tcb_s *tcb; ///< + bool valid; ///< Task is currently active / valid }; struct system_load_s { - uint64_t start_time; ///< Global start time of measurements + uint64_t start_time; ///< Global start time of measurements struct system_load_taskinfo_s tasks[CONFIG_MAX_TASKS]; uint8_t initialized; int total_count; |