summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <martin@src.gnome.org>1998-12-08 18:52:00 +0000
committerMartin Baulig <martin@src.gnome.org>1998-12-08 18:52:00 +0000
commit2795790ab6cf4479d77e473738ccc442f0826c9a (patch)
tree0715f30dd4c9f5fb0798c826a2ac30f6c1c72b27
parent4ca23b4e0642ccff1d9473e828158968182d3fa2 (diff)
downloadlibgtop-2795790ab6cf4479d77e473738ccc442f0826c9a.tar.gz
Sync.
-rw-r--r--features.def4
-rw-r--r--sysdeps/names/sysdeps.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/features.def b/features.def
index 641a8384..a5645ed5 100644
--- a/features.def
+++ b/features.def
@@ -1,4 +1,4 @@
-void|cpu|ulong(total,user,nice,sys,idle,frequency)
+void|cpu|ulong(total,user,nice,sys,idle,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4])
void|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
void|swap|ulong(total,used,free,pagein,pageout)
void|uptime|double(uptime,idletime)
@@ -10,7 +10,7 @@ unsigned *|proclist|ulong(number,size,total)|long(which,arg)
void|proc_state|str(cmd):char(state):ulong(uid,gid)|pid_t(pid)
void|proc_uid|long(uid,euid,gid,egid,pid,ppid,pgrp,session,tty,tpgid,priority,nice)|pid_t(pid)
void|proc_mem|long(size,vsize,resident,share,rss,rss_rlim)|pid_t(pid)
-void|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real_value,frequency)|pid_t(pid)
+void|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real_value,frequency,xcpu_utime[4],xcpu_stime[4])|pid_t(pid)
void|proc_signal|ulong(signal[2],blocked[2],sigignore[2],sigcatch[2])|pid_t(pid)
void|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,nwchan):str(wchan)|pid_t(pid)
void|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_stack)|pid_t(pid)
diff --git a/sysdeps/names/sysdeps.c b/sysdeps/names/sysdeps.c
index 2359549a..022f643d 100644
--- a/sysdeps/names/sysdeps.c
+++ b/sysdeps/names/sysdeps.c
@@ -27,7 +27,7 @@ const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
"shm_limits", "msg_limits", "sem_limits", "proclist",
"proc_state", "proc_uid", "proc_mem", "proc_time",
"proc_signal", "proc_kernel", "proc_segment", "proc_map",
- "mountlist", "fsusage"
+ "mountlist", "fsusage", "netload", "ppp"
};
const unsigned glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
@@ -38,7 +38,8 @@ const unsigned glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
- GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+ GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+ GLIBTOP_TYPE_ULONG
};
const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
@@ -63,6 +64,8 @@ const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
N_("Process Memory Map"),
N_("Mount List"),
N_("File System Usage"),
+ N_("Network Load"),
+ N_("PPP Statistics")
};
const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
@@ -87,4 +90,6 @@ const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
N_("Process Memory Map"),
N_("List of currently mounted filesystems"),
N_("File System Usage"),
+ N_("Network Load"),
+ N_("PPP Statistics")
};