mangavalk/lcdproc
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-indent machine* files.

Browse Source
This commit is contained in:
mmdolze committed 2011-11-20 14:08:05 +00:00
1 parent e45822c37d
commit 27d1bc1087
7 files changed
+861 -863
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

clients/lcdproc/machine_OpenBSD.c
+124 -127
View File
@@ -2,7 +2,8 @@
* Collects system information on OpenBSD.
*/
/* Copyright (c) 2003 Thomas Runge (coto@core.de)
/*-
* Copyright (c) 2003 Thomas Runge (coto@core.de)
*
* All rights reserved.
*
@@ -63,13 +64,16 @@ static int pageshift;
#define PROCSIZE(pp) ((pp).vm_tsize + (pp).vm_dsize + (pp).vm_ssize)
int machine_init(void)
int
machine_init(void)
{
/* get the page size with "getpagesize" and calculate pageshift from it */
/*
* get the page size with "getpagesize" and calculate pageshift from
* it
*/
int pagesize = getpagesize();
pageshift = 0;
while (pagesize > 1)
{
while (pagesize > 1) {
pageshift++;
pagesize >>= 1;
}
@@ -77,109 +81,104 @@ int machine_init(void)
/* we only need the amount of log(2)1024 for our conversion */
pageshift -= 10;
return(TRUE);
return (TRUE);
}
int machine_close(void)
int
machine_close(void)
{
return(TRUE);
return (TRUE);
}
int machine_get_battstat(int *acstat, int *battflag, int *percent)
int
machine_get_battstat(int *acstat, int *battflag, int *percent)
{
int apmd;
struct apm_power_info api;
*acstat = LCDP_AC_ON;
*acstat = LCDP_AC_ON;
*battflag = LCDP_BATT_ABSENT;
*percent = 100;
*percent = 100;
if ((apmd = open("/dev/apm", O_RDONLY)) == -1)
{
if ((apmd = open("/dev/apm", O_RDONLY)) == -1) {
perror("get_battstat_open");
return(TRUE);
return (TRUE);
}
if (ioctl(apmd, APM_IOC_GETPOWER, &api) == -1)
{
if (ioctl(apmd, APM_IOC_GETPOWER, &api) == -1) {
perror("get_battstat_ioctl");
return(FALSE);
return (FALSE);
}
switch(api.ac_state)
{
case APM_AC_OFF:
*acstat = LCDP_AC_OFF;
break;
case APM_AC_ON:
*acstat = LCDP_AC_ON;
break;
default:
*acstat = LCDP_AC_UNKNOWN;
break;
switch (api.ac_state) {
case APM_AC_OFF:
*acstat = LCDP_AC_OFF;
break;
case APM_AC_ON:
*acstat = LCDP_AC_ON;
break;
default:
*acstat = LCDP_AC_UNKNOWN;
break;
}
switch(api.battery_state)
{
case APM_BATT_HIGH:
*battflag = LCDP_BATT_HIGH;
break;
case APM_BATT_LOW:
*battflag = LCDP_BATT_LOW;
break;
case APM_BATT_CRITICAL:
*battflag = LCDP_BATT_CRITICAL;
break;
case APM_BATT_CHARGING:
*battflag = LCDP_BATT_CHARGING;
break;
case APM_BATTERY_ABSENT:
*battflag = LCDP_BATT_ABSENT;
break;
default:
*battflag = LCDP_BATT_UNKNOWN;
break;
switch (api.battery_state) {
case APM_BATT_HIGH:
*battflag = LCDP_BATT_HIGH;
break;
case APM_BATT_LOW:
*battflag = LCDP_BATT_LOW;
break;
case APM_BATT_CRITICAL:
*battflag = LCDP_BATT_CRITICAL;
break;
case APM_BATT_CHARGING:
*battflag = LCDP_BATT_CHARGING;
break;
case APM_BATTERY_ABSENT:
*battflag = LCDP_BATT_ABSENT;
break;
default:
*battflag = LCDP_BATT_UNKNOWN;
break;
}
*percent = api.battery_life;
close(apmd);
return(TRUE);
return (TRUE);
}
int machine_get_fs(mounts_type fs[], int *cnt)
int
machine_get_fs(mounts_type fs[], int *cnt)
{
struct statfs *mntbuf;
struct statfs *pp;
int statcnt, fscnt, i;
fscnt = getmntinfo(&mntbuf, MNT_WAIT);
if (fscnt == 0)
{
if (fscnt == 0) {
perror("getmntinfo");
return(FALSE);
return (FALSE);
}
for (statcnt = 0, pp = mntbuf, i = 0; i < fscnt; pp++, i++)
{
for (statcnt = 0, pp = mntbuf, i = 0; i < fscnt; pp++, i++) {
if (strcmp(pp->f_fstypename, "procfs")
&& strcmp(pp->f_fstypename, "kernfs")
&& strcmp(pp->f_fstypename, "linprocfs")
&& strcmp(pp->f_fstypename, "kernfs")
&& strcmp(pp->f_fstypename, "linprocfs")
#ifndef STAT_NFS
&& strcmp(pp->f_fstypename, "nfs")
&& strcmp(pp->f_fstypename, "nfs")
#endif
#ifndef STAT_SMBFS
&& strcmp(pp->f_fstypename, "smbfs")
&& strcmp(pp->f_fstypename, "smbfs")
#endif
)
{
snprintf(fs[statcnt].dev, 255, "%s", pp->f_mntfromname);
) {
snprintf(fs[statcnt].dev, 255, "%s", pp->f_mntfromname);
snprintf(fs[statcnt].mpoint, 255, "%s", pp->f_mntonname);
snprintf(fs[statcnt].type, 63, "%s", pp->f_fstypename);
snprintf(fs[statcnt].type, 63, "%s", pp->f_fstypename);
fs[statcnt].blocks = pp->f_blocks;
if (fs[statcnt].blocks > 0)
{
if (fs[statcnt].blocks > 0) {
fs[statcnt].bsize = pp->f_bsize;
fs[statcnt].bfree = pp->f_bfree;
fs[statcnt].files = pp->f_files;
@@ -190,12 +189,13 @@ int machine_get_fs(mounts_type fs[], int *cnt)
}
*cnt = statcnt;
return(TRUE);
return (TRUE);
}
int machine_get_load(load_type *curr_load)
int
machine_get_load(load_type * curr_load)
{
static load_type last_load = { 0, 0, 0, 0, 0 };
static load_type last_load = {0, 0, 0, 0, 0};
static load_type last_ret_load;
load_type load;
long cp_time[CPUSTATES];
@@ -205,49 +205,48 @@ int machine_get_load(load_type *curr_load)
mib[0] = CTL_KERN;
mib[1] = KERN_CPTIME;
size = sizeof(cp_time);
if (sysctl(mib, 2, cp_time, &size, NULL, 0) < 0)
{
if (sysctl(mib, 2, cp_time, &size, NULL, 0) < 0) {
perror("sysctl kern.cp_time failed");
return(FALSE);
return (FALSE);
}
load.user = (unsigned long) (cp_time[CP_USER]);
load.nice = (unsigned long) (cp_time[CP_NICE]);
load.system = (unsigned long) (cp_time[CP_SYS] + cp_time[CP_INTR]);
load.idle = (unsigned long) (cp_time[CP_IDLE]);
load.total = load.user + load.nice + load.system + load.idle;
load.user = (unsigned long)(cp_time[CP_USER]);
load.nice = (unsigned long)(cp_time[CP_NICE]);
load.system = (unsigned long)(cp_time[CP_SYS] + cp_time[CP_INTR]);
load.idle = (unsigned long)(cp_time[CP_IDLE]);
load.total = load.user + load.nice + load.system + load.idle;
if (load.total != last_load.total)
{
curr_load->user = load.user - last_load.user;
curr_load->nice = load.nice - last_load.nice;
if (load.total != last_load.total) {
curr_load->user = load.user - last_load.user;
curr_load->nice = load.nice - last_load.nice;
curr_load->system = load.system - last_load.system;
curr_load->idle = load.idle - last_load.idle;
curr_load->total = load.total - last_load.total;
curr_load->idle = load.idle - last_load.idle;
curr_load->total = load.total - last_load.total;
last_ret_load = *curr_load;
last_load = load;
}
else
{
else {
*curr_load = last_ret_load;
}
return(TRUE);
return (TRUE);
}
int machine_get_loadavg(double *load)
int
machine_get_loadavg(double *load)
{
double loadavg[LOADAVG_NSTATS];
if (getloadavg(loadavg, LOADAVG_NSTATS) <= LOADAVG_1MIN)
return(FALSE);
return (FALSE);
*load = loadavg[LOADAVG_1MIN];
return(TRUE);
return (TRUE);
}
int machine_get_meminfo(meminfo_type *result)
int
machine_get_meminfo(meminfo_type * result)
{
size_t size;
int mib[2];
@@ -257,58 +256,54 @@ int machine_get_meminfo(meminfo_type *result)
mib[1] = VM_UVMEXP;
size = sizeof(suvm);
if (sysctl(mib, 2, &suvm, &size, NULL, 0) < 0)
{
if (sysctl(mib, 2, &suvm, &size, NULL, 0) < 0) {
perror("sysctl vm.uvmexp failed");
return(FALSE);
return (FALSE);
}
/* memory */
result[0].total = pagetok(suvm.npages);
result[0].free = pagetok(suvm.free);
result[0].total = pagetok(suvm.npages);
result[0].free = pagetok(suvm.free);
/* not used anyway */
result[0].shared = 0;
result[0].buffers = 0;
result[0].cache = 0;
result[0].shared = 0;
result[0].buffers = 0;
result[0].cache = 0;
/* swap */
result[1].total = suvm.pagesize * suvm.swpages;
result[1].free = suvm.pagesize * suvm.swpginuse;
result[1].free = result[1].total - result[1].free;
result[1].total = suvm.pagesize * suvm.swpages;
result[1].free = suvm.pagesize * suvm.swpginuse;
result[1].free = result[1].total - result[1].free;
return(TRUE);
return (TRUE);
}
int machine_get_procs(LinkedList *procs)
int
machine_get_procs(LinkedList * procs)
{
struct kinfo_proc *kprocs;
int nproc, i;
procinfo_type *p;
kvm_t *kvmd;
if ((kvmd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
{
if ((kvmd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL) {
perror("kvm_open");
return(FALSE);
return (FALSE);
}
kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &nproc);
if (kprocs == NULL)
{
if (kprocs == NULL) {
perror("kvm_getprocs");
kvm_close(kvmd);
return(FALSE);
return (FALSE);
}
for (i = 0; i < nproc; i++)
{
for (i = 0; i < nproc; i++) {
p = malloc(sizeof(procinfo_type));
if (!p)
{
if (!p) {
perror("mem_top_malloc");
kvm_close(kvmd);
return(FALSE);
return (FALSE);
}
strncpy(p->name, kprocs->kp_proc.p_comm, 15);
p->name[15] = '\0';
@@ -320,10 +315,11 @@ int machine_get_procs(LinkedList *procs)
}
kvm_close(kvmd);
return(TRUE);
return (TRUE);
}
int machine_get_smpload(load_type *result, int *numcpus)
int
machine_get_smpload(load_type * result, int *numcpus)
{
int mib[2], i, num;
size_t size;
@@ -335,14 +331,14 @@ int machine_get_smpload(load_type *result, int *numcpus)
if (sysctl(mib, 2, &num, &size, NULL, 0) < 0) {
perror("sysctl hw.ncpu");
return(FALSE);
return (FALSE);
}
if (machine_get_load(&curr_load) == FALSE)
return(FALSE);
return (FALSE);
if (numcpus == NULL)
return(FALSE);
return (FALSE);
/* restrict #CPUs to max. *numcpus */
num = (*numcpus >= num) ? num : *numcpus;
@@ -353,10 +349,11 @@ int machine_get_smpload(load_type *result, int *numcpus)
result[i] = curr_load;
}
return(TRUE);
return (TRUE);
}
int machine_get_uptime(double *up, double *idle)
int
machine_get_uptime(double *up, double *idle)
{
size_t size;
time_t now;
@@ -368,10 +365,9 @@ int machine_get_uptime(double *up, double *idle)
mib[1] = KERN_BOOTTIME;
size = sizeof(boottime);
time(&now);
if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0)
{
if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0) {
perror("sysctl kern.boottime failed");
return(FALSE);
return (FALSE);
}
*up = (double)(now - boottime.tv_sec);
@@ -379,16 +375,17 @@ int machine_get_uptime(double *up, double *idle)
if (machine_get_load(&curr_load) == FALSE)
*idle = 100.;
else
*idle = 100.*curr_load.idle/curr_load.total;
*idle = 100. * curr_load.idle / curr_load.total;
return(TRUE);
return (TRUE);
}
/* Get network statistics */
int machine_get_iface_stats (IfaceInfo *interface)
int
machine_get_iface_stats(IfaceInfo * interface)
{
/* Implementation missing */
return 0;
}
#endif /* __OpenBSD__ */
#endif /* __OpenBSD__ */