pwcache.h   pwcache.h 
#ifndef PROCPS_PROC_PWCACHE_H #ifndef PROCPS_PROC_PWCACHE_H
#define PROCPS_PROC_PWCACHE_H #define PROCPS_PROC_PWCACHE_H
#include <sys/types.h> #include <sys/types.h>
#include "procps.h" #include "procps.h"
EXTERN_C_BEGIN EXTERN_C_BEGIN
// used in pwcache and in readproc to set size of username or groupname // used in pwcache and in readproc to set size of username or groupname
#define P_G_SZ 20 #define P_G_SZ 33
extern char *user_from_uid(uid_t uid); extern char *user_from_uid(uid_t uid);
extern char *group_from_gid(gid_t gid); extern char *group_from_gid(gid_t gid);
EXTERN_C_END EXTERN_C_END
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 readproc.h   readproc.h 
skipping to change at line 173 skipping to change at line 173
tpgid, // stat terminal process group id tpgid, // stat terminal process group id
exit_signal, // stat might not be SIGCHLD exit_signal, // stat might not be SIGCHLD
processor; // stat current (or most recent?) CPU processor; // stat current (or most recent?) CPU
#ifdef OOMEM_ENABLE #ifdef OOMEM_ENABLE
int int
oom_score, // oom_score (badness for OOM killer) oom_score, // oom_score (badness for OOM killer)
oom_adj; // oom_adj (adjustment to OOM score) oom_adj; // oom_adj (adjustment to OOM score)
#endif #endif
long long
ns[NUM_NS]; // (ns subdir) inode number of namespaces ns[NUM_NS]; // (ns subdir) inode number of namespaces
#ifdef WITH_SYSTEMD
char
*sd_mach, // n/a systemd vm/container name
*sd_ouid, // n/a systemd session owner uid
*sd_seat, // n/a systemd login session seat
*sd_sess, // n/a systemd login session id
*sd_slice, // n/a systemd slice unit
*sd_unit, // n/a systemd system unit id
*sd_uunit; // n/a systemd user unit id
#endif
} proc_t; } proc_t;
// PROCTAB: data structure holding the persistent information readproc need s // PROCTAB: data structure holding the persistent information readproc need s
// from openproc(). The setup is intentionally similar to the dirent inter face // from openproc(). The setup is intentionally similar to the dirent inter face
// and other system table interfaces (utmp+wtmp come to mind). // and other system table interfaces (utmp+wtmp come to mind).
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
skipping to change at line 283 skipping to change at line 293
#define PROC_FILLUSR 0x0008 // resolve user id number -> user name #define PROC_FILLUSR 0x0008 // resolve user id number -> user name
#define PROC_FILLGRP 0x0010 // resolve group id number -> group nam e #define PROC_FILLGRP 0x0010 // resolve group id number -> group nam e
#define PROC_FILLSTATUS 0x0020 // read status #define PROC_FILLSTATUS 0x0020 // read status
#define PROC_FILLSTAT 0x0040 // read stat #define PROC_FILLSTAT 0x0040 // read stat
#define PROC_FILLWCHAN 0x0080 // look up WCHAN name #define PROC_FILLWCHAN 0x0080 // look up WCHAN name
#define PROC_FILLARG 0x0100 // alloc and fill in `cmdline' #define PROC_FILLARG 0x0100 // alloc and fill in `cmdline'
#define PROC_FILLCGROUP 0x0200 // alloc and fill in `cgroup` #define PROC_FILLCGROUP 0x0200 // alloc and fill in `cgroup`
#define PROC_FILLSUPGRP 0x0400 // resolve supplementary group id -> gr oup name #define PROC_FILLSUPGRP 0x0400 // resolve supplementary group id -> gr oup name
#define PROC_FILLOOM 0x0800 // fill in proc_t oom_score and oom_adj #define PROC_FILLOOM 0x0800 // fill in proc_t oom_score and oom_adj
#define PROC_FILLNS 0x8000 // fill in proc_t namespace information #define PROC_FILLNS 0x8000 // fill in proc_t namespace information
#define PROC_FILLSYSTEMD 0x80000 // fill in proc_t systemd information
#define PROC_LOOSE_TASKS 0x2000 // treat threads as if they were proces ses #define PROC_LOOSE_TASKS 0x2000 // treat threads as if they were proces ses
// Obsolete, consider only processes with one of the passed: // consider only processes with one of the passed:
#define PROC_PID 0x1000 // process id numbers ( 0 terminated ) #define PROC_PID 0x1000 // process id numbers ( 0 terminated )
#define PROC_UID 0x4000 // user id numbers ( length needed ) #define PROC_UID 0x4000 // user id numbers ( length needed )
#define PROC_EDITCGRPCVT 0x10000 // edit `cgroup' as single vector #define PROC_EDITCGRPCVT 0x10000 // edit `cgroup' as single vector
#define PROC_EDITCMDLCVT 0x20000 // edit `cmdline' as single vector #define PROC_EDITCMDLCVT 0x20000 // edit `cmdline' as single vector
#define PROC_EDITENVRCVT 0x40000 // edit `environ' as single vector #define PROC_EDITENVRCVT 0x40000 // edit `environ' as single vector
// it helps to give app code a few spare bits // it helps to give app code a few spare bits
#define PROC_SPARE_1 0x01000000 #define PROC_SPARE_1 0x01000000
#define PROC_SPARE_2 0x02000000 #define PROC_SPARE_2 0x02000000
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added


 sysinfo.h   sysinfo.h 
