emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into nls

Browse Source 
Conflicts:
	configure.ac
	pmap.c
	ps/Makefile.am
This commit is contained in:
Craig Small 2011-12-26 09:11:27 +11:00
commit a99002e3fe
9 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -32,8 +32,8 @@ pkill
pmap pmap
procps-ng-*.tar.gz procps-ng-*.tar.gz
proc/.depend proc/.depend
proc/libprocfs.la proc/libprocps.la
proc/libprocfs.pc proc/libprocps.pc
proc/Makefile proc/Makefile
proc/Makefile.in proc/Makefile.in
ps/Makefile ps/Makefile

2
Makefile.am
View File

@ -11,7 +11,7 @@ SUBDIRS = \
top top
AM_CFLAGS = -Iproc AM_CFLAGS = -Iproc
AM_LDFLAGS = ./proc/libprocfs.la AM_LDFLAGS = ./proc/libprocps.la
sbin_PROGRAMS = \ sbin_PROGRAMS = \
sysctl sysctl

2
configure.ac
View File

@ -193,7 +193,7 @@ AC_CONFIG_FILES([
lib/Makefile lib/Makefile
po/Makefile.in po/Makefile.in
proc/Makefile proc/Makefile
proc/libprocfs.pc proc/libprocps.pc
ps/Makefile ps/Makefile
testsuite/Makefile testsuite/Makefile
top/Makefile top/Makefile

4
pmap.c
View File

@ -160,6 +160,7 @@ static int one_proc(proc_t * p)
unsigned long total_shared = 0ul; unsigned long total_shared = 0ul;
unsigned long total_private_readonly = 0ul; unsigned long total_private_readonly = 0ul;
unsigned long total_private_writeable = 0ul; unsigned long total_private_writeable = 0ul;
KLONG diff = 0;
char *cp2 = NULL; char *cp2 = NULL;
unsigned long long rss = 0ull; unsigned long long rss = 0ull;
@ -213,7 +214,7 @@ static int one_proc(proc_t * p)
char flags[32]; char flags[32];
/* to clean up unprintables */ /* to clean up unprintables */
char *tmp; char *tmp;
unsigned KLONG start, end, diff = 0; unsigned KLONG start, end;
unsigned long long file_offset, inode; unsigned long long file_offset, inode;
unsigned dev_major, dev_minor; unsigned dev_major, dev_minor;
unsigned long long smap_value; unsigned long long smap_value;
@ -253,6 +254,7 @@ static int one_proc(proc_t * p)
/* reset some counters */ /* reset some counters */
rss = shared_dirty = private_dirty = rss = shared_dirty = private_dirty =
0ull; 0ull;
diff = 0;
continue; continue;
} }
/* Other keys */ /* Other keys */

26
proc/Makefile.am
View File

@ -1,27 +1,27 @@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
AM_CPPFLAGS = -include $(top_builddir)/config.h AM_CPPFLAGS = -include $(top_builddir)/config.h
LIBPROCFS_CURRENT=0 LIBprocps_CURRENT=0
LIBPROCFS_REVISION=0 LIBprocps_REVISION=0
LIBPROCFS_AGE=0 LIBprocps_AGE=0
lib_LTLIBRARIES = libprocfs.la lib_LTLIBRARIES = libprocps.la
libprocfs_ladir = $(ladir) libprocps_ladir = $(ladir)
libprocfs_la_LIBADD = $(LIB_KPARTS) libprocps_la_LIBADD = $(LIB_KPARTS)
libprocfs_la_LDFLAGS = \ libprocps_la_LDFLAGS = \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(all_libraries) \ $(all_libraries) \
-version-info $(LIBPROCFS_CURRENT):$(LIBPROCFS_REVISION):$(LIBPROCFS_AGE) \ -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
-no-undefined \ -no-undefined \
-Wl,--version-script=$(top_srcdir)/proc/libprocfs.sym -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
EXTRA_DIST = library.map EXTRA_DIST = library.map
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libprocfs.pc pkgconfig_DATA = libprocps.pc
libprocfs_la_SOURCES = \ libprocps_la_SOURCES = \
alloc.c \ alloc.c \
alloc.h \ alloc.h \
devname.c \ devname.c \
@ -46,8 +46,8 @@ libprocfs_la_SOURCES = \
whattime.c \ whattime.c \
whattime.h whattime.h
libprocfs_la_includedir = $(includedir)/proc/ libprocps_la_includedir = $(includedir)/proc/
libprocfs_la_include_HEADERS = \ libprocps_la_include_HEADERS = \
alloc.h \ alloc.h \
devname.h \ devname.h \
escape.h \ escape.h \

4
proc/libprocfs.pc.in → proc/libprocps.pc.in
View File

@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: libprocfs Name: libprocps
Description: Library to control and query process state Description: Library to control and query process state
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lprocfs Libs: -L${libdir} -lprocps
Libs.private: Libs.private:
Cflags: -I${includedir} Cflags: -I${includedir}

2
proc/libprocfs.sym → proc/libprocps.sym
View File

@ -1,4 +1,4 @@
LIBPROCFS_0 { LIBPROCPS_0 {
global: global:
Hertz; Hertz;
__cyg_profile_func_enter; __cyg_profile_func_enter;

2
ps/Makefile.am
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CFLAGS = -I../proc -I../include AM_CFLAGS = -I../proc -I../include
AM_LDFLAGS = ../proc/libprocfs.la AM_LDFLAGS = ../proc/libprocps.la
dist_man_MANS = ps.1 dist_man_MANS = ps.1

2
top/Makefile.am
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CFLAGS = -I../proc -I../include AM_CFLAGS = -I../proc -I../include
AM_LDFLAGS = ../proc/libprocfs.la AM_LDFLAGS = ../proc/libprocps.la
if WITH_NCURSES if WITH_NCURSES
usrbin_exec_PROGRAMS = \ usrbin_exec_PROGRAMS = \