Skip to content

Commit fb37ef3

Browse files
yangguangcai1xiaoxiang781216
authored andcommitted
test timer:change deviation to be pass as parameter.
Signed-off-by: yangguangcai <[email protected]>
1 parent 5dcfe93 commit fb37ef3

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

testing/drivertest/drivertest_posix_timer.c

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#define RTC_DEFAULT_DEVIATION 10
3838
#define DEFAULT_TIME_OUT 2
3939
#define SLEEPSECONDS 10
40-
#define COMEINCALLBACK 0
4140

4241
#define OPTARG_TO_VALUE(value, type, base) \
4342
do \
@@ -58,12 +57,8 @@
5857
struct posix_timer_state_s
5958
{
6059
struct itimerspec it;
61-
};
62-
63-
struct sigev_para_s
64-
{
65-
int tim;
66-
int interval;
60+
uint32_t tim;
61+
uint32_t deviation;
6762
};
6863

6964
/****************************************************************************
@@ -80,8 +75,9 @@ struct sigev_para_s
8075

8176
static void show_usage(FAR const char *progname, int exitcode)
8277
{
83-
printf("Usage: %s"
84-
" -s <timeout seconds>\n",
78+
printf("Usage: %s\n"
79+
" -s <timeout seconds>\n"
80+
" -a <timeout deviation>\n",
8581
progname);
8682

8783
exit(exitcode);
@@ -98,7 +94,7 @@ static void parse_commandline(
9894
int ch;
9995
int converted;
10096

101-
while ((ch = getopt(argc, argv, "s:")) != ERROR)
97+
while ((ch = getopt(argc, argv, "s:a:")) != ERROR)
10298
{
10399
switch (ch)
104100
{
@@ -114,6 +110,17 @@ static void parse_commandline(
114110
posix_timer_state->it.it_interval.tv_sec = (uint32_t)converted;
115111
break;
116112

113+
case 'a':
114+
OPTARG_TO_VALUE(converted, uint32_t, 10);
115+
if (converted < 0 || converted > INT_MAX)
116+
{
117+
printf("deviation out of range: %d\n", converted);
118+
show_usage(argv[0], EXIT_FAILURE);
119+
}
120+
121+
posix_timer_state->deviation = (uint32_t)converted;
122+
break;
123+
117124
case '?':
118125
printf("Unsupported option: %s\n", optarg);
119126
show_usage(argv[0], EXIT_FAILURE);
@@ -141,11 +148,14 @@ static uint32_t get_timestamp(void)
141148

142149
static void posix_timer_callback(union sigval arg)
143150
{
144-
FAR struct sigev_para_s *sigev_para = (struct sigev_para_s *)arg.sival_ptr;
151+
FAR struct posix_timer_state_s *sigev_para =
152+
(FAR struct posix_timer_state_s *)arg.sival_ptr;
145153
int range = get_timestamp() - (*sigev_para).tim;
154+
146155
assert_in_range(range,
147-
(*sigev_para).interval * 1000 - RTC_DEFAULT_DEVIATION,
148-
(*sigev_para).interval * 1000 + RTC_DEFAULT_DEVIATION);
156+
sigev_para->it.it_interval.tv_sec * 1000 - sigev_para->deviation,
157+
sigev_para->it.it_interval.tv_sec * 1000 + sigev_para->deviation);
158+
149159
syslog(LOG_DEBUG, "callback trigger!!!\n");
150160
(*sigev_para).tim = get_timestamp();
151161
}
@@ -159,7 +169,6 @@ static void test_case_posix_timer(FAR void **state)
159169
int ret;
160170
timer_t timerid;
161171
struct sigevent event;
162-
struct sigev_para_s sigev_para;
163172

164173
FAR struct posix_timer_state_s *posix_timer_state;
165174
struct itimerspec it;
@@ -170,7 +179,7 @@ static void test_case_posix_timer(FAR void **state)
170179
event.sigev_notify = SIGEV_THREAD;
171180
event.sigev_notify_function = posix_timer_callback;
172181
event.sigev_notify_attributes = NULL;
173-
event.sigev_value.sival_ptr = (struct sigev_para_s *)&sigev_para;
182+
event.sigev_value.sival_ptr = posix_timer_state;
174183

175184
/* Create the timer */
176185

@@ -182,8 +191,7 @@ static void test_case_posix_timer(FAR void **state)
182191
ret = timer_settime(timerid, 0, &(posix_timer_state->it), NULL);
183192
assert_return_code(ret, OK);
184193

185-
sigev_para.interval = posix_timer_state->it.it_interval.tv_sec;
186-
sigev_para.tim = get_timestamp();
194+
posix_timer_state->tim = get_timestamp();
187195

188196
/* Get the timer status */
189197

@@ -209,7 +217,8 @@ int main(int argc, FAR char *argv[])
209217
.it.it_value.tv_sec = DEFAULT_TIME_OUT,
210218
.it.it_value.tv_nsec = 0,
211219
.it.it_interval.tv_sec = DEFAULT_TIME_OUT,
212-
.it.it_interval.tv_nsec = 0
220+
.it.it_interval.tv_nsec = 0,
221+
.deviation = RTC_DEFAULT_DEVIATION
213222
};
214223

215224
const struct CMUnitTest tests[] =

0 commit comments

Comments
 (0)