From patchwork Tue Dec 1 11:49:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "luofenglin (A)" X-Patchwork-Id: 1408788 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Clg8f1L4jz9sSf for ; Tue, 1 Dec 2020 22:38:26 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8DBA23C2F6D for ; Tue, 1 Dec 2020 12:38:23 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) by picard.linux.it (Postfix) with ESMTP id 9FEA63C4CEC for ; Tue, 1 Dec 2020 12:38:14 +0100 (CET) Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 67E7D10000C1 for ; Tue, 1 Dec 2020 12:38:12 +0100 (CET) Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Clg7p2whYz6v6L for ; Tue, 1 Dec 2020 19:37:42 +0800 (CST) Received: from linux-lmwb.huawei.com (10.175.103.112) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 19:38:00 +0800 From: Luo Fenglin To: Date: Tue, 1 Dec 2020 19:49:24 +0800 Message-ID: <1606823366-121520-1-git-send-email-luofenglin1@huawei.com> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 X-Originating-IP: [10.175.103.112] X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH 1/3] sched/sched_stress: Modify sched driver param to run long term testcases X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qiangqiang.wangqiang@huawei.com, luofenglin , claire.chenyue@huawei.com Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: luofenglin Add sched_driver process slots param to 10, then long term testcases can run. Additionally, add sched_driver run time 0.05 hour, long term testcases run 1/5 of total time. Signed-off-by: luofenglin --- testcases/kernel/sched/sched_stress/sched_driver.c | 6 +++++- testcases/kernel/sched/sched_stress/sched_stress.sh | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c index 61573d788..1bee9d130 100644 --- a/testcases/kernel/sched/sched_stress/sched_driver.c +++ b/testcases/kernel/sched/sched_stress/sched_driver.c @@ -202,8 +202,12 @@ int main(int argc, char **argv) /* * Start the long-term testcases running + * Run time set 1/5 of total */ - start_long_term_testcases(long_term_slot_total, argv[2]); + char run_long_term_time[20]; + int runlongtime = runseconds / 5; + sprintf(run_long_term_time, "%d", runlongtime); + start_long_term_testcases(long_term_slot_total, run_long_term_time); short_term_slot_total = workslots / 2; fflush(stdout); diff --git a/testcases/kernel/sched/sched_stress/sched_stress.sh b/testcases/kernel/sched/sched_stress/sched_stress.sh index 797d0601b..0205446a7 100755 --- a/testcases/kernel/sched/sched_stress/sched_stress.sh +++ b/testcases/kernel/sched/sched_stress/sched_stress.sh @@ -30,6 +30,7 @@ export KERNEL=./sched_datafile touch $KERNEL echo 0.000000 > sch.measure export RAWDEV=`df / | grep dev | awk {'print $1'}` -sched_driver -s 0.9 -t 0.02 -p 2 > /tmp/tmp$$ +echo "Result file: /tmp/tmp$$" +sched_driver -s 0.9 -t 0.05 -p 10 -d > /tmp/tmp$$ tail -n 5 /tmp/tmp$$ rm -rf /tmp/tmp$$ ./sched_datafile sch.measure From patchwork Tue Dec 1 11:49:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "luofenglin (A)" X-Patchwork-Id: 1408789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Clg8q1SNWz9sVq for ; Tue, 1 Dec 2020 22:38:34 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1C85B3C6382 for ; Tue, 1 Dec 2020 12:38:32 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) by picard.linux.it (Postfix) with ESMTP id 16DB23C4D33 for ; Tue, 1 Dec 2020 12:38:18 +0100 (CET) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 169CA600C6D for ; Tue, 1 Dec 2020 12:38:16 +0100 (CET) Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Clg7l3J3MzLsqZ for ; Tue, 1 Dec 2020 19:37:39 +0800 (CST) Received: from linux-lmwb.huawei.com (10.175.103.112) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 19:38:04 +0800 From: Luo Fenglin To: Date: Tue, 1 Dec 2020 19:49:25 +0800 Message-ID: <1606823366-121520-2-git-send-email-luofenglin1@huawei.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1606823366-121520-1-git-send-email-luofenglin1@huawei.com> References: <1606823366-121520-1-git-send-email-luofenglin1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.103.112] X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH 2/3] sched/sched_stress: Fixed param of sched_tc X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qiangqiang.wangqiang@huawei.com, luofenglin , claire.chenyue@huawei.com Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: luofenglin Rt flag of sched_tc must like "-pfixed" or "-pvariable" Signed-off-by: luofenglin --- .../kernel/sched/sched_stress/sched_driver.c | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) -- 2.17.1 diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c index 1bee9d130..475369b46 100644 --- a/testcases/kernel/sched/sched_stress/sched_driver.c +++ b/testcases/kernel/sched/sched_stress/sched_driver.c @@ -621,25 +621,28 @@ char *execution_time; /* runtime hours to pass to each testcase */ printf("long-term slots available: %d\n", long_term_slot_total); + char timeparam[30]; + sprintf(timeparam, "-t%s", execution_time); + for (i = 0; i < (long_term_slot_total / 4); i++) { #if defined(_IA64) && !defined(__64BIT__) - start_testcase("./sched_tc0.32", "sched_tc0 -t", execution_time, - " -p1", NULL, NULL); - start_testcase("./sched_tc2.32", "sched_tc2", execution_time, - "1", NULL, NULL); - start_testcase("./sched_tc0.32", "sched_tc0 -t", execution_time, - " -p0", NULL, NULL); - start_testcase("./sched_tc2.32", "sched_tc2", execution_time, - "0", NULL, NULL); + start_testcase("./sched_tc0.32", "sched_tc0", timeparam, + "-pfixed", "-d", NULL); + start_testcase("./sched_tc2.32", "sched_tc2", timeparam, + "-pfixed", "-d", NULL); + start_testcase("./sched_tc0.32", "sched_tc0", timeparam, + "-pvariable", "-d", NULL); + start_testcase("./sched_tc2.32", "sched_tc2", timeparam, + "-pvariable", "-d", NULL); #else - start_testcase("./sched_tc0", "sched_tc0 -t", execution_time, - " -p1", NULL, NULL); - start_testcase("./sched_tc2", "sched_tc2", execution_time, "1", - NULL, NULL); - start_testcase("./sched_tc0", "sched_tc0 -t", execution_time, - " -p0", NULL, NULL); - start_testcase("./sched_tc2", "sched_tc2", execution_time, "0", - NULL, NULL); + start_testcase("./sched_tc0", "sched_tc0", timeparam, + "-pfixed", "-d", NULL); + start_testcase("./sched_tc2", "sched_tc2", timeparam, "-pfixed", + "-d", NULL); + start_testcase("./sched_tc0", "sched_tc0", timeparam, + "-pvariable", "-d", NULL); + start_testcase("./sched_tc2", "sched_tc2", timeparam, "-pvariable", + "-d", NULL); #endif } } @@ -674,22 +677,22 @@ void start_short_term_testcases(int short_term_slot_total, for (i = 0; i < (short_term_slots / 4); i++) { #if defined(_IA64) && !defined(__64BIT__) - start_testcase("./sched_tc1.32", "sched_tc1", "1", NULL, NULL, + start_testcase("./sched_tc1.32", "sched_tc1", "-pfixed", "-d", NULL, NULL); - start_testcase("./sched_tc3.32", "sched_tc3", "1", NULL, NULL, + start_testcase("./sched_tc3.32", "sched_tc3", "-pfixed", "-d", NULL, NULL); - start_testcase("./sched_tc1.32", "sched_tc1", "0", NULL, NULL, + start_testcase("./sched_tc1.32", "sched_tc1", "-pvariable", "-d", NULL, NULL); - start_testcase("./sched_tc3.32", "sched_tc3", "0", NULL, NULL, + start_testcase("./sched_tc3.32", "sched_tc3", "-pvariable", "-d", NULL, NULL); #else - start_testcase("./sched_tc1", "sched_tc1", "1", NULL, NULL, + start_testcase("./sched_tc1", "sched_tc1", "-pfixed", "-d", NULL, NULL); - start_testcase("./sched_tc3", "sched_tc3", "1", NULL, NULL, + start_testcase("./sched_tc3", "sched_tc3", "-pfixed", "-d", NULL, NULL); - start_testcase("./sched_tc1", "sched_tc1", "0", NULL, NULL, + start_testcase("./sched_tc1", "sched_tc1", "-pvariable", "-d", NULL, NULL); - start_testcase("./sched_tc3", "sched_tc3", "0", NULL, NULL, + start_testcase("./sched_tc3", "sched_tc3", "-pvariable", "-d", NULL, NULL); #endif #if 0 From patchwork Tue Dec 1 11:49:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "luofenglin (A)" X-Patchwork-Id: 1408790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Clg8z1WSrz9sSf for ; Tue, 1 Dec 2020 22:38:43 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 815843C637C for ; Tue, 1 Dec 2020 12:38:40 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 4E02C3C591D for ; Tue, 1 Dec 2020 12:38:22 +0100 (CET) Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 2C9F320005C for ; Tue, 1 Dec 2020 12:38:20 +0100 (CET) Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Clg803xdJz6v6L for ; Tue, 1 Dec 2020 19:37:52 +0800 (CST) Received: from linux-lmwb.huawei.com (10.175.103.112) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 19:38:06 +0800 From: Luo Fenglin To: Date: Tue, 1 Dec 2020 19:49:26 +0800 Message-ID: <1606823366-121520-3-git-send-email-luofenglin1@huawei.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1606823366-121520-1-git-send-email-luofenglin1@huawei.com> References: <1606823366-121520-1-git-send-email-luofenglin1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.103.112] X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 3/3] sched/sched_stress: Bugfix for setting real time priority X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qiangqiang.wangqiang@huawei.com, luofenglin , claire.chenyue@huawei.com Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: luofenglin When real time flag is set, setpriority function is used for user-time policy setting, here use sched_setscheduler to set real time policy RR instead Signed-off-by: luofenglin --- testcases/kernel/sched/sched_stress/sched.h | 2 ++ testcases/kernel/sched/sched_stress/sched_tc0.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc1.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc2.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc3.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc4.c | 9 +++++---- testcases/kernel/sched/sched_stress/sched_tc5.c | 9 +++++---- testcases/kernel/sched/sched_stress/sched_tc6.c | 8 +++++--- 8 files changed, 41 insertions(+), 27 deletions(-) -- 2.17.1 diff --git a/testcases/kernel/sched/sched_stress/sched.h b/testcases/kernel/sched/sched_stress/sched.h index 8ed941eba..bcdecacc5 100644 --- a/testcases/kernel/sched/sched_stress/sched.h +++ b/testcases/kernel/sched/sched_stress/sched.h @@ -46,8 +46,10 @@ #include #include #include +#include #define DEFAULT_PRIORITY 70 +#define SET_RT_SCHEDULER(paraA, paraB, paraC) sched_setscheduler(paraA, paraB, paraC) #if 0 int openlog (char *); diff --git a/testcases/kernel/sched/sched_stress/sched_tc0.c b/testcases/kernel/sched/sched_stress/sched_tc0.c index 9acbc2f58..290ad1e63 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc0.c +++ b/testcases/kernel/sched/sched_stress/sched_tc0.c @@ -90,7 +90,9 @@ int verbose = 0; int debug = 0; long execution_time = DEFAULT_EXECUTION_TIME; char *priority = DEFAULT_PRIORITY_TYPE; - +struct sched_param param = { + .sched_priority = DEFAULT_PRIORITY +}; /*---------------------------------------------------------------------+ | main | | ==================================================================== | @@ -127,10 +129,10 @@ int main(int argc, char **argv) if (!strcmp(priority, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } diff --git a/testcases/kernel/sched/sched_stress/sched_tc1.c b/testcases/kernel/sched/sched_stress/sched_tc1.c index c771ef421..17d32cd9d 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc1.c +++ b/testcases/kernel/sched/sched_stress/sched_tc1.c @@ -72,7 +72,9 @@ void process_file(char *); void parse_args(int, char **); void signal_handler(); - +struct sched_param param = { + .sched_priority = DEFAULT_PRIORITY +}; /* * Global variables: * @@ -128,10 +130,10 @@ int main(int argc, char **argv) if (!strcmp(priority, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } diff --git a/testcases/kernel/sched/sched_stress/sched_tc2.c b/testcases/kernel/sched/sched_stress/sched_tc2.c index 1e2e3e629..ef90cfd2d 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc2.c +++ b/testcases/kernel/sched/sched_stress/sched_tc2.c @@ -47,7 +47,9 @@ #include #include #include "sched.h" - +struct sched_param param = { + .sched_priority = DEFAULT_PRIORITY +}; /* * Defines: * @@ -129,10 +131,10 @@ int main(int argc, char **argv) if (!strcmp(priority, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } diff --git a/testcases/kernel/sched/sched_stress/sched_tc3.c b/testcases/kernel/sched/sched_stress/sched_tc3.c index 8064e9eda..913662172 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc3.c +++ b/testcases/kernel/sched/sched_stress/sched_tc3.c @@ -95,7 +95,9 @@ int verbose = 0; int debug = 0; int signaled = 0; char *priority = DEFAULT_PRIORITY_TYPE; - +struct sched_param param = { + .sched_priority = DEFAULT_PRIORITY +}; /*---------------------------------------------------------------------+ | main | | ==================================================================== | @@ -131,10 +133,10 @@ int main(int argc, char **argv) if (!strcmp(priority, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } diff --git a/testcases/kernel/sched/sched_stress/sched_tc4.c b/testcases/kernel/sched/sched_stress/sched_tc4.c index 5bffb6478..81a8e170c 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc4.c +++ b/testcases/kernel/sched/sched_stress/sched_tc4.c @@ -99,7 +99,7 @@ int debug = 0; int priority = DEFAULT_PRIORITY; char *logfile = DEFAULT_LOGFILE; char *priority_type = DEFAULT_PRIORITY_TYPE; - +struct sched_param param; /*---------------------------------------------------------------------+ | main | | ==================================================================== | @@ -133,10 +133,11 @@ int main(int argc, char **argv) if (!strcmp(priority_type, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + param.sched_priority = priority; + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } else { if (nice((priority - 50) - (nice(0) + 20)) < 0 && errno != 0) diff --git a/testcases/kernel/sched/sched_stress/sched_tc5.c b/testcases/kernel/sched/sched_stress/sched_tc5.c index db5ce963c..c315f9ade 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc5.c +++ b/testcases/kernel/sched/sched_stress/sched_tc5.c @@ -95,7 +95,7 @@ int debug = 0; int priority = DEFAULT_PRIORITY; char *logfile = DEFAULT_LOGFILE; char *priority_type = DEFAULT_PRIORITY_TYPE; - +struct sched_param param; /*---------------------------------------------------------------------+ | main | | ==================================================================== | @@ -130,10 +130,11 @@ int main(int argc, char **argv) if (!strcmp(priority_type, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + param.sched_priority = priority; + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } else { if (nice((priority - 50) - (nice(0) + 20)) < 0 && errno != 0) diff --git a/testcases/kernel/sched/sched_stress/sched_tc6.c b/testcases/kernel/sched/sched_stress/sched_tc6.c index e70e8f250..20987f571 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc6.c +++ b/testcases/kernel/sched/sched_stress/sched_tc6.c @@ -117,6 +117,7 @@ char *logfile = DEFAULT_LOGFILE; char *priority_type = DEFAULT_PRIORITY_TYPE; struct flock flock_struct; struct flock *flock_ptr = &flock_struct; +struct sched_param param; int open_file(char *, int); @@ -163,10 +164,11 @@ int main(int argc, char **argv) if (!strcmp(priority_type, "fixed")) { #ifndef __linux__ if (setpri(0, DEFAULT_PRIORITY) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + sys_error("set rt pri failed", __FILE__, __LINE__); #else - if (setpriority(PRIO_PROCESS, 0, 0) < 0) - sys_error("setpri failed", __FILE__, __LINE__); + param.sched_priority = priority; + if (SET_RT_SCHEDULER(0, SCHED_RR, ¶m) < 0) + sys_error("set rt pri failed", __FILE__, __LINE__); #endif } else { if (nice((priority - 50) - (nice(0) + 20)) < 0 && errno != 0)