summaryrefslogtreecommitdiff
path: root/test/hooks.c
diff options
context:
space:
mode:
authorAnton Staaf <robotboy@chromium.org>2016-03-23 12:45:28 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-04-18 17:32:40 -0700
commit068cd0850684ee28a5a514e5a270edce2edb3979 (patch)
treee84f2316e37baa72f1c9611e665749d91a3ce8fd /test/hooks.c
parent1e7c280491232110e1006d545f9a61ca05d469d5 (diff)
downloadchrome-ec-068cd0850684ee28a5a514e5a270edce2edb3979.tar.gz
Deferred: Use deferred_data instead of function pointer
Previously calls to hook_call_deferred were passed the function to call, which was then looked up in the .rodata.deferred section with a linear search. This linear search can be replaced with a subtract by passing the pointer to the deferred_data object created when DECLARE_DEFERRED was invoked. Signed-off-by: Anton Staaf <robotboy@chromium.org> BRANCH=None BUG=None CQ-DEPEND=CL:*255812 TEST=make buildall -j Change-Id: I951dd1541302875b102dd086154cf05591694440 Reviewed-on: https://chromium-review.googlesource.com/334315 Commit-Ready: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'test/hooks.c')
-rw-r--r--test/hooks.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/test/hooks.c b/test/hooks.c
index b3bcbd9e41..4fba1406ae 100644
--- a/test/hooks.c
+++ b/test/hooks.c
@@ -62,6 +62,10 @@ static void non_deferred_func(void)
deferred_call_count++;
}
+static const struct deferred_data non_deferred_func_data = {
+ non_deferred_func
+};
+
static int test_init_hook(void)
{
TEST_ASSERT(init_hook_count == 1);
@@ -104,25 +108,25 @@ static int test_priority(void)
static int test_deferred(void)
{
deferred_call_count = 0;
- hook_call_deferred(deferred_func, 50 * MSEC);
+ hook_call_deferred(&deferred_func_data, 50 * MSEC);
usleep(100 * MSEC);
TEST_ASSERT(deferred_call_count == 1);
- hook_call_deferred(deferred_func, 50 * MSEC);
+ hook_call_deferred(&deferred_func_data, 50 * MSEC);
usleep(25 * MSEC);
- hook_call_deferred(deferred_func, -1);
+ hook_call_deferred(&deferred_func_data, -1);
usleep(75 * MSEC);
TEST_ASSERT(deferred_call_count == 1);
- hook_call_deferred(deferred_func, 50 * MSEC);
+ hook_call_deferred(&deferred_func_data, 50 * MSEC);
usleep(25 * MSEC);
- hook_call_deferred(deferred_func, -1);
+ hook_call_deferred(&deferred_func_data, -1);
usleep(15 * MSEC);
- hook_call_deferred(deferred_func, 25 * MSEC);
+ hook_call_deferred(&deferred_func_data, 25 * MSEC);
usleep(50 * MSEC);
TEST_ASSERT(deferred_call_count == 2);
- TEST_ASSERT(hook_call_deferred(non_deferred_func, 50 * MSEC) !=
+ TEST_ASSERT(hook_call_deferred(&non_deferred_func_data, 50 * MSEC) !=
EC_SUCCESS);
usleep(100 * MSEC);
TEST_ASSERT(deferred_call_count == 2);