patch-1.3.36 linux/fs/proc/array.c

• Lines: 36
• Date: Sat Oct 21 13:33:56 1995
• Orig file: v1.3.35/linux/fs/proc/array.c
• Orig date: Tue Oct 10 18:46:38 1995

diff -u --recursive --new-file v1.3.35/linux/fs/proc/array.c linux/fs/proc/array.c
@@ -405,6 +405,7 @@
 	struct task_struct ** p = get_task(pid), *tsk;
 	unsigned long sigignore=0, sigcatch=0, wchan;
 	unsigned long vsize, eip, esp;
+	long priority, nice;
 	int i,tty_pgrp;
 	char state;
 
@@ -445,6 +446,12 @@
 		tty_pgrp = tsk->tty->pgrp;
 	else
 		tty_pgrp = -1;
+
+	/* scale priority and nice values from timeslices to 0..40 */
+	priority = tsk->counter;
+	priority = (priority * 10 + 5) / DEF_PRIORITY;
+	nice = tsk->priority;
+	nice = (nice * 20 + 10) / DEF_PRIORITY;
 	return sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
 %lu %lu %lu %ld %ld %ld %ld %ld %ld %lu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu \
 %lu %lu %lu %lu\n",
@@ -465,10 +472,10 @@
 		tsk->stime,
 		tsk->cutime,
 		tsk->cstime,
-		tsk->counter,  /* this is the kernel priority ---
-				   subtract 30 in your user-level program. */
-		tsk->priority, /* this is the nice value ---
-				   subtract 15 in your user-level program. */
+		priority,  /* this is the kernel priority ---
+				   subtract 20 in your user-level program. */
+		nice,	   /* this is the nice value ---
+				   subtract 20 in your user-level program. */
 		tsk->timeout,
 		tsk->it_real_value,
 		tsk->start_time,