Skip to content

Commit 2b3951f

Browse files
committed
validation: timer: improve odp_timer_capability() testing
Improve odp_timer_capability() testing by running the test twice. First with the output capability struct initialized with zeros and again with 0xff. Also, remove unnecessary memset() calls from other odp_timer_capability() usages throughout the validation tests. Signed-off-by: Matias Elo <[email protected]> Reviewed-by: Petri Savolainen <[email protected]>
1 parent c0f199a commit 2b3951f

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

test/validation/api/timer/timer.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ static int timer_global_init(odp_instance_t *instance)
182182

183183
memset(global_mem, 0, sizeof(global_shared_mem_t));
184184

185-
memset(&capa, 0, sizeof(capa));
186185
if (odp_timer_capability(clk_src, &capa)) {
187186
ODPH_ERR("Timer capability failed\n");
188187
return -1;
@@ -278,14 +277,15 @@ static int check_periodic_plain_support(void)
278277
return ODP_TEST_INACTIVE;
279278
}
280279

281-
static void timer_test_capa(void)
280+
static void test_capa(uint8_t fill)
282281
{
283282
odp_timer_capability_t capa;
284283
odp_timer_res_capability_t res_capa;
285284
int ret;
286285
odp_timer_clk_src_t clk_src = test_global->clk_src;
287286

288-
memset(&capa, 0, sizeof(capa));
287+
memset(&capa, fill, sizeof(capa));
288+
289289
ret = odp_timer_capability(clk_src, &capa);
290290
CU_ASSERT_FATAL(ret == 0);
291291

@@ -356,6 +356,12 @@ static void timer_test_capa(void)
356356
}
357357
}
358358

359+
static void timer_test_capa(void)
360+
{
361+
test_capa(0);
362+
test_capa(0xff);
363+
}
364+
359365
static void timer_test_capa_allsrc(void)
360366
{
361367
odp_timer_capability_t capa;
@@ -677,7 +683,6 @@ static void timer_pool_create_destroy(void)
677683
int ret;
678684
odp_timer_clk_src_t clk_src = test_global->clk_src;
679685

680-
memset(&capa, 0, sizeof(capa));
681686
ret = odp_timer_capability(clk_src, &capa);
682687
CU_ASSERT_FATAL(ret == 0);
683688

@@ -785,7 +790,6 @@ static void timer_pool_create_max(void)
785790
uint64_t res_ns = ODP_TIME_SEC_IN_NS / 10;
786791
odp_timer_clk_src_t clk_src = test_global->clk_src;
787792

788-
memset(&capa, 0, sizeof(capa));
789793
ret = odp_timer_capability(clk_src, &capa);
790794
CU_ASSERT_FATAL(ret == 0);
791795

@@ -866,7 +870,6 @@ static void timer_pool_max_res(void)
866870
int ret, i;
867871
odp_timer_clk_src_t clk_src = test_global->clk_src;
868872

869-
memset(&capa, 0, sizeof(capa));
870873
ret = odp_timer_capability(clk_src, &capa);
871874
CU_ASSERT_FATAL(ret == 0);
872875

@@ -1010,7 +1013,6 @@ static void timer_single_shot(odp_queue_type_t queue_type, odp_timer_tick_type_t
10101013
int ret, i;
10111014
odp_timer_clk_src_t clk_src = test_global->clk_src;
10121015

1013-
memset(&capa, 0, sizeof(capa));
10141016
ret = odp_timer_capability(clk_src, &capa);
10151017
CU_ASSERT_FATAL(ret == 0);
10161018
CU_ASSERT_FATAL(capa.max_tmo.max_tmo > 0);
@@ -1253,7 +1255,6 @@ static void timer_pool_current_tick(void)
12531255
uint64_t nsec = 100 * ODP_TIME_MSEC_IN_NS;
12541256
odp_timer_clk_src_t clk_src = test_global->clk_src;
12551257

1256-
memset(&capa, 0, sizeof(capa));
12571258
CU_ASSERT_FATAL(odp_timer_capability(clk_src, &capa) == 0);
12581259

12591260
/* Highest resolution */
@@ -1321,7 +1322,6 @@ static void timer_pool_sample_ticks(void)
13211322
tp_param.num_timers = 100;
13221323

13231324
/* First timer pool: default clock source */
1324-
memset(&capa, 0, sizeof(capa));
13251325
CU_ASSERT_FATAL(odp_timer_capability(clk_1, &capa) == 0);
13261326
tp_param.clk_src = clk_1;
13271327
tp_param.res_hz = capa.max_res.res_hz;
@@ -1332,7 +1332,6 @@ static void timer_pool_sample_ticks(void)
13321332
CU_ASSERT_FATAL(tp[0] != ODP_TIMER_POOL_INVALID);
13331333

13341334
/* Second timer pool: another clock source */
1335-
memset(&capa, 0, sizeof(capa));
13361335
CU_ASSERT_FATAL(odp_timer_capability(clk_2, &capa) == 0);
13371336
tp_param.clk_src = clk_2;
13381337
tp_param.res_hz = capa.max_res.res_hz;
@@ -1388,7 +1387,6 @@ static void timer_pool_tick_info(void)
13881387
double tick_hz, tick_nsec, tick_to_nsec, tick_low;
13891388
odp_timer_clk_src_t clk_src = test_global->clk_src;
13901389

1391-
memset(&capa, 0, sizeof(capa));
13921390
CU_ASSERT_FATAL(odp_timer_capability(clk_src, &capa) == 0);
13931391

13941392
/* Highest resolution */
@@ -1901,7 +1899,6 @@ static void timer_test_cancel(void)
19011899
int ret;
19021900
odp_timer_clk_src_t clk_src = test_global->clk_src;
19031901

1904-
memset(&capa, 0, sizeof(capa));
19051902
ret = odp_timer_capability(clk_src, &capa);
19061903
CU_ASSERT_FATAL(ret == 0);
19071904

@@ -2009,7 +2006,6 @@ static void timer_test_tmo_limit(odp_queue_type_t queue_type,
20092006
odp_timer_clk_src_t clk_src = test_global->clk_src;
20102007
bool wait_tmo;
20112008

2012-
memset(&timer_capa, 0, sizeof(timer_capa));
20132009
ret = odp_timer_capability(clk_src, &timer_capa);
20142010
CU_ASSERT_FATAL(ret == 0);
20152011

@@ -2729,7 +2725,6 @@ static void timer_test_periodic_capa(void)
27292725
uint32_t num = 100;
27302726
odp_timer_clk_src_t clk_src = test_global->clk_src;
27312727

2732-
memset(&timer_capa, 0, sizeof(odp_timer_capability_t));
27332728
CU_ASSERT_FATAL(odp_timer_capability(clk_src, &timer_capa) == 0);
27342729
CU_ASSERT(timer_capa.periodic.max_pools);
27352730
CU_ASSERT(timer_capa.periodic.max_timers);
@@ -2886,7 +2881,6 @@ static void timer_test_periodic(odp_queue_type_t queue_type, int use_first, int
28862881
odp_fract_u64_t base_freq = {1000, 0, 0};
28872882
odp_timer_clk_src_t clk_src = test_global->clk_src;
28882883

2889-
memset(&timer_capa, 0, sizeof(odp_timer_capability_t));
28902884
CU_ASSERT_FATAL(odp_timer_capability(clk_src, &timer_capa) == 0);
28912885

28922886
CU_ASSERT_FATAL(timer_capa.periodic.max_pools);

0 commit comments

Comments
 (0)