3737#define WDOGTEST_RAND_ITER 1024
3838#define WDOGTEST_THREAD_NR 8
3939
40- #define wdtest_assert (x ) ASSERT(x )
40+ #define wdtest_assert (x ) _ASSERT(x, __ASSERT_FILE__, __ASSERT_LINE__ )
4141
4242#define wdtest_printf (...) printf(__VA_ARGS__)
4343
4848typedef struct wdtest_param_s
4949{
5050 uint64_t callback_cnt ;
51- clock_t triggerd_tick ;
51+ clock_t triggered_tick ;
5252} wdtest_param_t ;
5353
5454/****************************************************************************
@@ -63,8 +63,8 @@ static void wdtest_callback(wdparm_t param)
6363
6464 clock_gettime (CLOCK_MONOTONIC , & tp );
6565
66- wdtest_param -> callback_cnt += 1 ;
67- wdtest_param -> triggerd_tick = clock_time2ticks (& tp );
66+ wdtest_param -> callback_cnt += 1 ;
67+ wdtest_param -> triggered_tick = clock_time2ticks (& tp );
6868}
6969
7070static void wdtest_once (FAR struct wdog_s * wdog , FAR wdtest_param_t * param ,
@@ -79,12 +79,12 @@ static void wdtest_once(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
7979
8080 wdset_tick = clock_time2ticks (& tp );
8181 cnt = param -> callback_cnt ;
82- wdtest_assert (wd_start (wdog , NSEC2TICK (delay_ns ), wdtest_callback ,
82+ wdtest_assert (wd_start (wdog , NSEC2TICK (( clock_t ) delay_ns ), wdtest_callback ,
8383 (wdparm_t )param ) == OK );
8484 usleep (delay_ns / 1000 + 1 );
85- diff = (long )(param -> triggerd_tick - wdset_tick );
86- wdtest_printf ("wd_start with delay %ld ns, latency tick %ld\n" ,
87- (long )delay_ns , ( long )( diff - NSEC2TICK ( delay_ns )) );
85+ diff = (long )(param -> triggered_tick - wdset_tick );
86+ wdtest_printf ("wd_start with delay %ld ns, diff ticks %ld\n" ,
87+ (long )delay_ns , diff );
8888 wdtest_assert (cnt + 1 == param -> callback_cnt );
8989}
9090
@@ -214,7 +214,6 @@ static FAR void *wdog_test_thread(FAR void *param)
214214
215215void wdog_test (void )
216216{
217- int ret ;
218217 unsigned int thread_id ;
219218 pthread_attr_t attr ;
220219 pthread_t pthreads [WDOGTEST_THREAD_NR ];
@@ -225,30 +224,23 @@ void wdog_test(void)
225224
226225 printf ("wdog_test start...\n" );
227226
228- ret = pthread_attr_init (& attr );
229- if (ret )
230- {
231- wdtest_printf ("pthread_attr_init failed %d\n" , ret );
232- }
227+ wdtest_assert (pthread_attr_init (& attr ) == 0 );
233228
234229 /* Create wdog test thread */
235230
236231 for (thread_id = 0 ; thread_id < WDOGTEST_THREAD_NR ; thread_id ++ )
237232 {
238- pthread_create (& pthreads [thread_id ], & attr , wdog_test_thread ,
239- & params [thread_id ]);
233+ wdtest_assert (pthread_create (& pthreads [thread_id ], & attr ,
234+ wdog_test_thread , & params [thread_id ])
235+ == 0 );
240236 }
241237
242238 for (thread_id = 0 ; thread_id < WDOGTEST_THREAD_NR ; thread_id ++ )
243239 {
244240 pthread_join (pthreads [thread_id ], NULL );
245241 }
246242
247- ret = pthread_attr_destroy (& attr );
248- if (ret )
249- {
250- wdtest_printf ("pthread_attr_destroy failed %d\n" , ret );
251- }
243+ wdtest_assert (pthread_attr_destroy (& attr ) == 0 );
252244
253245 printf ("wdog_test end...\n" );
254246}
0 commit comments