summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <martin@src.gnome.org>2000-01-12 20:08:31 +0000
committerMartin Baulig <martin@src.gnome.org>2000-01-12 20:08:31 +0000
commit8d532c6298f6755d716557ef820513e1940cbb59 (patch)
treeccd320040eb5ad6a2207458b6bc95f7f97e6fe68
parent50f0929ae861a7d75c5f8fb03d2c50109dc78b8b (diff)
downloadlibgtop-8d532c6298f6755d716557ef820513e1940cbb59.tar.gz
Reflect latest interface changes.
-rw-r--r--sysdeps/osf1/cpu.c6
-rw-r--r--sysdeps/osf1/loadavg.c6
-rw-r--r--sysdeps/osf1/mem.c4
-rw-r--r--sysdeps/osf1/msg_limits.c12
-rw-r--r--sysdeps/osf1/netload.c7
-rw-r--r--sysdeps/osf1/ppp.c3
-rw-r--r--sysdeps/osf1/procargs.c9
-rw-r--r--sysdeps/osf1/sem_limits.c16
-rw-r--r--sysdeps/osf1/shm_limits.c12
-rw-r--r--sysdeps/osf1/swap.c4
-rw-r--r--sysdeps/osf1/uptime.c6
11 files changed, 63 insertions, 22 deletions
diff --git a/sysdeps/osf1/cpu.c b/sysdeps/osf1/cpu.c
index 70d3bdf6..fdebff3c 100644
--- a/sysdeps/osf1/cpu.c
+++ b/sysdeps/osf1/cpu.c
@@ -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;
}
diff --git a/sysdeps/osf1/loadavg.c b/sysdeps/osf1/loadavg.c
index c7c80ec5..60f90cdd 100644
--- a/sysdeps/osf1/loadavg.c
+++ b/sysdeps/osf1/loadavg.c
@@ -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;
}
diff --git a/sysdeps/osf1/mem.c b/sysdeps/osf1/mem.c
index b3544db2..4f0aef36 100644
--- a/sysdeps/osf1/mem.c
+++ b/sysdeps/osf1/mem.c
@@ -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;
}
diff --git a/sysdeps/osf1/msg_limits.c b/sysdeps/osf1/msg_limits.c
index 498ad4a1..62083e82 100644
--- a/sysdeps/osf1/msg_limits.c
+++ b/sysdeps/osf1/msg_limits.c
@@ -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;
}
diff --git a/sysdeps/osf1/netload.c b/sysdeps/osf1/netload.c
index 308eb56a..1e2f7ec7 100644
--- a/sysdeps/osf1/netload.c
+++ b/sysdeps/osf1/netload.c
@@ -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;
}
diff --git a/sysdeps/osf1/ppp.c b/sysdeps/osf1/ppp.c
index 4f738ff2..84958472 100644
--- a/sysdeps/osf1/ppp.c
+++ b/sysdeps/osf1/ppp.c
@@ -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;
}
diff --git a/sysdeps/osf1/procargs.c b/sysdeps/osf1/procargs.c
index ed69b89c..980b0ba3 100644
--- a/sysdeps/osf1/procargs.c
+++ b/sysdeps/osf1/procargs.c
@@ -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;
}
diff --git a/sysdeps/osf1/sem_limits.c b/sysdeps/osf1/sem_limits.c
index 42a8a188..1bb10123 100644
--- a/sysdeps/osf1/sem_limits.c
+++ b/sysdeps/osf1/sem_limits.c
@@ -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;
}
diff --git a/sysdeps/osf1/shm_limits.c b/sysdeps/osf1/shm_limits.c
index 96db6c29..bcb97946 100644
--- a/sysdeps/osf1/shm_limits.c
+++ b/sysdeps/osf1/shm_limits.c
@@ -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;
}
diff --git a/sysdeps/osf1/swap.c b/sysdeps/osf1/swap.c
index dc39cbfe..52776c35 100644
--- a/sysdeps/osf1/swap.c
+++ b/sysdeps/osf1/swap.c
@@ -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;
}
diff --git a/sysdeps/osf1/uptime.c b/sysdeps/osf1/uptime.c
index 8b4c5ad2..875714ab 100644
--- a/sysdeps/osf1/uptime.c
+++ b/sysdeps/osf1/uptime.c
@@ -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;
}