From 1cf7de8fdb5e92163d4f724e5f1471adc5c9640c Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 25 Apr 2016 09:13:14 +0200 Subject: [PATCH] perf_counter: perf_print_counter now works on QURT --- src/modules/systemlib/perf_counter.c | 16 +++++++--------- src/modules/systemlib/perf_counter.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modules/systemlib/perf_counter.c b/src/modules/systemlib/perf_counter.c index 36b3ba8580..be75ea2368 100644 --- a/src/modules/systemlib/perf_counter.c +++ b/src/modules/systemlib/perf_counter.c @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (C) 2012-2016 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,10 +46,8 @@ #include "perf_counter.h" #ifdef __PX4_QURT -#define dprintf(...) -#define ddeclare(...) -#else -#define ddeclare(...) __VA_ARGS__ +// There is presumably no dprintf on QURT. Therefore use the usual output to mini-dm. +#define dprintf(_fd, _text, ...) ((_fd) == 1 ? PX4_INFO((_text), ##__VA_ARGS__) : (void)(_fd)) #endif /** @@ -439,8 +437,8 @@ perf_print_counter_fd(int fd, perf_counter_t handle) break; case PC_ELAPSED: { - ddeclare(struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle;) - ddeclare(float rms = sqrtf(pce->M2 / (pce->event_count - 1));) + struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle; + float rms = sqrtf(pce->M2 / (pce->event_count - 1)); dprintf(fd, "%s: %llu events, %llu overruns, %lluus elapsed, %lluus avg, min %lluus max %lluus %5.3fus rms\n", handle->name, (unsigned long long)pce->event_count, @@ -454,8 +452,8 @@ perf_print_counter_fd(int fd, perf_counter_t handle) } case PC_INTERVAL: { - ddeclare(struct perf_ctr_interval *pci = (struct perf_ctr_interval *)handle;) - ddeclare(float rms = sqrtf(pci->M2 / (pci->event_count - 1));) + struct perf_ctr_interval *pci = (struct perf_ctr_interval *)handle; + float rms = sqrtf(pci->M2 / (pci->event_count - 1)); dprintf(fd, "%s: %llu events, %lluus avg, min %lluus max %lluus %5.3fus rms\n", handle->name, diff --git a/src/modules/systemlib/perf_counter.h b/src/modules/systemlib/perf_counter.h index 55931576ce..f4669f172f 100644 --- a/src/modules/systemlib/perf_counter.h +++ b/src/modules/systemlib/perf_counter.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (C) 2012-2016 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions