nswap data dead since 2.4.xx kernels

diff --git a/Makefile b/Makefile
index ced7c48f5bf843c67446178835fe3ce058b6da65..50356a67425ab8b26934994ce9e507e7c0a64931 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,11 +69,11 @@ TARFILES := AUTHORS BUGS NEWS README TODO COPYING COPYING.LIB \
 # plus the top-level Makefile to make it work stand-alone.
 _TARFILES := Makefile
 
-CURSES := -I/usr/include/ncurses -lncurses
+CURSES := -lncurses
 
 # Preprocessor flags.
 PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
-CPPFLAGS :=
+CPPFLAGS     := -I/usr/include/ncurses
 ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
 
 # Left out -Wconversion due to noise in glibc headers.
@@ -84,16 +84,16 @@ ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
 # to compile procps, they might best be moved to CFLAGS.
 # On the other hand, they aren't normal -O -g things either.
 #
-PKG_CFLAGS := -fno-common -ffast-math \
+PKG_CFLAGS   := -fno-common -ffast-math \
   -W -Wall -Wshadow -Wcast-align -Wredundant-decls \
   -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return \
   -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS := -O2 -g3
-ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS)
+CFLAGS       := -O2 -g3
+ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS)
 
-PKG_LDFLAGS := -Wl,-warn-common
-LDFLAGS :=
-ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS)
+PKG_LDFLAGS  := -Wl,-warn-common
+LDFLAGS      :=
+ALL_LDFLAGS  := $(PKG_LDFLAGS) $(LDFLAGS)
 
 ############ Add some extra flags if gcc allows
 
@@ -104,7 +104,7 @@ ifneq ($(MAKECMDGOALS),extratar)
 # Unlike the kernel one, this check_gcc goes all the way to
 # producing an executable. There might be a -m64 that works
 # until you go looking for a 64-bit curses library.
