Reflect latest interface changes.
This commit is contained in:
@@ -38,6 +38,8 @@ int
|
||||
glibtop_init_cpu_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.cpu = _glibtop_sysdeps_cpu;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about cpu usage. */
|
||||
@@ -55,7 +57,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
|
||||
ret = table (TBL_SYSINFO, 0, (char *) &sysinfo, 1,
|
||||
sizeof (struct tbl_sysinfo));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags = _glibtop_sysdeps_cpu;
|
||||
|
||||
@@ -68,4 +70,6 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
|
||||
sysinfo.si_sys + sysinfo.si_idle;
|
||||
|
||||
buf->frequency = sysinfo.si_hz;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -36,6 +36,8 @@ int
|
||||
glibtop_init_loadavg_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides load averange. */
|
||||
@@ -53,7 +55,7 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
|
||||
ret = table (TBL_LOADAVG, 0, (char *) &loadavg, 1,
|
||||
sizeof (struct tbl_loadavg));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags = _glibtop_sysdeps_loadavg;
|
||||
|
||||
@@ -72,4 +74,6 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
|
||||
(double) loadavg.tl_avenrun.l [2] /
|
||||
(double) loadavg.tl_mach_factor [2];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -43,6 +43,8 @@ int
|
||||
glibtop_init_mem_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.mem = _glibtop_sysdeps_mem;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about memory usage. */
|
||||
@@ -68,4 +70,6 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
buf->total = (vmstats.active_count + vmstats.inactive_count +
|
||||
vmstats.free_count + vmstats.wire_count) *
|
||||
vmstats.pagesize;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -38,6 +38,8 @@ int
|
||||
glibtop_init_msg_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
@@ -54,7 +56,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
|
||||
ret = table (TBL_MSGINFO, MSGINFO_MAX, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMAX);
|
||||
|
||||
@@ -63,7 +65,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
|
||||
ret = table (TBL_MSGINFO, MSGINFO_MNB, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMNB);
|
||||
|
||||
@@ -72,7 +74,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
|
||||
ret = table (TBL_MSGINFO, MSGINFO_MNI, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMNI);
|
||||
|
||||
@@ -81,9 +83,11 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
|
||||
ret = table (TBL_MSGINFO, MSGINFO_TQL, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGTQL);
|
||||
|
||||
buf->msgtql = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -35,13 +35,18 @@ int
|
||||
glibtop_init_netload_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.netload = _glibtop_sysdeps_netload;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides Network statistics. */
|
||||
|
||||
int
|
||||
glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
|
||||
const char *interface)
|
||||
const char *interface, unsigned transport,
|
||||
unsigned protocol)
|
||||
{
|
||||
memset (buf, 0, sizeof (glibtop_netload));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -35,6 +35,8 @@ int
|
||||
glibtop_init_ppp_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.ppp = _glibtop_sysdeps_ppp;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides PPP/ISDN information. */
|
||||
@@ -43,4 +45,5 @@ int
|
||||
glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device)
|
||||
{
|
||||
memset (buf, 0, sizeof (glibtop_ppp));
|
||||
return 0;
|
||||
}
|
||||
|
@@ -36,14 +36,15 @@ int
|
||||
glibtop_init_proc_args_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_args = _glibtop_sysdeps_proc_args;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
char *
|
||||
glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
|
||||
pid_t pid, unsigned max_len)
|
||||
char **
|
||||
glibtop_get_proc_args_p (glibtop *server, glibtop_array *array, pid_t pid)
|
||||
{
|
||||
memset (buf, 0, sizeof (glibtop_proc_args));
|
||||
memset (array, 0, sizeof (glibtop_array));
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -38,6 +38,8 @@ int
|
||||
glibtop_init_sem_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about sysv sem limits. */
|
||||
@@ -54,7 +56,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_MNI, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMMNI);
|
||||
|
||||
@@ -64,7 +66,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_MSL, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMMSL);
|
||||
|
||||
@@ -74,7 +76,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_OPM, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMOPM);
|
||||
|
||||
@@ -84,7 +86,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_UME, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMUME);
|
||||
|
||||
@@ -94,7 +96,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_VMX, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMVMX);
|
||||
|
||||
@@ -104,9 +106,11 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
ret = table (TBL_SEMINFO, SEMINFO_AEM, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMAEM);
|
||||
|
||||
buf->semaem = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -37,6 +37,8 @@ int
|
||||
glibtop_init_shm_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
@@ -53,7 +55,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
|
||||
ret = table (TBL_SHMINFO, SHMINFO_MAX, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMAX);
|
||||
|
||||
@@ -63,7 +65,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
|
||||
ret = table (TBL_SHMINFO, SHMINFO_MIN, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMIN);
|
||||
|
||||
@@ -73,7 +75,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
|
||||
ret = table (TBL_SHMINFO, SHMINFO_MNI, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMNI);
|
||||
|
||||
@@ -83,9 +85,11 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
|
||||
ret = table (TBL_SHMINFO, SHMINFO_SEG, (char *) &value, 1,
|
||||
sizeof (value));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMSEG);
|
||||
|
||||
buf->shmseg = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -37,6 +37,8 @@ int
|
||||
glibtop_init_swap_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.swap = _glibtop_sysdeps_swap;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides information about swap usage. */
|
||||
@@ -63,4 +65,6 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
|
||||
buf->flags = _glibtop_sysdeps_swap;
|
||||
|
||||
buf->used = buf->total - buf->free;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -38,6 +38,8 @@ int
|
||||
glibtop_init_uptime_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.uptime = _glibtop_sysdeps_uptime;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provides uptime and idle time. */
|
||||
@@ -55,9 +57,11 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
|
||||
ret = table (TBL_SYSINFO, 0, (char *) &sysinfo, 1,
|
||||
sizeof (struct tbl_sysinfo));
|
||||
|
||||
if (ret != 1) return;
|
||||
if (ret != 1) return -1;
|
||||
|
||||
buf->uptime = (double) (time (NULL) - sysinfo.si_boottime);
|
||||
|
||||
buf->flags = _glibtop_sysdeps_uptime;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user