rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug bug #547. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7491 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2014-11-08 17:41:11 +00:00
parent ac8c864dbe
commit 9f727e2394
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/rt/src/chevents.c
View File

@ -384,7 +384,7 @@ eventmask_t chEvtWaitOne(eventmask_t events) {
chSchGoSleepS(CH_STATE_WTOREVT); chSchGoSleepS(CH_STATE_WTOREVT);
m = ctp->p_epending & events; m = ctp->p_epending & events;
} }
m &= -m; m ^= m & (m - 1);
ctp->p_epending &= ~m; ctp->p_epending &= ~m;
chSysUnlock(); chSysUnlock();
@ -488,7 +488,7 @@ eventmask_t chEvtWaitOneTimeout(eventmask_t events, systime_t time) {
} }
m = ctp->p_epending & events; m = ctp->p_epending & events;
} }
m &= -m; m ^= m & (m - 1);
ctp->p_epending &= ~m; ctp->p_epending &= ~m;
chSysUnlock(); chSysUnlock();

32
test/rt/testevt.c
View File

@ -154,13 +154,15 @@ static void evt2_execute(void) {
/* /*
* Test on chEvtWaitOne() without wait. * Test on chEvtWaitOne() without wait.
*/ */
chEvtAddEvents(5); chEvtAddEvents(7);
m = chEvtWaitOne(ALL_EVENTS); m = chEvtWaitOne(ALL_EVENTS);
test_assert(1, m == 1, "single event error"); test_assert(1, m == 1, "single event error");
m = chEvtWaitOne(ALL_EVENTS); m = chEvtWaitOne(ALL_EVENTS);
test_assert(2, m == 4, "single event error"); test_assert(2, m == 2, "single event error");
m = chEvtWaitOne(ALL_EVENTS);
test_assert(3, m == 4, "single event error");
m = chEvtGetAndClearEvents(ALL_EVENTS); m = chEvtGetAndClearEvents(ALL_EVENTS);
test_assert(3, m == 0, "stuck event"); test_assert(4, m == 0, "stuck event");
/* /*
* Test on chEvtWaitOne() with wait. * Test on chEvtWaitOne() with wait.
@ -170,10 +172,10 @@ static void evt2_execute(void) {
threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1, threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1,
thread1, chThdGetSelfX()); thread1, chThdGetSelfX());
m = chEvtWaitOne(ALL_EVENTS); m = chEvtWaitOne(ALL_EVENTS);
test_assert_time_window(4, target_time, target_time + ALLOWED_DELAY); test_assert_time_window(5, target_time, target_time + ALLOWED_DELAY);
test_assert(5, m == 1, "single event error"); test_assert(6, m == 1, "single event error");
m = chEvtGetAndClearEvents(ALL_EVENTS); m = chEvtGetAndClearEvents(ALL_EVENTS);
test_assert(6, m == 0, "stuck event"); test_assert(7, m == 0, "stuck event");
test_wait_threads(); test_wait_threads();
/* /*
@ -181,9 +183,9 @@ static void evt2_execute(void) {
*/ */
chEvtAddEvents(5); chEvtAddEvents(5);
m = chEvtWaitAny(ALL_EVENTS); m = chEvtWaitAny(ALL_EVENTS);
test_assert(7, m == 5, "unexpected pending bit"); test_assert(8, m == 5, "unexpected pending bit");
m = chEvtGetAndClearEvents(ALL_EVENTS); m = chEvtGetAndClearEvents(ALL_EVENTS);
test_assert(8, m == 0, "stuck event"); test_assert(9, m == 0, "stuck event");
/* /*
* Test on chEvtWaitAny() with wait. * Test on chEvtWaitAny() with wait.
@ -193,10 +195,10 @@ static void evt2_execute(void) {
threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1, threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1,
thread1, chThdGetSelfX()); thread1, chThdGetSelfX());
m = chEvtWaitAny(ALL_EVENTS); m = chEvtWaitAny(ALL_EVENTS);
test_assert_time_window(9, target_time, target_time + ALLOWED_DELAY); test_assert_time_window(10, target_time, target_time + ALLOWED_DELAY);
test_assert(10, m == 1, "single event error"); test_assert(11, m == 1, "single event error");
m = chEvtGetAndClearEvents(ALL_EVENTS); m = chEvtGetAndClearEvents(ALL_EVENTS);
test_assert(11, m == 0, "stuck event"); test_assert(12, m == 0, "stuck event");
test_wait_threads(); test_wait_threads();
/* /*
@ -211,14 +213,14 @@ static void evt2_execute(void) {
threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1, threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriorityX() - 1,
thread2, "A"); thread2, "A");
m = chEvtWaitAll(5); m = chEvtWaitAll(5);
test_assert_time_window(12, target_time, target_time + ALLOWED_DELAY); test_assert_time_window(13, target_time, target_time + ALLOWED_DELAY);
m = chEvtGetAndClearEvents(ALL_EVENTS); m = chEvtGetAndClearEvents(ALL_EVENTS);
test_assert(13, m == 0, "stuck event"); test_assert(14, m == 0, "stuck event");
test_wait_threads(); test_wait_threads();
chEvtUnregister(&es1, &el1); chEvtUnregister(&es1, &el1);
chEvtUnregister(&es2, &el2); chEvtUnregister(&es2, &el2);
test_assert(14, !chEvtIsListeningI(&es1), "stuck listener"); test_assert(15, !chEvtIsListeningI(&es1), "stuck listener");
test_assert(15, !chEvtIsListeningI(&es2), "stuck listener"); test_assert(16, !chEvtIsListeningI(&es2), "stuck listener");
} }
ROMCONST struct testcase testevt2 = { ROMCONST struct testcase testevt2 = {