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

lcdproc client: Fix build on OpenBSD >= 5.0.

Browse Source
This commit is contained in:
mmdolze
2012-02-26 12:50:47 +00:00
parent a151ee0fc4
commit e486266628
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -27,6 +27,7 @@ v0.5dev (ongoing development)
+ new driver: sdeclcd for Watchguard FireBox appliances (F. Mertz) + new driver: sdeclcd for Watchguard FireBox appliances (F. Mertz)
+ hd44780: Added 'usb4all' connection type (T. Mohaupt) + hd44780: Added 'usb4all' connection type (T. Mohaupt)
* Fix RPM init script hanging on recent OS (#3488223) * Fix RPM init script hanging on recent OS (#3488223)
* lcdproc client: Fix build on OpenBSD >= 5.0
v0.5.5 v0.5.5
+ sed1330 driver: Add support for HG25504 (L. Lagendijk) + sed1330 driver: Add support for HG25504 (L. Lagendijk)
clients/lcdproc/machine_OpenBSD.c
+26 -11
View File
@@ -61,10 +61,14 @@
static int pageshift; static int pageshift;
#define pagetok(size) ((size) << pageshift) #define pagetok(size) ((size) << pageshift)
#if OpenBSD >= 201111
#define PROCSIZE(pp) ((pp)->p_vm_tsize + (pp)->p_vm_dsize + (pp)->p_vm_ssize)
#else
#define PROCSIZE(pp) ((pp).vm_tsize + (pp).vm_dsize + (pp).vm_ssize) #define PROCSIZE(pp) ((pp).vm_tsize + (pp).vm_dsize + (pp).vm_ssize)
#endif
int int
machine_init(void) machine_init(void)
{ {
/* /*
@@ -84,13 +88,13 @@ machine_init(void)
return (TRUE); return (TRUE);
} }
int int
machine_close(void) machine_close(void)
{ {
return (TRUE); return (TRUE);
} }
int int
machine_get_battstat(int *acstat, int *battflag, int *percent) machine_get_battstat(int *acstat, int *battflag, int *percent)
{ {
int apmd; int apmd;
@@ -150,7 +154,7 @@ machine_get_battstat(int *acstat, int *battflag, int *percent)
return (TRUE); return (TRUE);
} }
int int
machine_get_fs(mounts_type fs[], int *cnt) machine_get_fs(mounts_type fs[], int *cnt)
{ {
struct statfs *mntbuf; struct statfs *mntbuf;
@@ -192,7 +196,7 @@ machine_get_fs(mounts_type fs[], int *cnt)
return (TRUE); return (TRUE);
} }
int int
machine_get_load(load_type * curr_load) 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};
@@ -232,7 +236,7 @@ machine_get_load(load_type * curr_load)
return (TRUE); return (TRUE);
} }
int int
machine_get_loadavg(double *load) machine_get_loadavg(double *load)
{ {
double loadavg[LOADAVG_NSTATS]; double loadavg[LOADAVG_NSTATS];
@@ -245,7 +249,7 @@ machine_get_loadavg(double *load)
return (TRUE); return (TRUE);
} }
int int
machine_get_meminfo(meminfo_type * result) machine_get_meminfo(meminfo_type * result)
{ {
size_t size; size_t size;
@@ -278,7 +282,7 @@ machine_get_meminfo(meminfo_type * result)
return (TRUE); return (TRUE);
} }
int int
machine_get_procs(LinkedList * procs) machine_get_procs(LinkedList * procs)
{ {
struct kinfo_proc *kprocs; struct kinfo_proc *kprocs;
@@ -291,7 +295,11 @@ machine_get_procs(LinkedList * procs)
return (FALSE); return (FALSE);
} }
#if OpenBSD >= 201111
kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &nproc);
#else
kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &nproc); kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &nproc);
#endif
if (kprocs == NULL) { if (kprocs == NULL) {
perror("kvm_getprocs"); perror("kvm_getprocs");
kvm_close(kvmd); kvm_close(kvmd);
@@ -305,10 +313,17 @@ machine_get_procs(LinkedList * procs)
kvm_close(kvmd); kvm_close(kvmd);
return (FALSE); return (FALSE);
} }
#if OpenBSD >= 201111
strncpy(p->name, kprocs->p_comm, 15);
p->name[15] = '\0';
p->totl = pagetok(PROCSIZE(kprocs));
p->number = kprocs->p_pid;
#else
strncpy(p->name, kprocs->kp_proc.p_comm, 15); strncpy(p->name, kprocs->kp_proc.p_comm, 15);
p->name[15] = '\0'; p->name[15] = '\0';
p->totl = pagetok(PROCSIZE(kprocs->kp_eproc.e_vm)); p->totl = pagetok(PROCSIZE(kprocs->kp_eproc.e_vm));
p->number = kprocs->kp_proc.p_pid; p->number = kprocs->kp_proc.p_pid;
#endif
LL_Push(procs, (void *)p); LL_Push(procs, (void *)p);
kprocs++; kprocs++;
@@ -318,7 +333,7 @@ machine_get_procs(LinkedList * procs)
return (TRUE); return (TRUE);
} }
int int
machine_get_smpload(load_type * result, int *numcpus) machine_get_smpload(load_type * result, int *numcpus)
{ {
int mib[2], i, num; int mib[2], i, num;
@@ -352,7 +367,7 @@ machine_get_smpload(load_type * result, int *numcpus)
return (TRUE); return (TRUE);
} }
int int
machine_get_uptime(double *up, double *idle) machine_get_uptime(double *up, double *idle)
{ {
size_t size; size_t size;
@@ -381,7 +396,7 @@ machine_get_uptime(double *up, double *idle)
} }
/* Get network statistics */ /* Get network statistics */
int int
machine_get_iface_stats(IfaceInfo * interface) machine_get_iface_stats(IfaceInfo * interface)
{ {
/* Implementation missing */ /* Implementation missing */