Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-05 15:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scheduler: use ExpandingString class

Browse Source
This commit is contained in:
Andrew Tridgell 2020-12-30 17:23:27 +11:00 committed by Peter Barker
parent c21b6b4a16
commit 6da0212ce4
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/AP_Scheduler/AP_Scheduler.cpp
View File

@ -26,6 +26,8 @@
#include <AP_Logger/AP_Logger.h> #include <AP_Logger/AP_Logger.h>
#include <AP_InertialSensor/AP_InertialSensor.h> #include <AP_InertialSensor/AP_InertialSensor.h>
#include <AP_InternalError/AP_InternalError.h> #include <AP_InternalError/AP_InternalError.h>
#include <AP_Common/ExpandingString.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <SITL/SITL.h> #include <SITL/SITL.h>
#endif #endif
@ -409,31 +411,21 @@ void AP_Scheduler::Log_Write_Performance()
} }
// display task statistics as text buffer for @SYS/tasks.txt // display task statistics as text buffer for @SYS/tasks.txt
size_t AP_Scheduler::task_info(char *buf, size_t bufsize) void AP_Scheduler::task_info(ExpandingString &str)
{ {
size_t total = 0;
// a header to allow for machine parsers to determine format // a header to allow for machine parsers to determine format
int n = hal.util->snprintf(buf, bufsize, "TasksV1\n"); str.printf("TasksV1\n");
if (n <= 0) {
return 0;
}
// dynamically enable statistics collection // dynamically enable statistics collection
if (!(_options & uint8_t(Options::RECORD_TASK_INFO))) { if (!(_options & uint8_t(Options::RECORD_TASK_INFO))) {
_options |= uint8_t(Options::RECORD_TASK_INFO); _options |= uint8_t(Options::RECORD_TASK_INFO);
return n; return;
} }
if (perf_info.get_task_info(0) == nullptr) { if (perf_info.get_task_info(0) == nullptr) {
return n; return;
} }
buf += n;
bufsize -= n;
total += n;
// baseline the total time taken by all tasks // baseline the total time taken by all tasks
float total_time = 1.0f; float total_time = 1.0f;
for (uint8_t i = 0; i < _num_tasks + 1; i++) { for (uint8_t i = 0; i < _num_tasks + 1; i++) {
@ -459,19 +451,10 @@ size_t AP_Scheduler::task_info(char *buf, size_t bufsize)
#else #else
const char* fmt = "%-32.32s MIN=%3u MAX=%3u AVG=%3u OVR=%3u SLP=%3u, TOT=%4.1f%%\n"; const char* fmt = "%-32.32s MIN=%3u MAX=%3u AVG=%3u OVR=%3u SLP=%3u, TOT=%4.1f%%\n";
#endif #endif
n = hal.util->snprintf(buf, bufsize, fmt, task_name, str.printf(fmt, task_name,
unsigned(MIN(ti->min_time_us, 999)), unsigned(MIN(ti->max_time_us, 999)), unsigned(avg), unsigned(MIN(ti->min_time_us, 999)), unsigned(MIN(ti->max_time_us, 999)), unsigned(avg),
unsigned(MIN(ti->overrun_count, 999)), unsigned(MIN(ti->slip_count, 999)), pct); unsigned(MIN(ti->overrun_count, 999)), unsigned(MIN(ti->slip_count, 999)), pct);
if (n <= 0) {
break;
}
buf += n;
bufsize -= n;
total += n;
} }
return total;
} }
namespace AP { namespace AP {

2
libraries/AP_Scheduler/AP_Scheduler.h
View File

@ -156,7 +156,7 @@ public:
HAL_Semaphore &get_semaphore(void) { return _rsem; } HAL_Semaphore &get_semaphore(void) { return _rsem; }
size_t task_info(char *buf, size_t bufsize); void task_info(ExpandingString &str);
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];