Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-05 21:07:52 +00:00
Code Issues Releases Activity

Fixed cpu_count variable and one incorrectly typed ifdef

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@986 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Toni Spets 2007-11-04 13:14:55 +00:00
parent 68a853c285
commit bc984b40d4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openbsd.c
View File

@ -291,7 +291,7 @@ update_running_processes()
/* new SMP code can be enabled by commenting the following line */ /* new SMP code can be enabled by commenting the following line */
#define OLDCPU #define OLDCPU
#if OLDCPU #ifdef OLDCPU
struct cpu_load_struct { struct cpu_load_struct {
unsigned long load[5]; unsigned long load[5];
}; };
@ -299,6 +299,7 @@ struct cpu_load_struct {
struct cpu_load_struct fresh = { {0, 0, 0, 0, 0} }; struct cpu_load_struct fresh = { {0, 0, 0, 0, 0} };
long cpu_used, oldtotal, oldused; long cpu_used, oldtotal, oldused;
#else #else
#include <assert.h>
int64_t* fresh = NULL; int64_t* fresh = NULL;
/* XXX is 8 enough? - What's the constant for MAXCPU?*/ /* XXX is 8 enough? - What's the constant for MAXCPU?*/
/* allocate this with malloc would be better*/ /* allocate this with malloc would be better*/
@ -312,9 +313,11 @@ get_cpu_count()
#ifndef OLDCPU #ifndef OLDCPU
int mib[2] = { CTL_HW, HW_NCPU }; int mib[2] = { CTL_HW, HW_NCPU };
size_t len = sizeof(cpu_count); size_t len = sizeof(cpu_count);
if (sysctl(mib, 2, &cpu_count, &len, NULL, 0) == 0) if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
info.cpu_count = cpu_count; ERR("error getting cpu count, defaulting to 1");
#endif #endif
info.cpu_count = cpu_count;
info.cpu_usage = malloc(info.cpu_count * sizeof (float)); info.cpu_usage = malloc(info.cpu_count * sizeof (float));
if (info.cpu_usage == NULL) if (info.cpu_usage == NULL)
CRIT_ERR("malloc"); CRIT_ERR("malloc");