From 6ba229fa4ca61fded00e5d7eb9a4f95f1ae8e4c5 Mon Sep 17 00:00:00 2001 From: albert <> Date: Mon, 11 Aug 2003 01:59:53 +0000 Subject: [PATCH] alignment --- Makefile | 6 +++--- NEWS | 6 ++++++ proc/sysinfo.h | 18 +++++++++--------- procps.lsm | 8 ++++---- procps.spec | 2 +- top.h | 2 +- vmstat.c | 30 +++++++++++++++--------------- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 3095b343..9521ecc9 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ VERSION := 3 SUBVERSION := 1 -MINORVERSION := 11 -TARVERSION := 3.1.11 -LIBVERSION := 3.1.11 +MINORVERSION := 12 +TARVERSION := 3.1.12 +LIBVERSION := 3.1.12 ############ vars diff --git a/NEWS b/NEWS index 0476f0ec..cb8164fe 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +procps-3.1.11 --> procps-3.1.12 + +RPM generation handles /lib64 +WCHAN skips leading '.' +vmstat: numerous new features + procps-3.1.10 --> procps-3.1.11 compile with gcc 2.95 again (C99 issue) diff --git a/proc/sysinfo.h b/proc/sysinfo.h index 0930bfd2..f41237e8 100644 --- a/proc/sysinfo.h +++ b/proc/sysinfo.h @@ -89,20 +89,20 @@ extern unsigned long vm_allocstall; extern void vminfo(void); typedef struct disk_stat{ - unsigned int disk_type; - char disk_name [16]; - unsigned reads; - unsigned merged_reads; unsigned long long reads_sectors; - unsigned milli_reading; - unsigned writes; - unsigned merged_writes; unsigned long long written_sectors; - unsigned milli_writing; + char disk_name [16]; + unsigned int disk_type; unsigned inprogress_IO; + unsigned merged_reads; + unsigned merged_writes; + unsigned milli_reading; unsigned milli_spent_IO; - unsigned weighted_milli_spent_IO; + unsigned milli_writing; unsigned partitions; + unsigned reads; + unsigned weighted_milli_spent_IO; + unsigned writes; }disk_stat; typedef struct partition_stat{ diff --git a/procps.lsm b/procps.lsm index 3d1a2cfd..31912066 100644 --- a/procps.lsm +++ b/procps.lsm @@ -1,15 +1,15 @@ Begin4 Title: procps -Version: 3.1.11 -Entered-date: 2003-07-14 +Version: 3.1.12 +Entered-date: 2003-08-10 Description: Linux system utilities Keywords: procps /proc libproc sysctl pmap ps uptime tload free w top vmstat watch skill snice kill pgrep pkill Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc. Maintained-by: various Primary-site: http://procps.sf.net/ - 242kB procps-3.1.11.tar.gz + 242kB procps-3.1.12.tar.gz Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html - 242kB procps-3.1.11.tar.gz + 242kB procps-3.1.12.tar.gz Copying-policy: mixed End diff --git a/procps.spec b/procps.spec index ce9cf431..79f6f1a2 100644 --- a/procps.spec +++ b/procps.spec @@ -3,7 +3,7 @@ Summary: System and process monitoring utilities Name: procps %define major_version 3 %define minor_version 1 -%define revision 11 +%define revision 12 %define version %{major_version}.%{minor_version}.%{revision} Version: %{version} Release: 1 diff --git a/top.h b/top.h index 5a38b7e8..4c8bde91 100644 --- a/top.h +++ b/top.h @@ -185,8 +185,8 @@ typedef struct FLD_t { information from one frame to the next -- we don't calc and save data that goes unused like the old top! */ typedef struct HST_t { - int pid; TIC_t tics; + int pid; } HST_t; /* This structure stores a frame's cpu tics used in history diff --git a/vmstat.c b/vmstat.c index 4a6ecc78..8aa82df6 100644 --- a/vmstat.c +++ b/vmstat.c @@ -163,7 +163,7 @@ static void new_header(void){ //////////////////////////////////////////////////////////////////////////// -static void new_diskheader(void){ +static void diskheader(void){ printf("disk ----------reads------------ -----------writes----------- -------IO-------\n"); printf("%3s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s\n", " ", "total", "merged","sectors","ms","total","merged","sectors","ms","cur","s"); @@ -172,13 +172,13 @@ static void new_diskheader(void){ //////////////////////////////////////////////////////////////////////////// -static void new_diskpartition_header(const char *partition_name){ +static void diskpartition_header(const char *partition_name){ printf("%-10s %10s %10s %10s %10s\n",partition_name, "reads ", "read sectors", "writes ", "requested writes"); } //////////////////////////////////////////////////////////////////////////// -static void new_slabheader(void){ +static void slabheader(void){ printf("%-24s %6s %6s %6s %6s\n","Cache","Num", "Total", "Size", "Pages"); } @@ -290,7 +290,7 @@ static void new_format(void) { //////////////////////////////////////////////////////////////////////////// -static int new_diskpartition_format(const char* partition_name){ +static int diskpartition_format(const char* partition_name){ FILE *fDiskstat; struct disk_stat *disks; struct partition_stat *partitions, *current_partition=NULL; @@ -309,14 +309,14 @@ static int new_diskpartition_format(const char* partition_name){ if(!current_partition){ return -1; } - new_diskpartition_header(partition_name); + diskpartition_header(partition_name); printf (format, current_partition->reads,current_partition->reads_sectors,current_partition->writes,current_partition->requested_writes); fflush(stdout); free(disks); free(partitions); for(j=1; j