Skip to content

Force inline Timer::attach() to get rid of floating-point instructions #11236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 20, 2019
Merged

Force inline Timer::attach() to get rid of floating-point instructions #11236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e1714ec
Require integer to specify callback interval with Ticker API
hugueskamba Aug 15, 2019
4b1cee3
Deprecate previous Ticker::attach() API
hugueskamba Aug 15, 2019
ce5dbda
Move time macro conversions to `Ticker.h`
hugueskamba Aug 15, 2019
61b1482
Add new API method `attach_s` instead of overloading the deprecated `…
hugueskamba Aug 15, 2019
80cdc3e
Ensure tests use the new method.
hugueskamba Aug 15, 2019
d6429ef
Fix lp_ticker and ticker unit test case wait times
hugueskamba Aug 15, 2019
59a6b55
Fix code indentation to satisfy code style checker
hugueskamba Aug 15, 2019
b0d4b69
Ensure the new method is called by the deprecated one
hugueskamba Aug 16, 2019
5635e94
Force inline Timer::attach() to get rid of floating-point instruction
hugueskamba Aug 16, 2019
e06c91c
Use Perfect forwading to pass arguments from `attach()` to `attach_us()`
hugueskamba Aug 16, 2019
9cc816d
Un-templatise interval and forward the reference
hugueskamba Aug 16, 2019
7ec84a8
Include `mstd_utility` to get in front of the ARMC5's built-in `utility`
hugueskamba Aug 19, 2019
3373d78
Rename hal/rtc test callback to avoid overloading
hugueskamba Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TESTS/mbed_hal/rtc/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static const uint32_t TOLERANCE_ACCURACY_US = (DELAY_10S *US_PER_SEC / ACCURACY_
#if DEVICE_LPTICKER
volatile bool expired;

void callback(void)
void set_flag_true(void)
{
expired = true;
}
Expand Down Expand Up @@ -72,7 +72,7 @@ void rtc_sleep_test_support(bool deepsleep_mode)

rtc_write(start);

timeout.attach(callback, DELAY_4S);
timeout.attach(set_flag_true, DELAY_4S);

TEST_ASSERT(sleep_manager_can_deep_sleep_test_check() == deepsleep_mode);

Expand Down
10 changes: 8 additions & 2 deletions drivers/Ticker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#ifndef MBED_TICKER_H
#define MBED_TICKER_H

#include <mstd_utility>
#include "drivers/TimerEvent.h"
#include "platform/Callback.h"
#include "platform/mbed_toolchain.h"
Expand Down Expand Up @@ -75,12 +76,17 @@ class Ticker : public TimerEvent, private NonCopyable<Ticker> {

/** Attach a function to be called by the Ticker, specifying the interval in seconds
*
* The method forwards its arguments to attach_us() rather than copying them which
* may not be trivial depending on the callback copied.
* The function is forcibly inlined to not use floating-point operations. This is
* possible given attach_us() expects an integer value for the callback interval.
* @param func pointer to the function to be called
* @param t the time between calls in seconds
*/
void attach(Callback<void()> func, float t)
template <typename F>
MBED_FORCEINLINE void attach(F &&func, float t)
{
attach_us(func, t * 1000000.0f);
attach_us(std::forward<F>(func), t * 1000000.0f);
}

/** Attach a member function to be called by the Ticker, specifying the interval in seconds
Expand Down