From b04c0c9f549784f53a60534faf549d70f3c88b31 Mon Sep 17 00:00:00 2001 From: Lvwenxuan <1666510747@qq.com> Date: Wed, 8 Jan 2025 20:45:20 +0800 Subject: [PATCH] =?UTF-8?q?#include=20"it=5Fpthread=5Ftest.h"=20//=20?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=B5=8B=E8=AF=95=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /* *************************************************************************** * Public Functions * ************************************************************************** */ // 定义全局变量用于存储当前线程的优先级、策略和测试线程计数 static int g_currThreadPri, g_currThreadPolicy; static int g_testPthredCount; // 线程函数，用于测试线程调度策略和优先级 static void *ThreadFuncTest2(void *arg) { (void)arg; // 未使用参数，避免编译器警告 int ret; // 存放函数返回值 int policy; // 存放调度策略 struct sched_param param = { 0 }; // 初始化调度参数结构体 pthread_t pthread = pthread_self(); // 获取当前线程ID g_testPthredCount++; // 测试线程计数加1 // 获取当前线程的调度策略和参数 ret = pthread_getschedparam(pthread, &policy, ¶m); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); // 检查返回值，如果不为0则跳转到EXIT标签 // 验证当前线程的优先级和策略是否与全局变量一致 ICUNIT_GOTO_EQUAL(g_currThreadPri, param.sched_priority, param.sched_priority, EXIT); ICUNIT_GOTO_EQUAL(g_currThreadPolicy, policy, policy, EXIT); // 验证是否创建了2个测试线程 ICUNIT_GOTO_EQUAL(g_testPthredCount, 2, g_testPthredCount, EXIT); EXIT: // 错误处理或正常退出的标签 return NULL; } // 另一个线程函数，用于测试SCHED_FIFO策略 static void *ThreadFuncTest3(void *arg) { (void)arg; // 未使用参数，避免编译器警告 int ret; // 存放函数返回值 int policy; // 存放调度策略 struct sched_param param = { 0 }; // 初始化调度参数结构体 pthread_t pthread = pthread_self(); // 获取当前线程ID g_testPthredCount++; // 测试线程计数加1 // 获取当前线程的调度策略和参数 ret = pthread_getschedparam(pthread, &policy, ¶m); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); // 检查返回值，如果不为0则跳转到EXIT标签 // 验证当前线程的优先级和策略是否与预期一致 ICUNIT_GOTO_EQUAL(g_currThreadPri, param.sched_priority, param.sched_priority, EXIT); ICUNIT_GOTO_EQUAL(policy, SCHED_FIFO, policy, EXIT); // 验证是否创建了4个测试线程 ICUNIT_GOTO_EQUAL(g_testPthredCount, 4, g_testPthredCount, EXIT); EXIT: // 错误处理或正常退出的标签 return NULL; } // 测试用例函数 static int Testcase() { struct sched_param param = { 0 }; // 初始化调度参数结构体 int ret; // 存放函数返回值 void *res = NULL; // 用于存放线程函数的返回值 pthread_attr_t a = { 0 }; // 初始化线程属性结构体（此处未使用） pthread_t newPthread, newPthread1; // 定义线程ID变量（注意：newPthread1未使用） g_testPthredCount = 0; // 初始化测试线程计数 // 获取当前线程的调度策略和参数 ret = pthread_getschedparam(pthread_self(), &g_currThreadPolicy, ¶m); ICUNIT_ASSERT_EQUAL(ret, 0, -ret); // 检查返回值 g_currThreadPri = param.sched_priority; // 保存当前线程的优先级 g_testPthredCount++; // 测试线程计数加1（此处应为初始化后的第一个操作，但计数逻辑稍显混乱） // 创建第一个测试线程 ret = pthread_create(&newPthread, NULL, ThreadFuncTest2, 0); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 // 等待第一个测试线程结束 ret = pthread_join(newPthread, &res); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 // 验证是否创建了2个测试线程（逻辑上应在此处验证，但前面已有验证） ICUNIT_ASSERT_EQUAL(g_testPthredCount, 2, g_testPthredCount); g_testPthredCount++; // 测试线程计数再加1，准备创建下一个线程 // 设置当前线程的调度策略为SCHED_FIFO，并设置优先级 param.sched_priority = g_currThreadPri; ret = pthread_setschedparam(pthread_self(), SCHED_FIFO, ¶m); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 // 尝试重新创建并使用已定义的newPthread变量（这里应使用不同的变量名以避免混淆） ret = pthread_create(&newPthread, NULL, ThreadFuncTest3, 0); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 // 等待第二个测试线程结束 ret = pthread_join(newPthread, &res); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 // 验证是否创建了4个测试线程（实际只创建了2个，此处逻辑有误） ICUNIT_ASSERT_EQUAL(g_testPthredCount, 4, g_testPthredCount); // 恢复当前线程的调度策略为SCHED_RR，并设置优先级 param.sched_priority = g_currThreadPri; ret = pthread_setschedparam(pthread_self(), SCHED_RR, ¶m); ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 检查返回值 return 0; // 测试用例结束 } // 注册测试用例到测试框架中 void ItTestPthread003(void) { TEST_ADD_CASE("IT_POSIX_PTHREAD_003", Testcase, TEST_POSIX, TEST_MEM, TEST_LEVEL0, TEST_FUNCTION); // 注册一个名为"IT_POSIX_PTHREAD_003"的测试用例，指定测试函数为Testcase，并设置相关测试属性 } --- .../basic/pthread/smoke/pthread_test_003.cpp | 147 ++++++++++-------- 1 file changed, 85 insertions(+), 62 deletions(-) diff --git a/kernel_liteos_a-master/testsuites/unittest/process/basic/pthread/smoke/pthread_test_003.cpp b/kernel_liteos_a-master/testsuites/unittest/process/basic/pthread/smoke/pthread_test_003.cpp index 5698c5b..d2eb4e3 100644 --- a/kernel_liteos_a-master/testsuites/unittest/process/basic/pthread/smoke/pthread_test_003.cpp +++ b/kernel_liteos_a-master/testsuites/unittest/process/basic/pthread/smoke/pthread_test_003.cpp @@ -28,100 +28,123 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "it_pthread_test.h" - +#include "it_pthread_test.h" // صͷļ + /* *************************************************************************** * Public Functions * ************************************************************************** */ - + +// ȫֱڴ洢ǰ̵߳ȼԺͲ̼߳ static int g_currThreadPri, g_currThreadPolicy; static int g_testPthredCount; + +// ̺߳ڲ̵߳ȲԺȼ static void *ThreadFuncTest2(void *arg) { - (void)arg; - int ret; - int policy; - struct sched_param param = { 0 }; - pthread_t pthread = pthread_self(); - - g_testPthredCount++; - + (void)arg; // δʹò + int ret; // źֵ + int policy; // ŵȲ + struct sched_param param = { 0 }; // ʼȲṹ + pthread_t pthread = pthread_self(); // ȡǰ߳ID + + g_testPthredCount++; // ̼߳1 + + // ȡǰ̵߳ĵȲԺͲ ret = pthread_getschedparam(pthread, &policy, ¶m); - ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); - + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); // 鷵ֵΪ0תEXITǩ + + // ֤ǰ̵߳ȼͲǷȫֱһ ICUNIT_GOTO_EQUAL(g_currThreadPri, param.sched_priority, param.sched_priority, EXIT); ICUNIT_GOTO_EQUAL(g_currThreadPolicy, policy, policy, EXIT); - ICUNIT_GOTO_EQUAL(g_testPthredCount, 2, g_testPthredCount, EXIT); // 2, here assert the result. -EXIT: + // ֤Ƿ񴴽2߳ + ICUNIT_GOTO_EQUAL(g_testPthredCount, 2, g_testPthredCount, EXIT); + +EXIT: // ˳ıǩ return NULL; } - + +// һ̺߳ڲSCHED_FIFO static void *ThreadFuncTest3(void *arg) { - (void)arg; - int ret; - int policy; - struct sched_param param = { 0 }; - pthread_t pthread = pthread_self(); - - g_testPthredCount++; - + (void)arg; // δʹò + int ret; // źֵ + int policy; // ŵȲ + struct sched_param param = { 0 }; // ʼȲṹ + pthread_t pthread = pthread_self(); // ȡǰ߳ID + + g_testPthredCount++; // ̼߳1 + + // ȡǰ̵߳ĵȲԺͲ ret = pthread_getschedparam(pthread, &policy, ¶m); - ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); - + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); // 鷵ֵΪ0תEXITǩ + + // ֤ǰ̵߳ȼͲǷԤһ ICUNIT_GOTO_EQUAL(g_currThreadPri, param.sched_priority, param.sched_priority, EXIT); ICUNIT_GOTO_EQUAL(policy, SCHED_FIFO, policy, EXIT); - ICUNIT_GOTO_EQUAL(g_testPthredCount, 4, g_testPthredCount, EXIT); // 4, here assert the result. - -EXIT: + // ֤Ƿ񴴽4߳ + ICUNIT_GOTO_EQUAL(g_testPthredCount, 4, g_testPthredCount, EXIT); + +EXIT: // ˳ıǩ return NULL; } - + +// static int Testcase() { - struct sched_param param = { 0 }; - int ret; - void *res = NULL; - pthread_attr_t a = { 0 }; - pthread_t newPthread, newPthread1; - - g_testPthredCount = 0; - + struct sched_param param = { 0 }; // ʼȲṹ + int ret; // źֵ + void *res = NULL; // ڴ̺߳ķֵ + pthread_attr_t a = { 0 }; // ʼ߳Խṹ壨˴δʹã + pthread_t newPthread, newPthread1; // ߳IDע⣺newPthread1δʹã + + g_testPthredCount = 0; // ʼ̼߳ + + // ȡǰ̵߳ĵȲԺͲ ret = pthread_getschedparam(pthread_self(), &g_currThreadPolicy, ¶m); - ICUNIT_ASSERT_EQUAL(ret, 0, -ret); - - g_currThreadPri = param.sched_priority; - - g_testPthredCount++; + ICUNIT_ASSERT_EQUAL(ret, 0, -ret); // 鷵ֵ + + g_currThreadPri = param.sched_priority; // 浱ǰ̵߳ȼ + + g_testPthredCount++; // ̼߳1˴ӦΪʼĵһ߼Իң + // һ߳ ret = pthread_create(&newPthread, NULL, ThreadFuncTest2, 0); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + // ȴһ߳̽ ret = pthread_join(newPthread, &res); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - - ICUNIT_ASSERT_EQUAL(g_testPthredCount, 2, g_testPthredCount); // 2, here assert the result. - g_testPthredCount++; - + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + // ֤Ƿ񴴽2̣߳߼Ӧڴ˴֤ǰ֤ + ICUNIT_ASSERT_EQUAL(g_testPthredCount, 2, g_testPthredCount); + g_testPthredCount++; // ̼߳ټ1׼һ߳ + + // õǰ̵߳ĵȲΪSCHED_FIFOȼ param.sched_priority = g_currThreadPri; ret = pthread_setschedparam(pthread_self(), SCHED_FIFO, ¶m); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + // ´ʹѶnewPthreadӦʹòͬıԱ ret = pthread_create(&newPthread, NULL, ThreadFuncTest3, 0); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + // ȴڶ߳̽ ret = pthread_join(newPthread, &res); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - - ICUNIT_ASSERT_EQUAL(g_testPthredCount, 4, g_testPthredCount); // 4, here assert the result. - + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + // ֤Ƿ񴴽4̣߳ʵֻ2˴߼ + ICUNIT_ASSERT_EQUAL(g_testPthredCount, 4, g_testPthredCount); + + // ָǰ̵߳ĵȲΪSCHED_RRȼ param.sched_priority = g_currThreadPri; ret = pthread_setschedparam(pthread_self(), SCHED_RR, ¶m); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - - return 0; + ICUNIT_ASSERT_EQUAL(ret, 0, ret); // 鷵ֵ + + return 0; // } - + +// עԿ void ItTestPthread003(void) { TEST_ADD_CASE("IT_POSIX_PTHREAD_003", Testcase, TEST_POSIX, TEST_MEM, TEST_LEVEL0, TEST_FUNCTION); + // עһΪ"IT_POSIX_PTHREAD_003"IJָԺΪTestcaseز }