-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* Please see COPYING for details
*
* Copyright (c) 2007 Toni Spets
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * $Id$ */
+ */
#include <sys/dkstat.h>
#include <sys/param.h>
#include <fcntl.h>
#include <ifaddrs.h>
#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
#include <machine/apmvar.h>
#include <net80211/ieee80211_ioctl.h>
#include "conky.h"
+#include "diskio.h"
+#include "logging.h"
+#include "net_stat.h"
+#include "openbsd.h"
+#include "top.h"
#define MAXSHOWDEVS 16
kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
if (kd == NULL) {
- ERR("error opening kvm");
+ NORM_ERR("error opening kvm");
} else {
init_kvm = 1;
}
time(&now);
info.uptime = now - boottime.tv_sec;
} else {
- ERR("Could not get uptime");
+ NORM_ERR("Could not get uptime");
info.uptime = 0;
}
}
info.memmax = pagetok(vmtotal.t_rm) + pagetok(vmtotal.t_free);
info.mem = pagetok(vmtotal.t_rm);
+ info.memeasyfree = info.memfree = info.memmax - info.mem;
if ((swapmode(&swap_used, &swap_avail)) >= 0) {
info.swapmax = swap_avail;
info.swap = swap_used;
+ info.swapfree = swap_avail - swap_used;
} else {
info.swapmax = 0;
info.swap = 0;
+ info.swapfree = 0;
}
}
}
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
- ns = get_net_stat((const char *) ifa->ifa_name);
+ ns = get_net_stat((const char *) ifa->ifa_name, NULL, NULL);
if (ifa->ifa_flags & IFF_UP) {
struct ifaddrs *iftmp;
size_t len = sizeof(cpu_count);
if (sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0) {
- ERR("error getting cpu count, defaulting to 1");
+ NORM_ERR("error getting cpu count, defaulting to 1");
}
#endif
info.cpu_count = cpu_count;
info.cpu_usage = malloc(info.cpu_count * sizeof(float));
if (info.cpu_usage == NULL) {
- CRIT_ERR("malloc");
+ CRIT_ERR(NULL, NULL, "malloc");
}
#ifndef OLDCPU
assert(fresh == NULL); /* XXX Is this leaking memory? */
/* XXX Where shall I free this? */
if (NULL == (fresh = calloc(cpu_count, sizeof(int64_t) * CPUSTATES))) {
- CRIT_ERR("calloc");
+ CRIT_ERR(NULL, NULL, "calloc");
}
#endif
}
#ifdef OLDCPU
if (sysctl(mib, 2, &cp_time, &len, NULL, 0) < 0) {
- ERR("Cannot get kern.cp_time");
+ NORM_ERR("Cannot get kern.cp_time");
}
fresh.load[0] = cp_time[CP_USER];
int cp_time_mib[] = { CTL_KERN, KERN_CPTIME2, i };
if (sysctl(cp_time_mib, 3, &(fresh[i * CPUSTATES]), &size, NULL, 0)
< 0) {
- ERR("sysctl kern.cp_time2 failed");
+ NORM_ERR("sysctl kern.cp_time2 failed");
}
}
} else {
size = sizeof(cp_time_tmp);
if (sysctl(cp_time_mib, 2, cp_time_tmp, &size, NULL, 0) < 0) {
- ERR("sysctl kern.cp_time failed");
+ NORM_ERR("sysctl kern.cp_time failed");
}
for (i = 0; i < CPUSTATES; i++) {
info.loadavg[2] = (float) v[2];
}
+#define OBSD_MAX_SENSORS 256
+static struct obsd_sensors_struct {
+ int device;
+ float temp[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+ unsigned int fan[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+ float volt[MAXSENSORDEVICES][OBSD_MAX_SENSORS];
+} obsd_sensors;
+
/* read sensors from sysctl */
void update_obsd_sensors()
{
init_sensors = 1;
}
+void parse_obsd_sensor(struct text_object *obj, const char *arg)
+{
+ if (!isdigit(arg[0]) || atoi(&arg[0]) < 0
+ || atoi(&arg[0]) > OBSD_MAX_SENSORS - 1) {
+ obj->data.l = 0;
+ NORM_ERR("Invalid sensor number!");
+ } else
+ obj->data.l = atoi(&arg[0]);
+}
+
+void print_obsd_sensors_temp(struct text_object *obj, char *p, int p_max_size)
+{
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ temp_print(p, p_max_size,
+ obsd_sensors.temp[obsd_sensors.device][obj->data.l],
+ TEMP_CELSIUS);
+}
+
+void print_obsd_sensors_fan(struct text_object *obj, char *p, int p_max_size)
+{
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ snprintf(p, p_max_size, "%d",
+ obsd_sensors.fan[obsd_sensors.device][obj->data.l]);
+}
+
+void print_obsd_sensors_volt(struct text_object *obj, char *p, int p_max_size)
+{
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ snprintf(p, p_max_size, "%.2f",
+ obsd_sensors.volt[obsd_sensors.device][obj->data.l]);
+}
+
/* chipset vendor */
void get_obsd_vendor(char *buf, size_t client_buffer_size)
{
size_t size = sizeof(vendor);
if (sysctl(mib, 2, vendor, &size, NULL, 0) == -1) {
- ERR("error reading vendor");
+ NORM_ERR("error reading vendor");
snprintf(buf, client_buffer_size, "unknown");
} else {
snprintf(buf, client_buffer_size, "%s", vendor);
size_t size = sizeof(product);
if (sysctl(mib, 2, product, &size, NULL, 0) == -1) {
- ERR("error reading product");
+ NORM_ERR("error reading product");
snprintf(buf, client_buffer_size, "unknown");
} else {
snprintf(buf, client_buffer_size, "%s", product);
}
}
-/* rdtsc() and get_freq_dynamic() copied from linux.c */
-
-#if defined(__i386) || defined(__x86_64)
-__inline__ unsigned long long int rdtsc()
-{
- unsigned long long int x;
-
- __asm__ volatile(".byte 0x0f, 0x31":"=A" (x));
- return x;
-}
-#endif
-
-/* return system frequency in MHz (use divisor=1) or GHz (use divisor=1000) */
-void get_freq_dynamic(char *p_client_buffer, size_t client_buffer_size,
- const char *p_format, int divisor)
-{
-#if defined(__i386) || defined(__x86_64)
- struct timezone tz;
- struct timeval tvstart, tvstop;
- unsigned long long cycles[2]; /* gotta be 64 bit */
- unsigned int microseconds; /* total time taken */
-
- memset(&tz, 0, sizeof(tz));
-
- /* get this function in cached memory */
- gettimeofday(&tvstart, &tz);
- cycles[0] = rdtsc();
- gettimeofday(&tvstart, &tz);
-
- /* we don't trust that this is any specific length of time */
- usleep(100);
- cycles[1] = rdtsc();
- gettimeofday(&tvstop, &tz);
- microseconds = ((tvstop.tv_sec - tvstart.tv_sec) * 1000000) +
- (tvstop.tv_usec - tvstart.tv_usec);
-
- snprintf(p_client_buffer, client_buffer_size, p_format,
- (float) ((cycles[1] - cycles[0]) / microseconds) / divisor);
-#else
- get_freq(p_client_buffer, client_buffer_size, p_format, divisor, 1);
-#endif
-}
-
/* void */
char get_freq(char *p_client_buffer, size_t client_buffer_size,
const char *p_format, int divisor, unsigned int cpu)
void update_top()
{
+ kvm_init();
proc_find_top(info.cpu, info.memu);
}
bzero(&ifmr, sizeof(ifmr));
strlcpy(ifmr.ifm_name, ifa->ifa_name, IFNAMSIZ);
if (ioctl(s, SIOCGIFMEDIA, (caddr_t) &ifmr) < 0) {
- goto cleanup;
+ close(s);
+ return;
}
/* We can monitor only wireless interfaces
}
#endif
+void clear_diskio_stats()
+{
+}
+
+struct diskio_stat *prepare_diskio_stat(const char *s)
+{
+}
+
void update_diskio()
{
return; /* XXX: implement? hifi: not sure how */
int comparemem(const void *a, const void *b)
{
- if (((struct process *) a)->totalmem > ((struct process *) b)->totalmem) {
+ if (((struct process *) a)->rss > ((struct process *) b)->rss) {
return -1;
}
- if (((struct process *) a)->totalmem < ((struct process *) b)->totalmem) {
+ if (((struct process *) a)->rss < ((struct process *) b)->rss) {
return 1;
}
struct process *processes;
int mib[2];
- int total_pages;
+ u_int total_pages;
+ int64_t usermem;
int pagesize = getpagesize();
/* we get total pages count again to be sure it is up to date */
mib[0] = CTL_HW;
- mib[1] = HW_USERMEM;
- size_t size = sizeof(total_pages);
+ mib[1] = HW_USERMEM64;
+ size_t size = sizeof(usermem);
- if (sysctl(mib, 2, &total_pages, &size, NULL, 0) == -1) {
- ERR("error reading nmempages");
+ if (sysctl(mib, 2, &usermem, &size, NULL, 0) == -1) {
+ NORM_ERR("error reading usermem");
}
+ /* translate bytes into page count */
+ total_pages = usermem / pagesize;
+
int max_size = sizeof(struct kinfo_proc2);
p = kvm_getproc2(kd, KERN_PROC_ALL, 0, max_size, &n_processes);
for (i = 0; i < n_processes; i++) {
if (!((p[i].p_flag & P_SYSTEM)) && p[i].p_comm != NULL) {
processes[j].pid = p[i].p_pid;
- processes[j].name = strdup(p[i].p_comm);
+ processes[j].name = strndup(p[i].p_comm, text_buffer_size);
processes[j].amount = 100.0 * p[i].p_pctcpu / FSCALE;
- processes[j].totalmem = (float) (p[i].p_vm_rssize * pagesize /
- (float) total_pages) * 100.0;
j++;
}
}
tmp = malloc(sizeof(struct process));
tmp->pid = processes[i].pid;
tmp->amount = processes[i].amount;
- tmp->totalmem = processes[i].totalmem;
- tmp->name = strdup(processes[i].name);
+ tmp->name = strndup(processes[i].name, text_buffer_size);
ttmp = mem[i];
mem[i] = tmp;
tmp = malloc(sizeof(struct process));
tmp->pid = processes[i].pid;
tmp->amount = processes[i].amount;
- tmp->totalmem = processes[i].totalmem;
- tmp->name = strdup(processes[i].name);
+ tmp->name = strndup(processes[i].name, text_buffer_size);
ttmp = cpu[i];
cpu[i] = tmp;
{
}
-void update_entropy(void)
+int get_entropy_avail(unsigned int *val)
{
+ return 1;
+}
+
+int get_entropy_poolsize(unsigned int *val)
+{
+ return 1;
}
void free_all_processes(void)
projects / monky / blobdiff