Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 09:44:04 +00:00
Code Issues Releases Activity

Add SMP support for FreeBSD.

Browse Source 
Original patch written by Ivan Klymenko <fidaj@ukr.net>.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
This commit is contained in:
Dmitry Marakasov 2010-01-16 10:53:19 -08:00 committed by Brenden Matthews
parent a218eb70ef
commit 1fa1476970
1 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/freebsd.c
View File

@ -286,40 +286,38 @@ void update_running_processes(void)
info.run_procs = cnt; info.run_procs = cnt;
} }
struct cpu_load_struct {
unsigned long load[5];
};
struct cpu_load_struct fresh = { {0, 0, 0, 0, 0} };
long cpu_used, oldtotal, oldused;
void get_cpu_count(void) void get_cpu_count(void)
{ {
/* int cpu_count = 0; */ int cpu_count = 0;
size_t cpu_count_len = sizeof(cpu_count);
/* XXX: FreeBSD doesn't allow to get per CPU load stats on SMP machines.
* It's possible to get a CPU count, but as we fulfill only
* info.cpu_usage[0], it's better to report there's only one CPU.
* It should fix some bugs (e.g. cpugraph) */
#if 0
if (GETSYSCTL("hw.ncpu", cpu_count) == 0) { if (GETSYSCTL("hw.ncpu", cpu_count) == 0) {
info.cpu_count = cpu_count; info.cpu_count = cpu_count;
} else {
fprintf(stderr, "Cannot get hw.ncpu\n");
info.cpu_count = 0;
} }
#endif
info.cpu_count = 1;
info.cpu_usage = malloc(info.cpu_count * sizeof(float)); info.cpu_usage = malloc((info.cpu_count + 1) * sizeof(float));
if (info.cpu_usage == NULL) { if (info.cpu_usage == NULL) {
CRIT_ERR(NULL, NULL, "malloc"); CRIT_ERR(NULL, NULL, "malloc");
} }
} }
/* XXX: SMP support */ struct cpu_info {
long oldtotal;
long oldused;
};
void update_cpu_usage(void) void update_cpu_usage(void)
{ {
int i, j = 0;
long used, total; long used, total;
long cp_time[CPUSTATES]; long *cp_time = NULL;
size_t cp_len = sizeof(cp_time); size_t cp_len;
static struct cpu_info *cpu = NULL;
unsigned int malloc_cpu_size = 0;
extern void* global_cpu;
/* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */
if ((cpu_setup == 0) || (!info.cpu_usage)) { if ((cpu_setup == 0) || (!info.cpu_usage)) {
@ -327,28 +325,68 @@ void update_cpu_usage(void)
cpu_setup = 1; cpu_setup = 1;
} }
if (sysctlbyname("kern.cp_time", &cp_time, &cp_len, NULL, 0) < 0) { if (!global_cpu) {
fprintf(stderr, "Cannot get kern.cp_time"); malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info);
cpu = malloc(malloc_cpu_size);
memset(cpu, 0, malloc_cpu_size);
global_cpu = cpu;
} }
fresh.load[0] = cp_time[CP_USER]; /* cpu[0] is overall stats, get it from separate sysctl */
fresh.load[1] = cp_time[CP_NICE]; cp_len = CPUSTATES * sizeof(long);
fresh.load[2] = cp_time[CP_SYS]; cp_time = malloc(cp_len);
fresh.load[3] = cp_time[CP_IDLE];
fresh.load[4] = cp_time[CP_IDLE];
used = fresh.load[0] + fresh.load[1] + fresh.load[2]; if (sysctlbyname("kern.cp_time", cp_time, &cp_len, NULL, 0) < 0) {
total = fresh.load[0] + fresh.load[1] + fresh.load[2] + fresh.load[3]; fprintf(stderr, "Cannot get kern.cp_time\n");
}
if ((total - oldtotal) != 0) { total = 0;
info.cpu_usage[0] = ((double) (used - oldused)) / for (j = 0; j < CPUSTATES; j++)
(double) (total - oldtotal); total += cp_time[j];
used = total - cp_time[CP_IDLE];
if ((total - cpu[0].oldtotal) != 0) {
info.cpu_usage[0] = ((double) (used - cpu[0].oldused)) /
(double) (total - cpu[0].oldtotal);
} else { } else {
info.cpu_usage[0] = 0; info.cpu_usage[0] = 0;
} }
oldused = used; cpu[0].oldused = used;
oldtotal = total; cpu[0].oldtotal = total;
free(cp_time);
/* per-core stats */
cp_len = CPUSTATES * sizeof(long) * info.cpu_count;
cp_time = malloc(cp_len);
/* on e.g. i386 SMP we may have more values than actual cpus; this will just drop extra values */
if (sysctlbyname("kern.cp_times", cp_time, &cp_len, NULL, 0) < 0 && errno != ENOMEM) {
fprintf(stderr, "Cannot get kern.cp_times\n");
}
for (i = 0; i < info.cpu_count; i++)
{
total = 0;
for (j = 0; j < CPUSTATES; j++)
total += cp_time[i*CPUSTATES + j];
used = total - cp_time[i*CPUSTATES + CP_IDLE];
if ((total - cpu[i+1].oldtotal) != 0) {
info.cpu_usage[i+1] = ((double) (used - cpu[i+1].oldused)) /
(double) (total - cpu[i+1].oldtotal);
} else {
info.cpu_usage[i+1] = 0;
}
cpu[i+1].oldused = used;
cpu[i+1].oldtotal = total;
}
free(cp_time);
} }
void update_load_average(void) void update_load_average(void)