Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

proc: switch /proc/loadavg to seq_file

and move it to fs/proc/loadavg.c while I'm at it.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

+52 -27
+1 -1
fs/proc/Makefile
··· 9 9 10 10 proc-y += inode.o root.o base.o generic.o array.o \ 11 11 proc_tty.o proc_misc.o 12 - 12 + proc-y += loadavg.o 13 13 proc-$(CONFIG_PROC_SYSCTL) += proc_sysctl.o 14 14 proc-$(CONFIG_NET) += proc_net.o 15 15 proc-$(CONFIG_PROC_KCORE) += kcore.o
+51
fs/proc/loadavg.c
··· 1 + #include <linux/fs.h> 2 + #include <linux/init.h> 3 + #include <linux/pid_namespace.h> 4 + #include <linux/proc_fs.h> 5 + #include <linux/sched.h> 6 + #include <linux/seq_file.h> 7 + #include <linux/seqlock.h> 8 + #include <linux/time.h> 9 + 10 + #define LOAD_INT(x) ((x) >> FSHIFT) 11 + #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) 12 + 13 + static int loadavg_proc_show(struct seq_file *m, void *v) 14 + { 15 + int a, b, c; 16 + unsigned long seq; 17 + 18 + do { 19 + seq = read_seqbegin(&xtime_lock); 20 + a = avenrun[0] + (FIXED_1/200); 21 + b = avenrun[1] + (FIXED_1/200); 22 + c = avenrun[2] + (FIXED_1/200); 23 + } while (read_seqretry(&xtime_lock, seq)); 24 + 25 + seq_printf(m, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n", 26 + LOAD_INT(a), LOAD_FRAC(a), 27 + LOAD_INT(b), LOAD_FRAC(b), 28 + LOAD_INT(c), LOAD_FRAC(c), 29 + nr_running(), nr_threads, 30 + task_active_pid_ns(current)->last_pid); 31 + return 0; 32 + } 33 + 34 + static int loadavg_proc_open(struct inode *inode, struct file *file) 35 + { 36 + return single_open(file, loadavg_proc_show, NULL); 37 + } 38 + 39 + static const struct file_operations loadavg_proc_fops = { 40 + .open = loadavg_proc_open, 41 + .read = seq_read, 42 + .llseek = seq_lseek, 43 + .release = single_release, 44 + }; 45 + 46 + static int __init proc_loadavg_init(void) 47 + { 48 + proc_create("loadavg", 0, NULL, &loadavg_proc_fops); 49 + return 0; 50 + } 51 + module_init(proc_loadavg_init);
-26
fs/proc/proc_misc.c
··· 57 57 #include <asm/div64.h> 58 58 #include "internal.h" 59 59 60 - #define LOAD_INT(x) ((x) >> FSHIFT) 61 - #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) 62 60 /* 63 61 * Warning: stuff below (imported functions) assumes that its output will fit 64 62 * into one page. For some of those functions it may be wrong. Moreover, we ··· 76 78 if (len>count) len = count; 77 79 if (len<0) len = 0; 78 80 return len; 79 - } 80 - 81 - static int loadavg_read_proc(char *page, char **start, off_t off, 82 - int count, int *eof, void *data) 83 - { 84 - int a, b, c; 85 - int len; 86 - unsigned long seq; 87 - 88 - do { 89 - seq = read_seqbegin(&xtime_lock); 90 - a = avenrun[0] + (FIXED_1/200); 91 - b = avenrun[1] + (FIXED_1/200); 92 - c = avenrun[2] + (FIXED_1/200); 93 - } while (read_seqretry(&xtime_lock, seq)); 94 - 95 - len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n", 96 - LOAD_INT(a), LOAD_FRAC(a), 97 - LOAD_INT(b), LOAD_FRAC(b), 98 - LOAD_INT(c), LOAD_FRAC(c), 99 - nr_running(), nr_threads, 100 - task_active_pid_ns(current)->last_pid); 101 - return proc_calc_metrics(page, start, off, count, eof, len); 102 81 } 103 82 104 83 static int uptime_read_proc(char *page, char **start, off_t off, ··· 836 861 char *name; 837 862 int (*read_proc)(char*,char**,off_t,int,int*,void*); 838 863 } *p, simple_ones[] = { 839 - {"loadavg", loadavg_read_proc}, 840 864 {"uptime", uptime_read_proc}, 841 865 {"meminfo", meminfo_read_proc}, 842 866 {"version", version_read_proc},