Skip to content

Commit

Permalink
[PATCH] sched: fix up fs/proc/array.c whitespace problems
Browse files Browse the repository at this point in the history 
while changing task_stime() i noticed a whitespace style problem in
array.c - fix it. While at it, fix all the other style problems too,
most of them in the scheduler-stats related portions of array.c.

There is no change in functionality:

   text    data     bss     dec     hex filename
   4356      28       0    4384    1120 array.o-before
   4356      28       0    4384    1120 array.o-after

Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Ingo Molnar committed Jul 16, 2007
1 parent e4af30b commit 8ea0260
Showing 1 changed file with 25 additions and 26 deletions.
51 changes: 25 additions & 26 deletions fs/proc/array.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
#include <linux/mman.h>
#include <linux/proc_fs.h>
#include <linux/ioport.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/mm.h>
#include <linux/hugetlb.h>
#include <linux/pagemap.h>
Expand All @@ -76,9 +78,7 @@
#include <linux/rcupdate.h>
#include <linux/delayacct.h>

#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/processor.h>
#include "internal.h"

Expand All @@ -87,10 +87,10 @@
do { memcpy(buffer, string, strlen(string)); \
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;
char * name;
char *name;
char tcomm[sizeof(p->comm)];

get_task_comm(tcomm, p);
Expand Down Expand Up @@ -138,7 +138,7 @@ static const char *task_state_array[] = {
"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 |
TASK_INTERRUPTIBLE |
Expand All @@ -156,7 +156,7 @@ static inline const char * get_task_state(struct task_struct *tsk)
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;
int g;
Expand All @@ -172,8 +172,8 @@ static inline char * task_state(struct task_struct *p, char *buffer)
"Uid:\t%d\t%d\t%d\t%d\n"
"Gid:\t%d\t%d\t%d\t%d\n",
get_task_state(p),
p->tgid, p->pid,
pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0,
p->tgid, p->pid,
pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0,
pid_alive(p) && p->ptrace ? rcu_dereference(p->parent)->pid : 0,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
Expand All @@ -191,15 +191,15 @@ static inline char * task_state(struct task_struct *p, char *buffer)
get_group_info(group_info);
task_unlock(p);

for (g = 0; g < min(group_info->ngroups,NGROUPS_SMALL); g++)
buffer += sprintf(buffer, "%d ", GROUP_AT(group_info,g));
for (g = 0; g < min(group_info->ngroups, NGROUPS_SMALL); g++)
buffer += sprintf(buffer, "%d ", GROUP_AT(group_info, g));
put_group_info(group_info);

buffer += sprintf(buffer, "\n");
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;

Expand Down Expand Up @@ -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;
sigset_t pending, shpending, blocked, ignored, caught;
Expand Down Expand Up @@ -289,14 +289,14 @@ static inline char *task_cap(struct task_struct *p, char *buffer)
cap_t(p->cap_effective));
}

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);

buffer = task_name(task, buffer);
buffer = task_state(task, buffer);

if (mm) {
buffer = task_mem(mm, buffer);
mmput(mm);
Expand Down Expand Up @@ -344,16 +344,15 @@ static clock_t task_stime(struct task_struct *p)
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;
long priority, nice;
int tty_pgrp = -1, tty_nr = 0;
sigset_t sigign, sigcatch;
char state;
int res;
pid_t ppid = 0, pgid = -1, sid = -1;
pid_t ppid = 0, pgid = -1, sid = -1;
int num_threads = 0;
struct mm_struct *mm;
unsigned long long start_time;
Expand Down Expand Up @@ -424,7 +423,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
}
rcu_read_unlock();

if (!whole || num_threads<2)
if (!whole || num_threads < 2)
wchan = get_wchan(task);
if (!whole) {
min_flt = task->min_flt;
Expand All @@ -445,7 +444,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
/* convert nsec -> ticks */
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 %lu %lu %lu %d %d %u %u %llu\n",
task->pid,
Expand All @@ -471,7 +470,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
start_time,
vsize,
mm ? get_mm_rss(mm) : 0,
rsslim,
rsslim,
mm ? mm->start_code : 0,
mm ? mm->end_code : 0,
mm ? mm->start_stack : 0,
Expand All @@ -493,17 +492,17 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
task->rt_priority,
task->policy,
(unsigned long long)delayacct_blkio_ticks(task));
if(mm)
if (mm)
mmput(mm);
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);
}

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);
}
Expand All @@ -512,12 +511,12 @@ int proc_pid_statm(struct task_struct *task, char *buffer)
{
int size = 0, resident = 0, shared = 0, text = 0, lib = 0, data = 0;
struct mm_struct *mm = get_task_mm(task);

if (mm) {
size = task_statm(mm, &shared, &text, &data, &resident);
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);
}

0 comments on commit 8ea0260

Please sign in to comment.