#ifndef PROC_SYSINFO_H #ifndef PROC_SYSINFO_H
#define PROC_SYSINFO_H #define PROC_SYSINFO_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/dir.h> #include <dirent.h>
#include "procps.h" #include "procps.h"
EXTERN_C_BEGIN EXTERN_C_BEGIN
extern unsigned long long Hertz; /* clock tick frequency */ extern unsigned long long Hertz; /* clock tick frequency */
extern long smp_num_cpus; /* number of CPUs */ extern long smp_num_cpus; /* number of CPUs */
extern int have_privs; /* boolean, true if setuid or similar */ extern int have_privs; /* boolean, true if setuid or similar */
extern long page_bytes; /* this architecture's bytes per page */
#if 0 #if 0
#define JT double #define JT double
extern void eight_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret, JT *w ret, JT *xret, JT *yret, JT *zret); extern void eight_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret, JT *w ret, JT *xret, JT *yret, JT *zret);
#undef JT #undef JT
#endif #endif
extern int uptime (double *uptime_secs, double *idle_secs); extern int uptime (double *uptime_secs, double *idle_secs);
extern unsigned long getbtime(void); extern unsigned long getbtime(void);
extern void loadavg(double *av1, double *av5, double *av15); extern void loadavg(double *av1, double *av5, double *av15);
/* obsolete */ /* Shmem in 2.6.32+ */
extern unsigned long kb_main_shared; extern unsigned long kb_main_shared;
/* old but still kicking -- the important stuff */ /* old but still kicking -- the important stuff */
extern unsigned long kb_main_buffers; extern unsigned long kb_main_buffers;
extern unsigned long kb_main_cached; extern unsigned long kb_main_cached;
extern unsigned long kb_main_free; extern unsigned long kb_main_free;
extern unsigned long kb_main_total; extern unsigned long kb_main_total;
extern unsigned long kb_swap_free; extern unsigned long kb_swap_free;
extern unsigned long kb_swap_total; extern unsigned long kb_swap_total;
/* recently introduced */ /* recently introduced */
extern unsigned long kb_high_free; extern unsigned long kb_high_free;
extern unsigned long kb_high_total; extern unsigned long kb_high_total;
extern unsigned long kb_low_free; extern unsigned long kb_low_free;
extern unsigned long kb_low_total; extern unsigned long kb_low_total;
extern unsigned long kb_main_available;
/* 2.4.xx era */ /* 2.4.xx era */
extern unsigned long kb_active; extern unsigned long kb_active;
extern unsigned long kb_inact_laundry; // grrr... extern unsigned long kb_inact_laundry; // grrr...
extern unsigned long kb_inact_dirty; extern unsigned long kb_inact_dirty;
extern unsigned long kb_inact_clean; extern unsigned long kb_inact_clean;
extern unsigned long kb_inact_target; extern unsigned long kb_inact_target;
extern unsigned long kb_swap_cached; /* late 2.4+ */ extern unsigned long kb_swap_cached; /* late 2.4+ */
/* derived values */ /* derived values */
extern unsigned long kb_swap_used; extern unsigned long kb_swap_used;
extern unsigned long kb_main_used; extern unsigned long kb_main_used;
skipping to change at line 74 skipping to change at line 76
extern void meminfo(void); extern void meminfo(void);
extern unsigned long vm_nr_dirty; extern unsigned long vm_nr_dirty;
extern unsigned long vm_nr_writeback; extern unsigned long vm_nr_writeback;
extern unsigned long vm_nr_pagecache; extern unsigned long vm_nr_pagecache;
extern unsigned long vm_nr_page_table_pages; extern unsigned long vm_nr_page_table_pages;
extern unsigned long vm_nr_reverse_maps; extern unsigned long vm_nr_reverse_maps;
extern unsigned long vm_nr_mapped; extern unsigned long vm_nr_mapped;
extern unsigned long vm_nr_slab; extern unsigned long vm_nr_slab;
extern unsigned long vm_nr_slab_reclaimable;
extern unsigned long vm_nr_slab_unreclaimable;
extern unsigned long vm_nr_active_file;
extern unsigned long vm_nr_inactive_file;
extern unsigned long vm_nr_free_pages;
extern unsigned long vm_pgpgin; extern unsigned long vm_pgpgin;
extern unsigned long vm_pgpgout; extern unsigned long vm_pgpgout;
extern unsigned long vm_pswpin; extern unsigned long vm_pswpin;
extern unsigned long vm_pswpout; extern unsigned long vm_pswpout;
extern unsigned long vm_pgalloc; extern unsigned long vm_pgalloc;
extern unsigned long vm_pgfree; extern unsigned long vm_pgfree;
extern unsigned long vm_pgactivate; extern unsigned long vm_pgactivate;
extern unsigned long vm_pgdeactivate; extern unsigned long vm_pgdeactivate;
extern unsigned long vm_pgfault; extern unsigned long vm_pgfault;
extern unsigned long vm_pgmajfault; extern unsigned long vm_pgmajfault;
 End of changes. 5 change blocks. 
2 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/