[PATCH] schedutils: cleanup ionice usage for idle class

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The idle class has no class data. It will print a warning if
a prio argument is given for it, since this will be ignored.
Output for idle class will not contain prio data.

Signed-off-by: Matthias Koenig <mkoenig@xxxxxxx>
---
 schedutils/ionice.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index ac72121..2d23dd0 100644
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -95,11 +95,11 @@ int main(int argc, char *argv[])
 		switch (c) {
 		case 'n':
 			ioprio = strtol(optarg, NULL, 10);
-			set = 1;
+			set |= 1;
 			break;
 		case 'c':
 			ioprio_class = strtol(optarg, NULL, 10);
-			set = 1;
+			set |= 2;
 			break;
 		case 'p':
 			pid = strtol(optarg, NULL, 10);
@@ -119,6 +119,8 @@ int main(int argc, char *argv[])
 		case IOPRIO_CLASS_BE:
 			break;
 		case IOPRIO_CLASS_IDLE:
+			if (set & 1)
+				printf("Ignoring given class data for idle class\n");
 			ioprio = 7;
 			break;
 		default:
@@ -136,8 +138,11 @@ int main(int argc, char *argv[])
 			perror("ioprio_get");
 		else {
 			ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT;
-			ioprio = ioprio & 0xff;
-			printf("%s: prio %d\n", to_prio[ioprio_class], ioprio);
+			if (ioprio_class != IOPRIO_CLASS_IDLE) {
+				ioprio = ioprio & 0xff;
+				printf("%s: prio %d\n", to_prio[ioprio_class], ioprio);
+			} else
+				printf("%s\n", to_prio[ioprio_class]);
 		}
 	} else {
 		if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) {
-- 
1.5.0.4.GIT

-
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux