diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
| commit | cc8f7f4c97de923f60f9469aa2847e6e1474d52d (patch) | |
| tree | 4a5895a4421fbd66a2159de08c3ad70506b55051 /src/modules/systemlib | |
| parent | 3aab37e0e04ce98ddacd99e238e626ab5c3d4445 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.gz px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.bz2 px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.zip | |
Merge branch 'master' into navigator_rewrite
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.h
src/modules/mavlink/mavlink_messages.cpp
Diffstat (limited to 'src/modules/systemlib')
| -rw-r--r-- | src/modules/systemlib/perf_counter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/systemlib/perf_counter.c b/src/modules/systemlib/perf_counter.c index 22182e39e..d6d8284d2 100644 --- a/src/modules/systemlib/perf_counter.c +++ b/src/modules/systemlib/perf_counter.c @@ -301,7 +301,7 @@ perf_print_counter_fd(int fd, perf_counter_t handle) case PC_ELAPSED: { struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle; - dprintf(fd, "%s: %llu events, %lluus elapsed, %llu avg, min %lluus max %lluus\n", + dprintf(fd, "%s: %llu events, %lluus elapsed, %lluus avg, min %lluus max %lluus\n", handle->name, pce->event_count, pce->time_total, @@ -314,7 +314,7 @@ perf_print_counter_fd(int fd, perf_counter_t handle) case PC_INTERVAL: { struct perf_ctr_interval *pci = (struct perf_ctr_interval *)handle; - dprintf(fd, "%s: %llu events, %llu avg, min %lluus max %lluus\n", + dprintf(fd, "%s: %llu events, %lluus avg, min %lluus max %lluus\n", handle->name, pci->event_count, (pci->time_last - pci->time_first) / pci->event_count, |