OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  [PATCH] sched: fix up fs/proc/array.c whitespace problems
  [PATCH] sched: prettify prio_to_wmult[]
  [PATCH] sched: document prio_to_wmult[]
  [PATCH] sched: improve weight-array comments
  [PATCH] sched: remove dead code from task_stime()

Fixed up trivial conflict in fs/proc/array.c
This commit is contained in:
Linus Torvalds 2007-07-16 11:02:49 -07:00
parent add096909d 8ea0260668
commit 10b275ddfd
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/proc/array.c
View File

@ -62,6 +62,8 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/hugetlb.h> #include <linux/hugetlb.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
@ -76,9 +78,7 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/delayacct.h> #include <linux/delayacct.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/processor.h> #include <asm/processor.h>
#include "internal.h" #include "internal.h"
@ -87,10 +87,10 @@
do { memcpy(buffer, string, strlen(string)); \ do { memcpy(buffer, string, strlen(string)); \
buffer += strlen(string); } while (0) buffer += strlen(string); } while (0)
static inline char * task_name(struct task_struct *p, char * buf) static inline char *task_name(struct task_struct *p, char *buf)
{ {
int i; int i;
char * name; char *name;
char tcomm[sizeof(p->comm)]; char tcomm[sizeof(p->comm)];
get_task_comm(tcomm, p); get_task_comm(tcomm, p);
@ -138,7 +138,7 @@ static const char *task_state_array[] = {
"X (dead)" /* 32 */ "X (dead)" /* 32 */
}; };
static inline const char * get_task_state(struct task_struct *tsk) static inline const char *get_task_state(struct task_struct *tsk)
{ {
unsigned int state = (tsk->state & (TASK_RUNNING | unsigned int state = (tsk->state & (TASK_RUNNING |
TASK_INTERRUPTIBLE | TASK_INTERRUPTIBLE |
@ -156,7 +156,7 @@ static inline const char * get_task_state(struct task_struct *tsk)
return *p; return *p;
} }
static inline char * task_state(struct task_struct *p, char *buffer) static inline char *task_state(struct task_struct *p, char *buffer)
{ {
struct group_info *group_info; struct group_info *group_info;
int g; int g;
@ -191,15 +191,15 @@ static inline char * task_state(struct task_struct *p, char *buffer)
get_group_info(group_info); get_group_info(group_info);
task_unlock(p); task_unlock(p);
for (g = 0; g < min(group_info->ngroups,NGROUPS_SMALL); g++) for (g = 0; g < min(group_info->ngroups, NGROUPS_SMALL); g++)
buffer += sprintf(buffer, "%d ", GROUP_AT(group_info,g)); buffer += sprintf(buffer, "%d ", GROUP_AT(group_info, g));
put_group_info(group_info); put_group_info(group_info);
buffer += sprintf(buffer, "\n"); buffer += sprintf(buffer, "\n");
return buffer; return buffer;
} }
static char * render_sigset_t(const char *header, sigset_t *set, char *buffer) static char *render_sigset_t(const char *header, sigset_t *set, char *buffer)
{ {
int i, len; int i, len;
@ -239,7 +239,7 @@ static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
} }
} }
static inline char * task_sig(struct task_struct *p, char *buffer) static inline char *task_sig(struct task_struct *p, char *buffer)
{ {
unsigned long flags; unsigned long flags;
sigset_t pending, shpending, blocked, ignored, caught; sigset_t pending, shpending, blocked, ignored, caught;
@ -298,9 +298,9 @@ static inline char *task_context_switch_counts(struct task_struct *p,
p->nivcsw); p->nivcsw);
} }
int proc_pid_status(struct task_struct *task, char * buffer) int proc_pid_status(struct task_struct *task, char *buffer)
{ {
char * orig = buffer; char *orig = buffer;
struct mm_struct *mm = get_task_mm(task); struct mm_struct *mm = get_task_mm(task);
buffer = task_name(task, buffer); buffer = task_name(task, buffer);
@ -342,7 +342,7 @@ static clock_t task_utime(struct task_struct *p)
static clock_t task_stime(struct task_struct *p) static clock_t task_stime(struct task_struct *p)
{ {
clock_t stime = cputime_to_clock_t(p->stime); clock_t stime;
/* /*
* Use CFS's precise accounting. (we subtract utime from * Use CFS's precise accounting. (we subtract utime from
@ -354,8 +354,7 @@ static clock_t task_stime(struct task_struct *p)
return stime; return stime;
} }
static int do_task_stat(struct task_struct *task, char *buffer, int whole)
static int do_task_stat(struct task_struct *task, char * buffer, int whole)
{ {
unsigned long vsize, eip, esp, wchan = ~0UL; unsigned long vsize, eip, esp, wchan = ~0UL;
long priority, nice; long priority, nice;
@ -434,7 +433,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
} }
rcu_read_unlock(); rcu_read_unlock();
if (!whole || num_threads<2) if (!whole || num_threads < 2)
wchan = get_wchan(task); wchan = get_wchan(task);
if (!whole) { if (!whole) {
min_flt = task->min_flt; min_flt = task->min_flt;
@ -456,7 +455,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
/* convert nsec -> ticks */ /* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time); start_time = nsec_to_clock_t(start_time);
res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %u %lu \ res = sprintf(buffer, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n", %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n",
task->pid, task->pid,
@ -504,17 +503,17 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
task->rt_priority, task->rt_priority,
task->policy, task->policy,
(unsigned long long)delayacct_blkio_ticks(task)); (unsigned long long)delayacct_blkio_ticks(task));
if(mm) if (mm)
mmput(mm); mmput(mm);
return res; return res;
} }
int proc_tid_stat(struct task_struct *task, char * buffer) int proc_tid_stat(struct task_struct *task, char *buffer)
{ {
return do_task_stat(task, buffer, 0); return do_task_stat(task, buffer, 0);
} }
int proc_tgid_stat(struct task_struct *task, char * buffer) int proc_tgid_stat(struct task_struct *task, char *buffer)
{ {
return do_task_stat(task, buffer, 1); return do_task_stat(task, buffer, 1);
} }
@ -529,6 +528,6 @@ int proc_pid_statm(struct task_struct *task, char *buffer)
mmput(mm); mmput(mm);
} }
return sprintf(buffer,"%d %d %d %d %d %d %d\n", return sprintf(buffer, "%d %d %d %d %d %d %d\n",
size, resident, shared, text, lib, data, 0); size, resident, shared, text, lib, data, 0);
} }

27
kernel/sched.c
View File

@ -736,7 +736,9 @@ static void update_curr_load(struct rq *rq, u64 now)
* *
* The "10% effect" is relative and cumulative: from _any_ nice level, * The "10% effect" is relative and cumulative: from _any_ nice level,
* if you go up 1 level, it's -10% CPU usage, if you go down 1 level * if you go up 1 level, it's -10% CPU usage, if you go down 1 level
* it's +10% CPU usage. * it's +10% CPU usage. (to achieve that we use a multiplier of 1.25.
* If a task goes up by ~10% and another task goes down by ~10% then
* the relative distance between them is ~25%.)
*/ */
static const int prio_to_weight[40] = { static const int prio_to_weight[40] = {
/* -20 */ 88818, 71054, 56843, 45475, 36380, 29104, 23283, 18626, 14901, 11921, /* -20 */ 88818, 71054, 56843, 45475, 36380, 29104, 23283, 18626, 14901, 11921,
@ -746,15 +748,22 @@ static const int prio_to_weight[40] = {
/* 10 */ 110, 87, 70, 56, 45, 36, 29, 23, 18, 15, /* 10 */ 110, 87, 70, 56, 45, 36, 29, 23, 18, 15,
}; };
/*
* Inverse (2^32/x) values of the prio_to_weight[] array, precalculated.
*
* In cases where the weight does not change often, we can use the
* precalculated inverse to speed up arithmetics by turning divisions
* into multiplications:
*/
static const u32 prio_to_wmult[40] = { static const u32 prio_to_wmult[40] = {
48356, 60446, 75558, 94446, 118058, 147573, /* -20 */ 48356, 60446, 75558, 94446, 118058,
184467, 230589, 288233, 360285, 450347, /* -15 */ 147573, 184467, 230589, 288233, 360285,
562979, 703746, 879575, 1099582, 1374389, /* -10 */ 450347, 562979, 703746, 879575, 1099582,
1717986, 2147483, 2684354, 3355443, 4194304, /* -5 */ 1374389, 1717986, 2147483, 2684354, 3355443,
5244160, 6557201, 8196502, 10250518, 12782640, /* 0 */ 4194304, 5244160, 6557201, 8196502, 10250518,
16025997, 19976592, 24970740, 31350126, 39045157, /* 5 */ 12782640, 16025997, 19976592, 24970740, 31350126,
49367440, 61356675, 76695844, 95443717, 119304647, /* 10 */ 39045157, 49367440, 61356675, 76695844, 95443717,
148102320, 186737708, 238609294, 286331153, /* 15 */ 119304647, 148102320, 186737708, 238609294, 286331153,
}; };
static inline void static inline void