summaryrefslogtreecommitdiff
path: root/sysdeps/osf1
diff options
context:
space:
mode:
authorBenoît Dejean <bdejean@src.gnome.org>2004-06-09 18:52:22 +0000
committerBenoît Dejean <bdejean@src.gnome.org>2004-06-09 18:52:22 +0000
commit70b0925a826828e2fb7b683258f9c66eeb10142d (patch)
tree91865339a2378f177e2ad501a5d7e5c77a3fd19d /sysdeps/osf1
parentb0edf88ff7f414f5ada8397eb98553a1d67d0728 (diff)
downloadlibgtop-70b0925a826828e2fb7b683258f9c66eeb10142d.tar.gz
whitespace clean up.
* *.{c,h} : whitespace clean up.
Diffstat (limited to 'sysdeps/osf1')
-rw-r--r--sysdeps/osf1/cpu.c10
-rw-r--r--sysdeps/osf1/loadavg.c10
-rw-r--r--sysdeps/osf1/mem.c4
-rw-r--r--sysdeps/osf1/msg_limits.c20
-rw-r--r--sysdeps/osf1/open_suid.c16
-rw-r--r--sysdeps/osf1/procdata.c46
-rw-r--r--sysdeps/osf1/prockernel.c2
-rw-r--r--sysdeps/osf1/proclist.c30
-rw-r--r--sysdeps/osf1/procmem.c22
-rw-r--r--sysdeps/osf1/procsegment.c14
-rw-r--r--sysdeps/osf1/procsignal.c10
-rw-r--r--sysdeps/osf1/procstate.c22
-rw-r--r--sysdeps/osf1/proctime.c16
-rw-r--r--sysdeps/osf1/procuid.c48
-rw-r--r--sysdeps/osf1/sem_limits.c32
-rw-r--r--sysdeps/osf1/shm_limits.c30
-rw-r--r--sysdeps/osf1/swap.c4
-rw-r--r--sysdeps/osf1/uptime.c6
18 files changed, 171 insertions, 171 deletions
diff --git a/sysdeps/osf1/cpu.c b/sysdeps/osf1/cpu.c
index 680c11f8..b8ccfc85 100644
--- a/sysdeps/osf1/cpu.c
+++ b/sysdeps/osf1/cpu.c
@@ -45,23 +45,23 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
{
struct tbl_sysinfo sysinfo;
int ret;
-
+
glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
memset (buf, 0, sizeof (glibtop_cpu));
-
+
ret = table (TBL_SYSINFO, 0, (char *) &sysinfo, 1,
- sizeof (struct tbl_sysinfo));
+ sizeof (struct tbl_sysinfo));
if (ret != 1) return;
buf->flags = _glibtop_sysdeps_cpu;
-
+
buf->user = sysinfo.si_user;
buf->nice = sysinfo.si_nice;
buf->sys = sysinfo.si_sys;
buf->idle = sysinfo.si_idle;
-
+
buf->total = sysinfo.si_user + sysinfo.si_nice +
sysinfo.si_sys + sysinfo.si_idle;
diff --git a/sysdeps/osf1/loadavg.c b/sysdeps/osf1/loadavg.c
index abf88ec7..3220492c 100644
--- a/sysdeps/osf1/loadavg.c
+++ b/sysdeps/osf1/loadavg.c
@@ -47,24 +47,24 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
glibtop_init_s (&server, GLIBTOP_SYSDEPS_LOADAVG, 0);
memset (buf, 0, sizeof (glibtop_loadavg));
-
+
ret = table (TBL_LOADAVG, 0, (char *) &loadavg, 1,
- sizeof (struct tbl_loadavg));
+ sizeof (struct tbl_loadavg));
if (ret != 1) return;
buf->flags = _glibtop_sysdeps_loadavg;
-
+
if (loadavg.tl_lscale == 0) {
buf->loadavg [0] = loadavg.tl_avenrun.d [0];
buf->loadavg [1] = loadavg.tl_avenrun.d [1];
buf->loadavg [2] = loadavg.tl_avenrun.d [2];
} else {
- buf->loadavg [0] =
+ buf->loadavg [0] =
(double) loadavg.tl_avenrun.l [0] /
(double) loadavg.tl_mach_factor [0];
buf->loadavg [1] =
- (double) loadavg.tl_avenrun.l [1]
+ (double) loadavg.tl_avenrun.l [1]
/ (double) loadavg.tl_mach_factor [1];
buf->loadavg [2] =
(double) loadavg.tl_avenrun.l [2] /
diff --git a/sysdeps/osf1/mem.c b/sysdeps/osf1/mem.c
index d76e595c..b1010589 100644
--- a/sysdeps/osf1/mem.c
+++ b/sysdeps/osf1/mem.c
@@ -55,14 +55,14 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
memset (buf, 0, sizeof (glibtop_mem));
buf->flags = _glibtop_sysdeps_mem;
-
+
(void) vm_statistics(task_self(), &vmstats);
buf->free = vmstats.free_count * vmstats.pagesize;
buf->used = vmstats.active_count * vmstats.pagesize;
/* [FIXME]: Is this correct? */
-
+
buf->total = (vmstats.active_count + vmstats.inactive_count +
vmstats.free_count + vmstats.wire_count) *
vmstats.pagesize;
diff --git a/sysdeps/osf1/msg_limits.c b/sysdeps/osf1/msg_limits.c
index 2b198963..2d73bf92 100644
--- a/sysdeps/osf1/msg_limits.c
+++ b/sysdeps/osf1/msg_limits.c
@@ -27,7 +27,7 @@
static const unsigned long _glibtop_sysdeps_msg_limits =
(1L << GLIBTOP_IPC_MSGMAP) + (1L << GLIBTOP_IPC_MSGMAX) +
-(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGMNI) +
+(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGMNI) +
(1L << GLIBTOP_IPC_MSGTQL);
/* Init function. */
@@ -48,36 +48,36 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
glibtop_init_s (&server, 0, 0);
memset (buf, 0, sizeof (glibtop_msg_limits));
-
+
ret = table (TBL_MSGINFO, MSGINFO_MAX, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
-
+
buf->flags += (1L << GLIBTOP_IPC_MSGMAX);
buf->msgmax = value;
-
+
ret = table (TBL_MSGINFO, MSGINFO_MNB, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_MSGMNB);
buf->msgmnb = value;
-
+
ret = table (TBL_MSGINFO, MSGINFO_MNI, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_MSGMNI);
buf->msgmni = value;
-
+
ret = table (TBL_MSGINFO, MSGINFO_TQL, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
diff --git a/sysdeps/osf1/open_suid.c b/sysdeps/osf1/open_suid.c
index d593556a..95f9d360 100644
--- a/sysdeps/osf1/open_suid.c
+++ b/sysdeps/osf1/open_suid.c
@@ -47,7 +47,7 @@ glibtop_init_p (glibtop *server, const unsigned long features,
for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
(*init_fkt) (server);
-
+
server->flags |= _GLIBTOP_INIT_STATE_INIT;
}
}
@@ -61,7 +61,7 @@ glibtop_open_p (glibtop *server, const char *program_name,
/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
server->name = program_name;
-
+
server->machine.uid = getuid ();
server->machine.euid = geteuid ();
server->machine.gid = getgid ();
@@ -69,22 +69,22 @@ glibtop_open_p (glibtop *server, const char *program_name,
server->machine.proctable_entries = table
(TBL_PROCINFO, 0, NULL, INT_MAX, 0);
-
+
/* Drop priviledges; we only become root when necessary.
-
+
setreuid (ruid, euid) - set real and effective user id;
setregid (rgid, egid) - set real and effective group id;
-
+
*/
-
+
if (setreuid (server->machine.euid, server->machine.uid))
_exit (1);
-
+
if (setregid (server->machine.egid, server->machine.gid))
_exit (1);
/* !!! END OF SUID ROOT PART !!! */
-
+
/* Our effective uid is now those of the user invoking the server,
so we do no longer have any priviledges.
*/
diff --git a/sysdeps/osf1/procdata.c b/sysdeps/osf1/procdata.c
index e82e64fa..952187a9 100644
--- a/sysdeps/osf1/procdata.c
+++ b/sysdeps/osf1/procdata.c
@@ -66,9 +66,9 @@ glibtop_get_procdata_r (glibtop *server, glibtop_procdata *buf, pid_t pid)
glibtop_init ();
memset (buf, 0, sizeof (glibtop_procdata));
-
+
ret = table (TBL_PROCINFO, pid, (char *) &procinfo, 1,
- sizeof (struct tbl_procinfo));
+ sizeof (struct tbl_procinfo));
if (ret != 1) return;
@@ -85,63 +85,63 @@ glibtop_get_procdata_r (glibtop *server, glibtop_procdata *buf, pid_t pid)
buf->sigignore = procinfo.pi_sigignore;
buf->sigcatch = procinfo.pi_sigcatch;
buf->signal = procinfo.pi_sig;
-
+
buf->flags [0] += _glibtop_sysdeps_procdata_0;
-
+
if (procinfo.pi_status != PI_ACTIVE) return;
-
+
/* From that point on, we are only interested in active processes. */
-
+
buf->nice = getpriority (PRIO_PROCESS, pid);
-
+
/* Get task structure. */
-
+
ret = task_by_unix_pid (task_self(), procinfo.pi_pid, &thistask);
-
+
if (ret != KERN_SUCCESS) return;
-
+
/* Get taskinfo about this task. */
-
+
info_count = TASK_BASIC_INFO_COUNT;
-
+
ret = task_info (thistask, TASK_BASIC_INFO, (task_info_t) &taskinfo, &info_count);
-
+
if (ret != KERN_SUCCESS) return;
-
+
buf->priority = taskinfo.base_priority;
buf->resident = taskinfo.resident_size;
buf->rss = taskinfo.resident_size;
buf->vsize = taskinfo.virtual_size;
-
+
buf->flags [0] += BIT_SHIFT(GLIBTOP_PROCDATA_PRIORITY) +
BIT_SHIFT(GLIBTOP_PROCDATA_RESIDENT) +
BIT_SHIFT(GLIBTOP_PROCDATA_RSS) +
BIT_SHIFT(GLIBTOP_PROCDATA_VSIZE);
-
+
ret = table (TBL_UAREA, pid, (char *) &u, 1,
sizeof (struct user));
-
+
if (ret != 1) return;
-
+
buf->start_code = (unsigned long) u.u_text_start;
buf->end_code = (unsigned long) u.u_data_start;
buf->start_stack = (unsigned long) u.u_stack_start;
-
+
buf->trs = u.u_tsize;
buf->drs = u.u_dsize;
-
+
buf->start_time = u.u_start.tv_sec;
-
+
buf->utime = u.u_ru.ru_utime.tv_sec;
buf->stime = u.u_ru.ru_stime.tv_sec;
buf->cutime = u.u_cru.ru_utime.tv_sec;
buf->cstime = u.u_cru.ru_stime.tv_sec;
-
+
buf->flags [0] += BIT_SHIFT(GLIBTOP_PROCDATA_START_TIME) +
BIT_SHIFT(GLIBTOP_PROCDATA_UTIME) + BIT_SHIFT(GLIBTOP_PROCDATA_STIME) +
BIT_SHIFT(GLIBTOP_PROCDATA_CUTIME) + BIT_SHIFT(GLIBTOP_PROCDATA_CSTIME) +
BIT_SHIFT(GLIBTOP_PROCDATA_TRS) + BIT_SHIFT(GLIBTOP_PROCDATA_DRS);
-
+
buf->flags [1] += BIT_SHIFT(GLIBTOP_PROCDATA_START_CODE) +
BIT_SHIFT(GLIBTOP_PROCDATA_END_CODE) +
BIT_SHIFT(GLIBTOP_PROCDATA_START_STACK);
diff --git a/sysdeps/osf1/prockernel.c b/sysdeps/osf1/prockernel.c
index e7d961a1..e6417327 100644
--- a/sysdeps/osf1/prockernel.c
+++ b/sysdeps/osf1/prockernel.c
@@ -44,6 +44,6 @@ glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf,
pid_t pid)
{
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_KERNEL, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_kernel));
}
diff --git a/sysdeps/osf1/proclist.c b/sysdeps/osf1/proclist.c
index 14ec1cb1..7ab357c4 100644
--- a/sysdeps/osf1/proclist.c
+++ b/sysdeps/osf1/proclist.c
@@ -61,7 +61,7 @@ glibtop_init_proclist_p (glibtop *server)
* The calling function has to free the memory to which a pointer is returned.
*
* On error, NULL is returned and buf->flags is zero. */
-
+
/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
unsigned *
@@ -75,13 +75,13 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int entry, max_elements, k;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROCLIST, 0);
-
+
memset (buf, 0, sizeof (glibtop_proclist));
-
+
for (entry = 0; entry < server->machine.proctable_entries;
entry += ELEMENTS_PER_ENTRY)
{
- /* !!! THE FOLLOWING CODE RUNS SUID ROOT -
+ /* !!! THE FOLLOWING CODE RUNS SUID ROOT -
* CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
@@ -91,9 +91,9 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
ELEMENTS_PER_ENTRY, sizeof (struct tbl_procinfo));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
for (k = 0; k < max_elements; k++)
{
/* Does this entry contain a real process? */
@@ -124,17 +124,17 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
pids_size = new_size;
pids_offset += BLOCK_COUNT;
-
+
count = 0;
}
/* pids is now big enough to hold at least
* one single pid. */
-
+
pids [count++] = procinfo [k].pi_pid;
-
+
total++;
- }
+ }
}
/* count is only zero if an error occured
@@ -146,15 +146,15 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
* g_malloc () if `pids_chain' is NULL. We just calculate the
* new size and copy `pids' to the beginning of the newly allocated
* block. */
-
+
new_size = pids_size + count * sizeof (unsigned);
-
+
pids_chain = g_realloc (server, pids_chain, new_size);
-
+
memcpy (pids_chain + pids_offset, pids, count * sizeof (unsigned));
-
+
pids_size = new_size;
-
+
pids_offset += BLOCK_COUNT;
/* Since everything is ok now, we can set buf->flags, fill in the
diff --git a/sysdeps/osf1/procmem.c b/sysdeps/osf1/procmem.c
index 05038c5b..d8617426 100644
--- a/sysdeps/osf1/procmem.c
+++ b/sysdeps/osf1/procmem.c
@@ -59,22 +59,22 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
struct user u;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_MEM, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_mem));
/* Get task structure. */
-
+
ret = task_by_unix_pid (task_self(), pid, &thistask);
-
+
if (ret != KERN_SUCCESS) return;
-
+
/* Get taskinfo about this task. */
-
+
info_count = TASK_BASIC_INFO_COUNT;
-
+
ret = task_info (thistask, TASK_BASIC_INFO,
(task_info_t) &taskinfo, &info_count);
-
+
if (ret != KERN_SUCCESS) return;
buf->resident = taskinfo.resident_size;
@@ -84,16 +84,16 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_UAREA, pid, (char *) &u, 1,
sizeof (struct user));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
-
+
buf->rss_rlim = u.u_rlimit [RLIMIT_RSS].rlim_cur;
buf->share = u.u_ru.ru_ixrss;
diff --git a/sysdeps/osf1/procsegment.c b/sysdeps/osf1/procsegment.c
index 935a1b0b..5a664d4c 100644
--- a/sysdeps/osf1/procsegment.c
+++ b/sysdeps/osf1/procsegment.c
@@ -53,28 +53,28 @@ glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf,
struct user u;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_SEGMENT, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_segment));
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_UAREA, pid, (char *) &u, 1,
sizeof (struct user));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
-
+
buf->start_code = (unsigned long) u.u_text_start;
buf->end_code = (unsigned long) u.u_data_start;
buf->start_stack = (unsigned long) u.u_stack_start;
-
+
buf->text_rss = u.u_tsize;
buf->data_rss = u.u_dsize;
-
+
buf->flags = _glibtop_sysdeps_proc_segment;
}
diff --git a/sysdeps/osf1/procsignal.c b/sysdeps/osf1/procsignal.c
index 36e1e2b9..3e4f1174 100644
--- a/sysdeps/osf1/procsignal.c
+++ b/sysdeps/osf1/procsignal.c
@@ -49,20 +49,20 @@ glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf,
int ret;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_SIGNAL, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_signal));
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_PROCINFO, pid, (char *) &procinfo, 1,
- sizeof (struct tbl_procinfo));
+ sizeof (struct tbl_procinfo));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
buf->signal [0] = procinfo.pi_sig;
diff --git a/sysdeps/osf1/procstate.c b/sysdeps/osf1/procstate.c
index 71447877..31edb4e4 100644
--- a/sysdeps/osf1/procstate.c
+++ b/sysdeps/osf1/procstate.c
@@ -55,20 +55,20 @@ glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
task_t thistask;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_STATE, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_state));
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_PROCINFO, pid, (char *) &procinfo, 1,
- sizeof (struct tbl_procinfo));
+ sizeof (struct tbl_procinfo));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
/* Check whether the process actually exists. */
@@ -93,10 +93,10 @@ glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
/* Get task structure. */
ret = task_by_unix_pid (task_self(), procinfo.pi_pid, &thistask);
-
+
if (ret == KERN_SUCCESS) {
thread_array_t threadarr;
unsigned int threadarr_l;
@@ -116,7 +116,7 @@ glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
(thread_info_t) threadinfo, &threadinfo_l);
if (tret == KERN_SUCCESS) {
- if (minim_state > threadinfo->run_state)
+ if (minim_state > threadinfo->run_state)
minim_state=threadinfo->run_state;
}
}
@@ -125,20 +125,20 @@ glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
glibtop_suid_leave (server);
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != KERN_SUCCESS) return;
switch (minim_state) {
case TH_STATE_RUNNING:
buf->state = GLIBTOP_PROCESS_RUNNING;
break;
- case TH_STATE_UNINTERRUPTIBLE:
+ case TH_STATE_UNINTERRUPTIBLE:
buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE;
break;
case TH_STATE_WAITING:
buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
break;
- case TH_STATE_STOPPED:
+ case TH_STATE_STOPPED:
case TH_STATE_HALTED:
buf->state = GLIBTOP_PROCESS_STOPPED;
break;
diff --git a/sysdeps/osf1/proctime.c b/sysdeps/osf1/proctime.c
index dc06da42..4208e926 100644
--- a/sysdeps/osf1/proctime.c
+++ b/sysdeps/osf1/proctime.c
@@ -52,28 +52,28 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
int ret;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_TIME, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_time));
-
+
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_UAREA, pid, (char *) &u, 1,
sizeof (struct user));
-
+
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
buf->start_time = u.u_start.tv_sec;
-
+
buf->utime = u.u_ru.ru_utime.tv_sec;
buf->stime = u.u_ru.ru_stime.tv_sec;
buf->cutime = u.u_cru.ru_utime.tv_sec;
buf->cstime = u.u_cru.ru_stime.tv_sec;
- buf->flags = _glibtop_sysdeps_proc_time;
+ buf->flags = _glibtop_sysdeps_proc_time;
}
diff --git a/sysdeps/osf1/procuid.c b/sysdeps/osf1/procuid.c
index f5ca4636..5c12505d 100644
--- a/sysdeps/osf1/procuid.c
+++ b/sysdeps/osf1/procuid.c
@@ -60,50 +60,50 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
task_t thistask;
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_UID, 0);
-
+
memset (buf, 0, sizeof (glibtop_proc_uid));
-
+
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
ret = table (TBL_PROCINFO, pid, (char *) &procinfo, 1,
- sizeof (struct tbl_procinfo));
+ sizeof (struct tbl_procinfo));
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != 1) return;
buf->uid = procinfo.pi_ruid;
- buf->euid = procinfo.pi_svuid;
+ buf->euid = procinfo.pi_svuid;
buf->gid = procinfo.pi_rgid;
- buf->egid = procinfo.pi_svgid;
-
+ buf->egid = procinfo.pi_svgid;
+
buf->pid = procinfo.pi_pid;
buf->ppid = procinfo.pi_ppid;
buf->pgrp = procinfo.pi_pgrp;
buf->tty = procinfo.pi_ttyd;
buf->session = procinfo.pi_session;
buf->tpgid = procinfo.pi_tpgrp;
-
+
buf->flags = _glibtop_sysdeps_proc_uid;
-
+
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
glibtop_suid_enter (server);
-
+
/* Get task structure. */
-
+
ret = task_by_unix_pid (task_self(), procinfo.pi_pid, &thistask);
-
+
if (ret == KERN_SUCCESS) {
/* Get taskinfo about this task. */
-
+
info_count = TASK_BASIC_INFO_COUNT;
-
+
ret = task_info (thistask, TASK_BASIC_INFO,
(task_info_t) &taskinfo, &info_count);
@@ -111,22 +111,22 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
}
glibtop_suid_leave (server);
-
+
/* !!! END OF SUID ROOT PART !!! */
-
+
if (ret != KERN_SUCCESS) return;
-
+
buf->priority = taskinfo.base_priority;
-
+
buf->flags += (1L << GLIBTOP_PROC_UID_PRIORITY);
errno = 0;
-
+
ret = getpriority (PRIO_PROCESS, pid);
-
+
if ((ret == -1) && (errno != 0)) return;
-
+
buf->nice = ret;
-
+
buf->flags += (1L << GLIBTOP_PROC_UID_NICE);
}
diff --git a/sysdeps/osf1/sem_limits.c b/sysdeps/osf1/sem_limits.c
index 58512f0e..924890df 100644
--- a/sysdeps/osf1/sem_limits.c
+++ b/sysdeps/osf1/sem_limits.c
@@ -48,59 +48,59 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
glibtop_init_s (&server, 0, 0);
memset (buf, 0, sizeof (glibtop_sem_limits));
-
+
ret = table (TBL_SEMINFO, SEMINFO_MNI, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SEMMNI);
buf->semmni = value;
-
-
+
+
ret = table (TBL_SEMINFO, SEMINFO_MSL, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SEMMSL);
buf->semmsl = value;
-
-
+
+
ret = table (TBL_SEMINFO, SEMINFO_OPM, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SEMOPM);
buf->semopm = value;
-
+
ret = table (TBL_SEMINFO, SEMINFO_UME, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SEMUME);
buf->semume = value;
-
-
+
+
ret = table (TBL_SEMINFO, SEMINFO_VMX, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SEMVMX);
buf->semvmx = value;
-
-
+
+
ret = table (TBL_SEMINFO, SEMINFO_AEM, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
diff --git a/sysdeps/osf1/shm_limits.c b/sysdeps/osf1/shm_limits.c
index 63689d31..9ce67a2a 100644
--- a/sysdeps/osf1/shm_limits.c
+++ b/sysdeps/osf1/shm_limits.c
@@ -47,43 +47,43 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
glibtop_init_s (&server, 0, 0);
memset (buf, 0, sizeof (glibtop_shm_limits));
-
+
ret = table (TBL_SHMINFO, SHMINFO_MAX, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
buf->flags += (1L << GLIBTOP_IPC_SHMMAX);
-
+
buf->shmmax = value;
-
+
ret = table (TBL_SHMINFO, SHMINFO_MIN, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
-
+
buf->flags += (1L << GLIBTOP_IPC_SHMMIN);
-
+
buf->shmmin = value;
-
+
ret = table (TBL_SHMINFO, SHMINFO_MNI, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
-
+
buf->flags += (1L << GLIBTOP_IPC_SHMMNI);
-
+
buf->shmmni = value;
-
+
ret = table (TBL_SHMINFO, SHMINFO_SEG, (char *) &value, 1,
- sizeof (value));
+ sizeof (value));
if (ret != 1) return;
-
+
buf->flags += (1L << GLIBTOP_IPC_SHMSEG);
-
+
buf->shmseg = value;
}
diff --git a/sysdeps/osf1/swap.c b/sysdeps/osf1/swap.c
index e1bdad08..917f8b4b 100644
--- a/sysdeps/osf1/swap.c
+++ b/sysdeps/osf1/swap.c
@@ -50,7 +50,7 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
memset (buf, 0, sizeof (glibtop_swap));
i = 0;
-
+
while (table (TBL_SWAPINFO, i, (char *) &swapinfo, 1,
sizeof (struct tbl_swapinfo)) > 0) {
buf->total += swapinfo.size * getpagesize ();
@@ -59,6 +59,6 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
}
buf->flags = _glibtop_sysdeps_swap;
-
+
buf->used = buf->total - buf->free;
}
diff --git a/sysdeps/osf1/uptime.c b/sysdeps/osf1/uptime.c
index d77bfb5d..fbc7d4a2 100644
--- a/sysdeps/osf1/uptime.c
+++ b/sysdeps/osf1/uptime.c
@@ -44,15 +44,15 @@ void
glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
{
struct tbl_sysinfo sysinfo;
-
+
glibtop_init_s (&server, GLIBTOP_SYSDEPS_UPTIME, 0);
memset (buf, 0, sizeof (glibtop_uptime));
-
+
if(table (TBL_SYSINFO, 0, (char *) &sysinfo, 1,
sizeof (struct tbl_sysinfo)) != 1)
return;
-
+
buf->uptime = (double) (time (NULL) - sysinfo.si_boottime);
buf->boot_time = sysinfo.si_boottime;