From: gowrishankar <[email protected]> testpi-1 and testpi-2 are initializing mutex step by step which can be done by reusing the init_pi_mutex() funtion available in librttest.
Signed-off-by: Gowrishankar <[email protected]> Tested-by: Gowrishankar <[email protected]> Acked-by: Darren Hart <[email protected]> --- testcases/realtime/func/pi-tests/testpi-1.c | 22 +++------------------- testcases/realtime/func/pi-tests/testpi-2.c | 22 +++------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/testcases/realtime/func/pi-tests/testpi-1.c b/testcases/realtime/func/pi-tests/testpi-1.c index b503c0c..dc3c30b 100644 --- a/testcases/realtime/func/pi-tests/testpi-1.c +++ b/testcases/realtime/func/pi-tests/testpi-1.c @@ -199,8 +199,7 @@ void *func_noise(void *arg) */ int main(int argc, char *argv[]) { - pthread_mutexattr_t mutexattr; - int i, retc, protocol, nopi = 0; + int i, retc, nopi = 0; cpu_set_t mask; CPU_ZERO(&mask); CPU_SET(0, &mask); @@ -228,23 +227,8 @@ int main(int argc, char *argv[]) printf("Start %s\n", argv[0]); - if (!nopi) { - if (pthread_mutexattr_init(&mutexattr) != 0) - printf("Failed to init mutexattr\n"); - - if (pthread_mutexattr_setprotocol(&mutexattr,\ - PTHREAD_PRIO_INHERIT) != 0) - printf("Can't set protocol prio inherit\n"); - - if (pthread_mutexattr_getprotocol(&mutexattr, &protocol) != 0) - printf("Can't get mutexattr protocol\n"); - else - printf("protocol in mutexattr is %d\n", protocol); - - retc = pthread_mutex_init(&glob_mutex, &mutexattr); - if (retc != 0) - printf("Failed to init mutex: %d\n", retc); - } + if (!nopi) + init_pi_mutex(&glob_mutex); create_other_thread(func_nonrt, NULL); create_rr_thread(func_rt, NULL, 20); diff --git a/testcases/realtime/func/pi-tests/testpi-2.c b/testcases/realtime/func/pi-tests/testpi-2.c index 8e29e16..4220aba 100644 --- a/testcases/realtime/func/pi-tests/testpi-2.c +++ b/testcases/realtime/func/pi-tests/testpi-2.c @@ -200,8 +200,7 @@ void *func_noise(void *arg) */ int main(int argc, char *argv[]) { - pthread_mutexattr_t mutexattr; - int i, retc, protocol, nopi = 0; + int i, retc, nopi = 0; cpu_set_t mask; CPU_ZERO(&mask); CPU_SET(0, &mask); @@ -228,23 +227,8 @@ int main(int argc, char *argv[]) printf("Start %s\n", argv[0]); - if (!nopi) { - if (pthread_mutexattr_init(&mutexattr) != 0) - printf("Failed to init mutexattr\n"); - - if (pthread_mutexattr_setprotocol(&mutexattr,\ - PTHREAD_PRIO_INHERIT) != 0) - printf("Can't set protocol prio inherit\n"); - - if (pthread_mutexattr_getprotocol(&mutexattr, &protocol) != 0) - printf("Can't get mutexattr protocol\n"); - else - printf("protocol in mutexattr is %d\n", protocol); - - retc = pthread_mutex_init(&glob_mutex, &mutexattr); - if (retc != 0) - printf("Failed to init mutex: %d\n", retc); - } + if (!nopi) + init_pi_mutex(&glob_mutex); create_rr_thread(func_lowrt, NULL, 10); create_rr_thread(func_rt, NULL, 20); -- 1.7.1 ------------------------------------------------------------------------------ _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
