diff options
| author | Martin Baulig <martin@home-of-linux.org> | 1998-08-16 13:40:01 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1998-08-16 13:40:01 +0000 |
| commit | b40e08fb74efa3027103a7e606028e64db3afa66 (patch) | |
| tree | 76bd91691ba1b2a41c83778cb3ca86cd9d02e7d0 | |
| parent | 36657db9409c20cbfa650f0a356194aea574eeae (diff) | |
| download | libgtop-b40e08fb74efa3027103a7e606028e64db3afa66.tar.gz | |
Added new fields `nr_running', `nr_tasks', `last_pid'. Added new fields
1998-08-16 Martin Baulig <martin@home-of-linux.org>
* include/glibtop/loadavg.h (glibtop_loadavg): Added new
fields `nr_running', `nr_tasks', `last_pid'.
* features.def (loadavg): Added new fields `nr_running',
`nr_tasks', `last_pid'.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | examples/first.c | 10 | ||||
| -rw-r--r-- | features.def | 2 | ||||
| -rw-r--r-- | include/glibtop/loadavg.h | 8 | ||||
| -rw-r--r-- | sysdeps/names/loadavg.c | 15 |
5 files changed, 33 insertions, 9 deletions
@@ -1,3 +1,10 @@ +1998-08-16 Martin Baulig <martin@home-of-linux.org> + + * include/glibtop/loadavg.h (glibtop_loadavg): Added new + fields `nr_running', `nr_tasks', `last_pid'. + * features.def (loadavg): Added new fields `nr_running', + `nr_tasks', `last_pid'. + 1998-08-12 Martin Baulig <martin@home-of-linux.org> * include/glibtop/procsegment.h (glibtop_proc_segment): Using diff --git a/examples/first.c b/examples/first.c index 3f9714d1..d6eb11ce 100644 --- a/examples/first.c +++ b/examples/first.c @@ -122,10 +122,14 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_loadavg (&data.loadavg); - printf ("Loadavg (0x%08lx): %f, %f, %f\n", + printf ("Loadavg (0x%08lx): %f, %f, %f - %lu, %lu, %lu\n", (unsigned long) data.loadavg.flags, - data.loadavg.loadavg [0], data.loadavg.loadavg [1], - data.loadavg.loadavg [2]); + (double) data.loadavg.loadavg [0], + (double) data.loadavg.loadavg [1], + (double) data.loadavg.loadavg [2], + (unsigned long) data.loadavg.nr_running, + (unsigned long) data.loadavg.nr_tasks, + (unsigned long) data.loadavg.last_pid); for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_shm_limits (&data.shm_limits); diff --git a/features.def b/features.def index 22be401c..0b982475 100644 --- a/features.def +++ b/features.def @@ -2,7 +2,7 @@ void|cpu|ulong(total,user,nice,sys,idle,frequency) void|mem|ulong(total,used,free,shared,buffer,cached,user,locked) void|swap|ulong(total,used,free,pagein,pageout) void|uptime|double(uptime,idletime) -void|loadavg|double(loadavg[0],loadavg[1],loadavg[2]) +void|loadavg|double(loadavg[0],loadavg[1],loadavg[2]):ulong(nr_running,nr_tasks,last_pid) void|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall) void|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql) void|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem) diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index f799fe40..9e0b7bc1 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -28,8 +28,11 @@ __BEGIN_DECLS #define GLIBTOP_LOADAVG_LOADAVG 0 +#define GLIBTOP_LOADAVG_NR_RUNNING 1 +#define GLIBTOP_LOADAVG_NR_TASKS 2 +#define GLIBTOP_LOADAVG_LAST_PID 3 -#define GLIBTOP_MAX_LOADAVG 1 +#define GLIBTOP_MAX_LOADAVG 4 typedef struct _glibtop_loadavg glibtop_loadavg; @@ -37,6 +40,9 @@ struct _glibtop_loadavg { u_int64_t flags; double loadavg [3]; /* GLIBTOP_LOADAVG_LOADAVG */ + u_int64_t nr_running, /* GLIBTOP_LOADAVG_NR_RUNNING */ + nr_tasks, /* GLIBTOP_LOADAVG_NR_TASKS */ + last_pid; /* GLIBTOP_LOADAVG_LAST_PID */ }; #define glibtop_get_loadavg(loadavg) glibtop_get_loadavg_l(glibtop_global_server, loadavg) diff --git a/sysdeps/names/loadavg.c b/sysdeps/names/loadavg.c index 46ea51a0..3ad73bef 100644 --- a/sysdeps/names/loadavg.c +++ b/sysdeps/names/loadavg.c @@ -23,20 +23,27 @@ const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] = { - "loadavg [3]" + "loadavg [3]", "nr_running", "nr_tasks", "last_pid" }; const unsigned glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] = { - GLIBTOP_TYPE_DOUBLE + GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_ULONG, + GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG }; const char *glibtop_labels_loadavg [GLIBTOP_MAX_LOADAVG] = { - N_("Load Average") + N_("Load Average"), + N_("Running Tasks"), + N_("Number of Tasks"), + N_("Last PID") }; const char *glibtop_descriptions_loadavg [GLIBTOP_MAX_LOADAVG] = { - N_("Number of jobs running simultaneously averaged over 1, 5 and 15 minutes") + N_("Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"), + N_("Number of tasks currently running"), + N_("Total number of tasks"), + N_("Last PID") }; |