The alarm test had several issues:
- only negative tests were done, no positive test to make sure
API worked
- the set/cancel test had too short an interval and the alarm
might expire
- the test should have used the standard TEST macros.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
app/test/test_alarm.c | 77 ++++++++++++++++++++++++++++---------------
1 file changed, 50 insertions(+), 27 deletions(-)
diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index 0cdfad1374..67ca30b1fe 100644
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -3,53 +3,76 @@
*/
#include <stdio.h>
+#include <stdbool.h>
#include <stdint.h>
-#include <rte_common.h>
#include <rte_alarm.h>
+#include <rte_atomic.h>
+#include <rte_common.h>
+#include <rte_cycles.h>
+#include <rte_errno.h>
#include "test.h"
-static volatile int flag;
+#ifndef US_PER_SEC
+#define US_PER_SEC 1000000u
+#endif
static void
test_alarm_callback(void *cb_arg)
{
- flag = 1;
- printf("Callback setting flag - OK. [cb_arg = %p]\n", cb_arg);
+ bool *triggered = cb_arg;
+
+ rte_atomic_store_explicit(triggered, 1, rte_memory_order_release);
}
+
static int
test_alarm(void)
{
- /* check if it will fail to set alarm with wrong us value */
- printf("check if it will fail to set alarm with wrong ms values\n");
- if (rte_eal_alarm_set(0, test_alarm_callback,
- NULL) >= 0) {
- printf("should not be successful with 0 us value\n");
- return -1;
- }
- if (rte_eal_alarm_set(UINT64_MAX - 1, test_alarm_callback,
- NULL) >= 0) {
- printf("should not be successful with (UINT64_MAX-1) us
value\n");
- return -1;
- }
+ bool triggered = false;
+ bool later = false;
+ int ret;
+
+ /* check if it will fail to set alarm with wrong us values */
+ TEST_ASSERT_FAIL(rte_eal_alarm_set(0, test_alarm_callback, NULL),
+ "Expected rte_eal_alarm_set to fail with 0 us value");
+
+ /* check it if will fail with a very large timeout value */
+ TEST_ASSERT_FAIL(rte_eal_alarm_set(UINT64_MAX - 1, test_alarm_callback,
NULL),
+ "Expected rte_eal_alarm_set to fail with
(UINT64_MAX-1) us value");
/* check if it will fail to set alarm with null callback parameter */
- printf("check if it will fail to set alarm with null callback
parameter\n");
- if (rte_eal_alarm_set(10 /* ms */, NULL, NULL) >= 0) {
- printf("should not be successful to set alarm with null
callback parameter\n");
- return -1;
- }
+ TEST_ASSERT_FAIL(rte_eal_alarm_set(US_PER_SEC, NULL, NULL),
+ "Expected rte_eal_alarm_set to fail with null callback
parameter");
/* check if it will fail to remove alarm with null callback parameter */
- printf("check if it will fail to remove alarm with null callback
parameter\n");
- if (rte_eal_alarm_cancel(NULL, NULL) == 0) {
- printf("should not be successful to remove alarm with null
callback parameter");
- return -1;
- }
+ TEST_ASSERT_FAIL(rte_eal_alarm_cancel(NULL, NULL),
+ "Expected rte_eal_alarm_cancel to fail with null
callback parameter");
+
+ /* check if can set a alarm for one second */
+ TEST_ASSERT_SUCCESS(rte_eal_alarm_set(US_PER_SEC, test_alarm_callback,
&triggered),
+ "Setting one second alarm failed");
+
+ /* set a longer alarm that will be canceled. */
+ TEST_ASSERT_SUCCESS(rte_eal_alarm_set(10 * US_PER_SEC,
test_alarm_callback, &later),
+ "Setting ten second alarm failed");
+
+ /* wait for alarm to happen */
+ while (rte_atomic_load_explicit(&triggered, rte_memory_order_acquire)
== false)
+ rte_delay_us_sleep(US_PER_SEC / 10);
+
+ TEST_ASSERT(!rte_atomic_load_explicit(&later, rte_memory_order_acquire),
+ "Only one alarm should have fired.");
+
+ ret = rte_eal_alarm_cancel(test_alarm_callback, &triggered);
+ TEST_ASSERT(ret == 0 && rte_errno == ENOENT,
+ "Canceling alarm after run ret %d: %s", ret,
rte_strerror(rte_errno));
+
+ ret = rte_eal_alarm_cancel(test_alarm_callback, &later);
+ TEST_ASSERT(ret == 1, "Canceling ten second alarm failed %d: %s", ret,
rte_strerror(rte_errno));
return 0;
}
-REGISTER_TEST_COMMAND(alarm_autotest, test_alarm);
+REGISTER_FAST_TEST(alarm_autotest, true, true, test_alarm);
--
2.43.0