-check_gcc = $(shell if $(CC) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
 
 ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
 ALL_CFLAGS += $(call check_gcc,-Wpadded,)

diff --git a/NEWS b/NEWS
index 8c8035be2560c66d65bfdc0d0d37cc65f58aa1c5..3656a5e154275f30b6223721e7d878b551326683 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+procps-3.2.1 --> procps-3.2.2
+
+avoid warning about -lncurses when not linking -- thanks FLWM
+
 procps-3.2.0 --> procps-3.2.1
 
 build even w/ curses in an odd location -- thanks to Segher Boessenkool

diff --git a/proc/readproc.c b/proc/readproc.c
index ecb689ca6072081fda4117484293eb2e2601b44e..5b427e65160c8b45526baee5678c85ceeb121878 100644 (file)
--- a/proc/readproc.c
+++ b/proc/readproc.c
@@ -325,7 +325,7 @@ ENTER(0x160);
        "%ld "
        "%lu %"KLF"u %"KLF"u %"KLF"u %"KLF"u %"KLF"u "
        "%*s %*s %*s %*s " /* discard, no RT signals & Linux 2.1 used hex */
-       "%"KLF"u %lu %lu "
+       "%"KLF"u %*lu %*lu "
        "%d %d "
        "%lu %lu",
        &P->state,
@@ -340,7 +340,7 @@ ENTER(0x160);
        &P->rss,
        &P->rss_rlim, &P->start_code, &P->end_code, &P->start_stack, &P->kstk_esp, &P->kstk_eip,
 /*     P->signal, P->blocked, P->sigignore, P->sigcatch,   */ /* can't use */
-       &P->wchan, &P->nswap, &P->cnswap,
+       &P->wchan, /* &P->nswap, &P->cnswap, */  /* nswap and cnswap dead for 2.4.xx and up */
 /* -- Linux 2.0.35 ends here -- */
        &P->exit_signal, &P->processor,  /* 2.2.1 ends with "exit_signal" */
 /* -- Linux 2.2.8 to 2.5.17 end here -- */

diff --git a/proc/readproc.h b/proc/readproc.h
index acc6164d3d8e0f8418a7f87fa4ba4c469eca1682..a08e47155144deddbd9221dc872186cf536ed457 100644 (file)
--- a/proc/readproc.h
+++ b/proc/readproc.h
@@ -22,7 +22,7 @@ EXTERN_C_BEGIN
 // s   signal, blocked, sigignore, sigcatch,
 // lu  flags, min_flt, cmin_flt, maj_flt, cmaj_flt, utime, stime,
 // lu  rss_rlim, start_code, end_code, start_stack, kstk_esp, kstk_eip,
-// lu  start_time, vsize, wchan, nswap, cnswap,
+// lu  start_time, vsize, wchan,
 
 // This is to help document a transition from pid to tgid/tid caused
 // by the introduction of thread support. It is used in cases where
@@ -98,9 +98,7 @@ typedef struct proc_t {
        min_flt,        // stat            number of minor page faults since process start
        maj_flt,        // stat            number of major page faults since process start
        cmin_flt,       // stat            cumulative min_flt of process and child processes
-       cmaj_flt,       // stat            cumulative maj_flt of process and child processes
-       nswap,          // stat            ?
-       cnswap;         // stat            cumulative nswap ?
+       cmaj_flt;       // stat            cumulative maj_flt of process and child processes
     unsigned KLONG
        start_code,     // stat            address of beginning of code segment
        end_code,       // stat            address of end of code segment

diff --git a/ps/output.c b/ps/output.c
index b56e1d949d0157f24ee047617cd329e217996d1e..1b4f87b4e57a067a412c3e38983b0a9482000b94 100644 (file)
--- a/ps/output.c
+++ b/ps/output.c
@@ -143,8 +143,6 @@ CMP_INT(min_flt)
 CMP_INT(maj_flt)
 CMP_INT(cmin_flt)
 CMP_INT(cmaj_flt)
-CMP_INT(nswap)
-CMP_INT(cnswap)
 CMP_INT(utime)
 CMP_INT(stime)    /* Old: sort by systime. New: show start time. Uh oh. */
 CMP_INT(start_code)
@@ -1051,7 +1049,7 @@ static const format_struct format_array[] = {
 {"cmaj_flt",  "-",       pr_nop,      sr_cmaj_flt, 1,  0,    LNX, AN|RIGHT},
 {"cmd",       "CMD",     pr_args,     sr_cmd,    16, ARG,    DEC, PO|UNLIMITED}, /*ucomm*/
 {"cmin_flt",  "-",       pr_nop,      sr_cmin_flt, 1,  0,    LNX, AN|RIGHT},
-{"cnswap",    "-",       pr_nop,      sr_cnswap,  1,   0,    LNX, AN|RIGHT},
+{"cnswap",    "-",       pr_nop,      sr_nop,     1,   0,    LNX, AN|RIGHT},
 {"comm",      "COMMAND", pr_comm,     sr_nop,    16, COM,    U98, PO|UNLIMITED}, /*ucomm*/
 {"command",   "COMMAND", pr_args,     sr_nop,    16, ARG,    XXX, PO|UNLIMITED}, /*args*/
 {"context",   "CONTEXT", pr_context,  sr_nop,    40,   0,    LNX, ET|LEFT},
@@ -1124,7 +1122,7 @@ static const format_struct format_array[] = {
 {"nlwp",      "NLWP",    pr_nlwp,     sr_nlwp,    4,   0,    SUN, AN|RIGHT},
 {"nsignals",  "NSIGS",   pr_nop,      sr_nop,     5,   0,    DEC, AN|RIGHT}, /*nsigs*/
 {"nsigs",     "NSIGS",   pr_nop,      sr_nop,     5,   0,    BSD, AN|RIGHT}, /*nsignals*/
-{"nswap",     "NSWAP",   pr_nop,      sr_nswap,   5,   0,    XXX, AN|RIGHT},
+{"nswap",     "NSWAP",   pr_nop,      sr_nop,     5,   0,    XXX, AN|RIGHT},
 {"nvcsw",     "VCSW",    pr_nop,      sr_nop,     5,   0,    XXX, AN|RIGHT},
 {"nwchan",    "WCHAN",   pr_nwchan,   sr_nop,     6,   0,    XXX, TO|RIGHT},
 {"opri",      "PRI",     pr_opri,     sr_priority, 3,  0,    SUN, TO|RIGHT},