oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new fields nr_running', nr_tasks', `last_pid'. Added new fields

Browse Source 
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'.
This commit is contained in:
Martin Baulig
1998-08-16 13:40:01 +00:00
committed by Martin Baulig
parent 36657db940
commit b40e08fb74
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -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> 1998-08-12 Martin Baulig <martin@home-of-linux.org>
* include/glibtop/procsegment.h (glibtop_proc_segment): Using * include/glibtop/procsegment.h (glibtop_proc_segment): Using

10
examples/first.c
View File

@@ -122,10 +122,14 @@ main (int argc, char *argv [])
for (c = 0; c < PROFILE_COUNT; c++) for (c = 0; c < PROFILE_COUNT; c++)
glibtop_get_loadavg (&data.loadavg); 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, (unsigned long) data.loadavg.flags,
data.loadavg.loadavg [0], data.loadavg.loadavg [1], (double) data.loadavg.loadavg [0],
data.loadavg.loadavg [2]); (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++) for (c = 0; c < PROFILE_COUNT; c++)
glibtop_get_shm_limits (&data.shm_limits); glibtop_get_shm_limits (&data.shm_limits);

2
features.def
View File

@@ -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|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
void|swap|ulong(total,used,free,pagein,pageout) void|swap|ulong(total,used,free,pagein,pageout)
void|uptime|double(uptime,idletime) 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|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall)
void|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql) 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) void|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)

8
include/glibtop/loadavg.h
View File

@@ -28,8 +28,11 @@
__BEGIN_DECLS __BEGIN_DECLS
#define GLIBTOP_LOADAVG_LOADAVG 0 #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; typedef struct _glibtop_loadavg glibtop_loadavg;
@@ -37,6 +40,9 @@ struct _glibtop_loadavg
{ {
u_int64_t flags; u_int64_t flags;
double loadavg [3]; /* GLIBTOP_LOADAVG_LOADAVG */ 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) #define glibtop_get_loadavg(loadavg) glibtop_get_loadavg_l(glibtop_global_server, loadavg)

15
sysdeps/names/loadavg.c
View File

@@ -23,20 +23,27 @@
const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] = 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] = 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] = 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] = 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")
}; };