Skip to content

[utest]fix race in mutex tc & add recurse lock tc #9365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 3 commits into from
Sep 11, 2024
Merged

[utest]fix race in mutex tc & add recurse lock tc #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0461e3
fix race in mutex tc & add recurse lock tc
zmshahaha Aug 29, 2024
1a5f0f5
fix bug of thread exit without releasing mutex
zmshahaha Sep 6, 2024
4080834
fix ci
zmshahaha Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/apm32/apm32f030r8-miniboard/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')

BUILD = 'debug'
BUILD = 'release'

if PLATFORM == 'gcc':
# toolchains
Expand Down
2 changes: 1 addition & 1 deletion bsp/apm32/apm32f051r8-evalboard/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')

BUILD = 'debug'
BUILD = 'release'

if PLATFORM == 'gcc':
# toolchains
Expand Down
142 changes: 128 additions & 14 deletions examples/utest/testcases/kernel/mutex_tc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ static struct rt_mutex static_mutex;
static rt_mutex_t dynamic_mutex;
#endif /* RT_USING_HEAP */

static volatile int _sync_flag;

/* init test */
static void test_static_mutex_init(void)
{
Expand Down Expand Up @@ -72,11 +74,15 @@ static void static_mutex_take_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}

static void test_static_mutex_take(void)
{
rt_err_t result;

_sync_flag = 0;

result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
if (RT_EOK != result)
{
Expand Down Expand Up @@ -104,8 +110,10 @@ static void test_static_mutex_take(void)
/* startup thread take second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_detach(&static_mutex);
if (RT_EOK != result)
Expand All @@ -128,18 +136,24 @@ static void static_mutex_release_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}
static void test_static_mutex_release(void)
{
rt_err_t result;

_sync_flag = 0;

result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
if (RT_EOK != result)
{
uassert_true(RT_FALSE);
return;
}

result = rt_mutex_release(&static_mutex);
uassert_true(result < 0);

/* take mutex */
result = rt_mutex_take(&static_mutex, RT_WAITING_FOREVER);
if (RT_EOK != result)
Expand All @@ -165,8 +179,10 @@ static void test_static_mutex_release(void)
/* startup thread and take mutex second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_detach(&static_mutex);
if (RT_EOK != result)
Expand All @@ -188,11 +204,14 @@ static void static_mutex_trytake_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}
static void test_static_mutex_trytake(void)
{
rt_err_t result;

_sync_flag = 0;

result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
if (RT_EOK != result)
{
Expand Down Expand Up @@ -220,8 +239,10 @@ static void test_static_mutex_trytake(void)
/* startup thread and trytake mutex second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_detach(&static_mutex);
if (RT_EOK != result)
Expand Down Expand Up @@ -250,6 +271,7 @@ static void static_thread1_entry(void *param)
{
uassert_true(RT_TRUE);
}
_sync_flag++;
}

static void static_thread2_entry(void *param)
Expand All @@ -265,6 +287,7 @@ static void static_thread2_entry(void *param)
{
rt_mutex_release(mutex);
}
_sync_flag++;
}
static void static_thread3_entry(void *param)
{
Expand All @@ -282,6 +305,7 @@ static void static_thread3_entry(void *param)
while (rt_tick_get() - tick < (RT_TICK_PER_SECOND / 2));

rt_mutex_release(mutex);
_sync_flag++;
}

static void test_static_pri_reverse(void)
Expand All @@ -291,6 +315,8 @@ static void test_static_pri_reverse(void)
tid2 = RT_NULL;
tid3 = RT_NULL;

_sync_flag = 0;

result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
if (RT_EOK != result)
{
Expand Down Expand Up @@ -328,7 +354,10 @@ static void test_static_pri_reverse(void)
if (tid3 != RT_NULL)
rt_thread_startup(tid3);

rt_thread_mdelay(1000);
while (_sync_flag != 3)
{
rt_thread_mdelay(10);
}

result = rt_mutex_detach(&static_mutex);
if (RT_EOK != result)
Expand Down Expand Up @@ -385,11 +414,15 @@ static void dynamic_mutex_take_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}

static void test_dynamic_mutex_take(void)
{
rt_err_t result;

_sync_flag = 0;

dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_PRIO);
if (RT_NULL == dynamic_mutex)
{
Expand Down Expand Up @@ -417,8 +450,10 @@ static void test_dynamic_mutex_take(void)
/* startup thread take second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_delete(dynamic_mutex);
if (RT_EOK != result)
Expand All @@ -441,18 +476,23 @@ static void dynamic_mutex_release_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}
static void test_dynamic_mutex_release(void)
{
rt_err_t result;

_sync_flag = 0;
dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_PRIO);
if (RT_NULL == dynamic_mutex)
{
uassert_true(RT_FALSE);
return;
}

result = rt_mutex_release(dynamic_mutex);
uassert_true(result < 0);

/* take mutex */
result = rt_mutex_take(dynamic_mutex, RT_WAITING_FOREVER);
if (RT_EOK != result)
Expand All @@ -478,8 +518,10 @@ static void test_dynamic_mutex_release(void)
/* startup thread and take mutex second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_delete(dynamic_mutex);
if (RT_EOK != result)
Expand All @@ -501,11 +543,13 @@ static void dynamic_mutex_trytake_entry(void *param)
{
uassert_true(RT_FALSE);
}
_sync_flag++;
}
static void test_dynamic_mutex_trytake(void)
{
rt_err_t result;

_sync_flag = 0;
dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_PRIO);
if (RT_NULL == dynamic_mutex)
{
Expand Down Expand Up @@ -533,8 +577,10 @@ static void test_dynamic_mutex_trytake(void)
/* startup thread and trytake mutex second */
rt_thread_startup(tid);

/* let system schedule */
rt_thread_mdelay(5);
while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_delete(dynamic_mutex);
if (RT_EOK != result)
Expand All @@ -559,6 +605,7 @@ static void dynamic_thread1_entry(void *param)
{
uassert_true(RT_TRUE);
}
_sync_flag++;
}

static void dynamic_thread2_entry(void *param)
Expand All @@ -574,6 +621,7 @@ static void dynamic_thread2_entry(void *param)
{
rt_mutex_release(mutex);
}
_sync_flag++;
}
static void dynamic_thread3_entry(void *param)
{
Expand All @@ -591,6 +639,7 @@ static void dynamic_thread3_entry(void *param)
while (rt_tick_get() - tick < (RT_TICK_PER_SECOND / 2));

rt_mutex_release(mutex);
_sync_flag++;
}

static void test_dynamic_pri_reverse(void)
Expand All @@ -600,6 +649,7 @@ static void test_dynamic_pri_reverse(void)
tid2 = RT_NULL;
tid3 = RT_NULL;

_sync_flag = 0;
dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_PRIO);
if (RT_NULL == dynamic_mutex)
{
Expand Down Expand Up @@ -637,7 +687,10 @@ static void test_dynamic_pri_reverse(void)
if (tid3 != RT_NULL)
rt_thread_startup(tid3);

rt_thread_mdelay(1000);
while (_sync_flag != 3)
{
rt_thread_mdelay(10);
}

result = rt_mutex_delete(dynamic_mutex);
if (RT_EOK != result)
Expand All @@ -646,6 +699,66 @@ static void test_dynamic_pri_reverse(void)
uassert_true(RT_TRUE);
}

static void recursive_lock_test_entry(void *param)
{
rt_err_t result;
rt_mutex_t mutex = (rt_mutex_t)param;

result = rt_mutex_take(mutex, RT_WAITING_FOREVER);
uassert_true(result == RT_EOK);
uassert_true(_sync_flag == 0);
result = rt_mutex_take(mutex, RT_WAITING_FOREVER);
uassert_true(result == RT_EOK);
_sync_flag++;
}

static void test_recurse_lock(void)
{
rt_err_t result;

_sync_flag = 0;
result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
uassert_true(result == RT_EOK);

/* take mutex and not release */
result = rt_mutex_take(&static_mutex, RT_WAITING_FOREVER);
uassert_true(result == RT_EOK);

/* take mutex twice */
result = rt_mutex_take(&static_mutex, RT_WAITING_FOREVER);
uassert_true(result == RT_EOK);

rt_thread_t tid = rt_thread_create("mutex_th",
recursive_lock_test_entry,
&static_mutex,
THREAD_STACKSIZE,
10,
10);
_sync_flag = -1;

if (tid != RT_NULL)
rt_thread_startup(tid);

result = rt_mutex_release(&static_mutex);
uassert_true(result == RT_EOK);

_sync_flag = 0;

result = rt_mutex_release(&static_mutex);
uassert_true(result == RT_EOK);

while (_sync_flag != 1)
{
rt_thread_mdelay(10);
}

result = rt_mutex_take(&static_mutex, RT_WAITING_FOREVER);
uassert_true(result == RT_EOK);

result = rt_mutex_detach(&static_mutex);
uassert_true(result == RT_EOK);
}

static rt_err_t utest_tc_init(void)
{
#ifdef RT_USING_HEAP
Expand Down Expand Up @@ -678,6 +791,7 @@ static void testcase(void)
UTEST_UNIT_RUN(test_dynamic_mutex_trytake);
UTEST_UNIT_RUN(test_dynamic_pri_reverse);
#endif
UTEST_UNIT_RUN(test_recurse_lock);
}
UTEST_TC_EXPORT(testcase, "testcases.kernel.mutex_tc", utest_tc_init, utest_tc_cleanup, 1000);

Expand Down
2 changes: 1 addition & 1 deletion src/ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ static rt_err_t _rt_mutex_take(rt_mutex_t mutex, rt_int32_t timeout, int suspend

if (mutex->owner == thread)
{
if(mutex->hold < RT_MUTEX_HOLD_MAX)
if (mutex->hold < RT_MUTEX_HOLD_MAX)
{
/* it's the same thread */
mutex->hold ++;
Expand Down
Loading