#include <sys/types.h>
#include <sys/sysinfo.h>
#include <sys/stat.h>
+#ifndef HAVE_CLOCK_GETTIME
+#include <sys/time.h>
+#endif
#include <fcntl.h>
#include <unistd.h>
// #include <assert.h>
#include <net/if.h>
#include <math.h>
+#ifdef HAVE_IWLIB
+#include <iwlib.h>
+#endif
+
#define SHORTSTAT_TEMPL "%*s %llu %llu %llu"
#define LONGSTAT_TEMPL "%*s %llu %llu %llu "
-#ifdef HAVE_LIBDEXTER
-/* need the procraw service from the libdexter dxt-sysinfo plugin */
-#include <dxt-sysinfo/procraw-public.h>
-#define PROCRAW_SERVICE_UUID "ce975a10-0e52-458a-a4b9-253734760436"
-/* timed sampler that delivers the procraw data */
-static DexterTimedSampler *procraw_sampler = NULL;
-/* procraw structure used as /proc surrogate */
-static DxtSysinfoProcrawData procraw_data;
-/* data selector mask for the service */
-gint procraw_mask;
-#endif
-
static int show_nice_processes;
/* this flags tells the linux routines to use the /proc system
- * where possible, even if other api's are available, e.g. sysinfo()
- * or getloadavg(). the reason for this is to allow for /proc-based
+ * where possible, even if other api's are available, e.g. sysinfo()
+ * or getloadavg(). the reason for this is to allow for /proc-based
* distributed monitoring. using a flag in this manner creates less
* confusing code.
*/
{
static int rep = 0;
FILE *fp;
-
+
if (!(fp = open_file("/proc/uptime", &rep)))
{
info.uptime=0.0;
info.mask |= (1 << INFO_UPTIME);
}
+int check_mount(char *s)
+{
+ int ret = 0;
+ FILE *mtab = fopen("/etc/mtab", "r");
+ if (mtab) {
+ char buf1[256], buf2[128];
+ while (fgets(buf1, 256, mtab)) {
+ sscanf(buf1, "%*s %128s", buf2);
+ if (!strcmp(s, buf2)) {
+ ret = 1;
+ break;
+ }
+ }
+ fclose(mtab);
+ } else {
+ ERR("Could not open mtab");
+ }
+ return ret;
+}
+
/* these things are also in sysinfo except Buffers:, that's why I'm reading
* them from proc */
sscanf(buf, "%*s %Lu", &info.cached);
}
}
-
+
info.mem = info.memmax - info.mem;
info.swap = info.swapmax - info.swap;
char buf[256];
double delta;
+#ifdef HAVE_IWLIB
+ // wireless info variables
+ int skfd, has_bitrate = 0, link_qual = 0, link_qual_max = 0;
+ struct wireless_info *winfo;
+ struct iwreq wrq;
+#endif
+
/* get delta */
delta = current_update_time - last_update_time;
if (delta <= 0.0001)
/* if recv or trans is less than last time, an overflow happened */
if (r < ns->last_read_recv)
- ns->recv +=
- ((long long) 4294967295U -
- ns->last_read_recv) + r;
+ last_recv = 0;
else
ns->recv += (r - ns->last_read_recv);
ns->last_read_recv = r;
if (t < ns->last_read_trans)
- ns->trans +=
- ((long long) 4294967295U -
- ns->last_read_trans) + t;
+ last_trans = 0;
else
ns->trans += (t - ns->last_read_trans);
ns->last_read_trans = t;
curtmp1 += ns->net_rec[i];
curtmp2 += ns->net_trans[i];
}
+ if (curtmp1 == 0) curtmp1 = 1;
+ if (curtmp2 == 0) curtmp2 = 1;
ns->recv_speed = curtmp1 / (double) info.net_avg_samples;
ns->trans_speed = curtmp2 / (double) info.net_avg_samples;
if (info.net_avg_samples > 1) {
}
}
+#ifdef HAVE_IWLIB
+ /* update wireless info */
+ winfo = malloc(sizeof(struct wireless_info));
+ memset(winfo, 0, sizeof(struct wireless_info));
+
+ skfd = iw_sockets_open();
+ if(iw_get_basic_config(skfd, s, &(winfo->b)) > -1) {
+
+ // set present winfo variables
+ if(iw_get_stats(skfd, s, &(winfo->stats), &winfo->range, winfo->has_range) >= 0)
+ winfo->has_stats = 1;
+ if(iw_get_range_info(skfd, s, &(winfo->range)) >= 0)
+ winfo->has_range = 1;
+ if(iw_get_ext(skfd, s, SIOCGIWAP, &wrq) >= 0) {
+ winfo->has_ap_addr = 1;
+ memcpy(&(winfo->ap_addr), &(wrq.u.ap_addr), sizeof (sockaddr));
+ }
+
+ // get bitrate
+ if(iw_get_ext(skfd, s, SIOCGIWRATE, &wrq) >= 0) {
+ memcpy(&(winfo->bitrate), &(wrq.u.bitrate), sizeof(iwparam));
+ iw_print_bitrate(ns->bitrate, 16, winfo->bitrate.value);
+ has_bitrate = 1;
+ }
+
+ // get link quality
+ if(winfo->has_range && winfo->has_stats && ((winfo->stats.qual.level != 0) || (winfo->stats.qual.updated & IW_QUAL_DBM))) {
+ if(!(winfo->stats.qual.updated & IW_QUAL_QUAL_INVALID)) {
+ ns->link_qual = winfo->stats.qual.qual;
+ ns->link_qual_max = winfo->range.max_qual.qual;
+ }
+ }
+
+ // get ap mac
+ if(winfo->has_ap_addr) {
+ iw_sawap_ntop(&winfo->ap_addr, ns->ap);
+ }
+
+ // get essid
+ if(winfo->b.has_essid) {
+ if(winfo->b.essid_on)
+ snprintf(ns->essid, 32, "%s", winfo->b.essid);
+ else
+ snprintf(ns->essid, 32, "off/any");
+ }
+
+ snprintf(ns->mode, 16, "%s", iw_operation_mode[winfo->b.mode]);
+ }
+ iw_sockets_close(skfd);
+ free(winfo);
+#endif
}
fclose(net_dev_fp);
sscanf(p, "%*d %d. %d. %d", &l, &m, &n);
ns->linkstatus = (int) (log(MIN(MAX(l,1),92)) / log(92) * 100);
-
}
/*** end wireless patch ***/
};
static short cpu_setup = 0;
-/*
- determine if this kernel gives us "extended" statistics information in /proc/stat.
- Kernels around 2.5 and earlier only reported user, system, nice and idle values in proc stat.
- Kernels around 2.6 and greater report these PLUS iowait, irq, softirq, and steal
+/*
+ determine if this kernel gives us "extended" statistics information in /proc/stat.
+ Kernels around 2.5 and earlier only reported user, system, nice and idle values in proc stat.
+ Kernels around 2.6 and greater report these PLUS iowait, irq, softirq, and steal
*/
-void determine_longstat(char * buf) {
+void determine_longstat(char * buf) {
unsigned long long iowait=0;
- KFLAG_SETOFF(KFLAG_IS_LONGSTAT);
+ KFLAG_SETOFF(KFLAG_IS_LONGSTAT);
/* scanf will either return -1 or 1 because there is only 1 assignment */
if (sscanf(buf, "%*s %*d %*d %*d %*d %llu",&iowait)>0) KFLAG_SETON(KFLAG_IS_LONGSTAT);
}
unsigned int i;
unsigned int index;
double curtmp;
- char * stat_template=NULL;
+ char * stat_template=NULL;
unsigned int malloc_cpu_size=0;
-
+
/* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */
if (!cpu_setup || !info.cpu_usage) {
if (!stat_template) {
stat_template = KFLAG_ISSET(KFLAG_IS_LONGSTAT) ? TMPL_LONGSTAT : TMPL_SHORTSTAT ;
- }
+ }
if (!cpu) {
malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info);
info.mask |= (1 << INFO_RUN_PROCS);
} else if (strncmp(buf, "cpu", 3) == 0) {
index = isdigit(buf[3]) ? ((int)buf[3]) - 0x2F : 0;
- sscanf(buf, stat_template
+ sscanf(buf, stat_template
, &(cpu[index].cpu_user)
, &(cpu[index].cpu_nice)
, &(cpu[index].cpu_system)
, &(cpu[index].cpu_steal)
);
- cpu[index].cpu_total = cpu[index].cpu_user
- + cpu[index].cpu_nice
- + cpu[index].cpu_system
- + cpu[index].cpu_idle
- + cpu[index].cpu_iowait
+ cpu[index].cpu_total = cpu[index].cpu_user
+ + cpu[index].cpu_nice
+ + cpu[index].cpu_system
+ + cpu[index].cpu_idle
+ + cpu[index].cpu_iowait
+ cpu[index].cpu_irq
+ cpu[index].cpu_softirq
- + cpu[index].cpu_steal
- ;
+ + cpu[index].cpu_steal
+ ;
cpu[index].cpu_active_total = cpu[index].cpu_total - (cpu[index].cpu_idle + cpu[index].cpu_iowait);
info.mask |= (1 << INFO_CPU);
double delta = current_update_time - last_update_time;
- if (delta <= 0.001) break;
+ if (delta <= 0.001) break;
- cpu[index].cpu_val[0] = (cpu[index].cpu_active_total - cpu[index].cpu_last_active_total) /
- (float )(cpu[index].cpu_total - cpu[index].cpu_last_total);
+ cpu[index].cpu_val[0] = (cpu[index].cpu_active_total - cpu[index].cpu_last_active_total) /
+ (float )(cpu[index].cpu_total - cpu[index].cpu_last_total);
curtmp = 0;
for (i=0; i < info.cpu_avg_samples; i++ ) {
curtmp += cpu[index].cpu_val[i];
}
- /* TESTING -- I've removed this, because I don't think it is right. You shouldn't divide
+ /* TESTING -- I've removed this, because I don't think it is right. You shouldn't divide
by the cpu count here ... removing for testing */
/* if (index == 0) {
- info.cpu_usage[index] = curtmp / info.cpu_avg_samples / info.cpu_count;
+ info.cpu_usage[index] = curtmp / info.cpu_avg_samples / info.cpu_count;
} else {
info.cpu_usage[index] = curtmp / info.cpu_avg_samples;
} */
i8k.bios = strtok(NULL,I8K_DELIM);
i8k.serial = strtok(NULL,I8K_DELIM);
i8k.cpu_temp = strtok(NULL,I8K_DELIM);
- i8k.left_fan_status = strtok(NULL,I8K_DELIM);
- i8k.right_fan_status = strtok(NULL,I8K_DELIM);
+ i8k.left_fan_status = strtok(NULL,I8K_DELIM);
+ i8k.right_fan_status = strtok(NULL,I8K_DELIM);
i8k.left_fan_rpm = strtok(NULL,I8K_DELIM);
i8k.right_fan_rpm = strtok(NULL,I8K_DELIM);
i8k.ac_status = strtok(NULL,I8K_DELIM);
}
}
-#define I2C_DIR "/sys/bus/i2c/devices/"
-
-int
-open_i2c_sensor(const char *dev, const char *type, int n, int *div,
- char *devtype)
+int open_i2c_sensor(const char *dev, const char *type, int n, int *div, char *devtype)
{
+ char i2c_dir[64];
+ if (post_21_kernel) {
+ strncpy(i2c_dir, "/sys/bus/platform/devices/", 64);
+ } else {
+ strncpy(i2c_dir, "/sys/bus/i2c/devices/", 64);
+ }
char path[256];
char buf[256];
int fd;
/* if i2c device is NULL or *, get first */
if (dev == NULL || strcmp(dev, "*") == 0) {
static int rep = 0;
- if (!get_first_file_in_a_directory(I2C_DIR, buf, &rep))
+ if (!get_first_file_in_a_directory(i2c_dir, buf, &rep))
return -1;
dev = buf;
}
type = "in";
if (strcmp(type, "tempf") == 0) {
- snprintf(path, 255, I2C_DIR "%s/%s%d_input", dev, "temp", n);
+ snprintf(path, 255, "%s%s/%s%d_input", i2c_dir, dev, "temp", n);
} else {
- snprintf(path, 255, I2C_DIR "%s/%s%d_input", dev, type, n);
+ snprintf(path, 255, "%s%s/%s%d_input", i2c_dir, dev, type, n);
}
strncpy(devtype, path, 255);
/* test if *_div file exist, open it and use it as divisor */
if (strcmp(type, "tempf") == 0) {
- snprintf(path, 255, I2C_DIR "%s/%s%d_div", "one", "two",
+ snprintf(path, 255, "%s%s/%s%d_div", i2c_dir, "one", "two",
n);
} else {
- snprintf(path, 255, I2C_DIR "%s/%s%d_div", dev, type, n);
+ snprintf(path, 255, "%s%s/%s%d_div", i2c_dir, dev, type, n);
}
divfd = open(path, O_RDONLY);
if (*fd < 0)
ERR("can't open '%s': %s", devtype, strerror(errno));
- /* My dirty hack for computing CPU value
+ /* My dirty hack for computing CPU value
* Filedil, from forums.gentoo.org
*/
/* if (strstr(devtype, "temp1_input") != NULL)
if ( !p_client_buffer || client_buffer_size <= 0 )
return;
-
+
if ((fp = open_file(ADT746X_CPU, &rep)) == NULL
&& (fp = open_file(ADT746X_CPU_OLD, &rep)) == NULL)
{
fclose(fp);
}
- snprintf( p_client_buffer, client_buffer_size, "%s", adt746x_cpu_state );
+ snprintf( p_client_buffer, client_buffer_size, "%s", adt746x_cpu_state );
return;
}
#else
/* FIXME: hardwired: get freq for first cpu!
this whole function needs to be rethought and redone for
- multi-cpu/multi-core/multi-threaded environments and
- arbitrary combinations thereof
+ multi-cpu/multi-core/multi-threaded environments and
+ arbitrary combinations thereof
*/
get_freq( p_client_buffer, client_buffer_size, p_format, divisor, 1 );
return;
char frequency[32];
char s[256];
double freq = 0;
-
+
if ( !p_client_buffer || client_buffer_size <= 0 || !p_format || divisor <= 0 )
return 0;
-
+
if (!prefer_proc)
{
char current_freq_file[128];
snprintf(current_freq_file, 127, "%s/cpu%d/%s",CPUFREQ_PREFIX, cpu-1, CPUFREQ_POSTFIX);
f = fopen(current_freq_file, "r");
- if (f)
+ if (f)
{
/* if there's a cpufreq /sys node, read the current frequency from this node;
* divide by 1000 to get Mhz. */
return 1;
}
}
-
+
f = open_file("/proc/cpuinfo", &rep); //open the CPU information file
if (!f) {
perror("Conky: Failed to access '/proc/cpuinfo' at get_freq()");
strcpy(frequency, strchr(s, ':') + 2); //copy just the number
#if defined(__alpha)
frequency[strlen(frequency) - 6] = '\0';// strip " est.\n"
- freq = strtod(frequency, NULL)/1000000; // kernel reports in Hz
+ freq = strtod(frequency, NULL)/1000000; // kernel reports in Hz
#else
frequency[strlen(frequency) - 1] = '\0'; // strip \n
freq = strtod(frequency, NULL);
break;
}
if (strncmp(s, "processor", 9) == 0) {
- cpu--;
+ cpu--;
continue;
}
-
+
}
-
+
fclose(f);
snprintf( p_client_buffer, client_buffer_size, p_format, (float)freq/divisor );
return 1;
/* return cpu voltage in mV (use divisor=1) or V (use divisor=1000) */
char get_voltage( char * p_client_buffer, size_t client_buffer_size, char * p_format, int divisor, unsigned int cpu )
{
-/* /sys/devices/system/cpu/cpu0/cpufreq/scaling_voltages looks
+/* /sys/devices/system/cpu/cpu0/cpufreq/scaling_voltages looks
something like this:
# frequency voltage
1800000 1340
int voltage = 0;
char current_freq_file[128];
int freq_comp = 0;
-
+
/* build the voltage file name */
cpu--;
if (!get_first_file_in_a_directory(ACPI_AC_ADAPTER_DIR, buf, &rep))
{
snprintf( p_client_buffer, client_buffer_size, "no ac_adapters?" );
- return;
+ return;
}
snprintf(buf2, sizeof(buf2), "%s%s/state", ACPI_AC_ADAPTER_DIR, buf );
-
+
fp = open_file(buf2, &rep);
if (!fp) {
}
/*
-hipo@lepakko hipo $ cat /proc/acpi/battery/BAT1/info
+hipo@lepakko hipo $ cat /proc/acpi/battery/BAT1/info
present: yes
design capacity: 4400 mAh
last full capacity: 4064 mAh
*/
/*
-2213<@jupet kellari ö> jupet@lagi-unstable:~$ cat /proc/apm
+2213<@jupet kellari ö> jupet@lagi-unstable:~$ cat /proc/apm
2213<@jupet kellari ö> 1.16 1.2 0x03 0x01 0xff 0x10 -1% -1 ?
2213<@jupet kellari ö> (-1 ollee ei akkua kiinni, koska akku on pöydällä)
-2214<@jupet kellari ö> jupet@lagi-unstable:~$ cat /proc/apm
+2214<@jupet kellari ö> jupet@lagi-unstable:~$ cat /proc/apm
2214<@jupet kellari ö> 1.16 1.2 0x03 0x01 0x03 0x09 98% -1 ?
2238<@jupet kellari ö> 1.16 1.2 0x03 0x00 0x00 0x01 100% -1 ? ilman verkkovirtaa
#define ACPI_BATTERY_BASE_PATH "/proc/acpi/battery"
#define APM_PATH "/proc/apm"
+#define MAX_BATTERY_COUNT 4
+
+static FILE *acpi_bat_fp[MAX_BATTERY_COUNT];
+static FILE *apm_bat_fp[MAX_BATTERY_COUNT];
+
+static int batteries_initialized = 0;
+static char batteries[MAX_BATTERY_COUNT][32];
+
+static int acpi_last_full[MAX_BATTERY_COUNT];
+static int acpi_design_capacity[MAX_BATTERY_COUNT];
+
+static char last_battery_str[MAX_BATTERY_COUNT][64]; /* e.g. "charging 75%" */
+static char last_battery_time_str[MAX_BATTERY_COUNT][64]; /* e.g. "3h 15m" */
+
+static double last_battery_time[MAX_BATTERY_COUNT];
+
+static int last_battery_perct[MAX_BATTERY_COUNT];
+static double last_battery_perct_time[MAX_BATTERY_COUNT];
-static FILE *acpi_bat_fp;
-static FILE *apm_bat_fp;
-static int acpi_last_full;
+void init_batteries(void)
+{
+ int idx;
+ if(batteries_initialized)
+ return;
+ for(idx = 0; idx < MAX_BATTERY_COUNT; idx++)
+ batteries[idx][0] = '\0';
+ batteries_initialized = 1;
+}
-static char last_battery_str[64]; /* e.g. "charging 75%" */
-static char last_battery_time_str[64]; /* e.g. "3h 15m" */
+int get_battery_idx(const char *bat)
+{
+ int idx;
+ for(idx = 0; idx < MAX_BATTERY_COUNT; idx++)
+ if(!strlen(batteries[idx]) || !strcmp(batteries[idx], bat))
+ break;
+
+ /* if not found, enter a new entry */
+ if(!strlen(batteries[idx]))
+ snprintf(batteries[idx], 31, "%s", bat);
-static double last_battery_time;
+ return idx;
+}
void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
{
- static int rep = 0, rep2 = 0;
+ static int idx, rep = 0, rep2 = 0;
char acpi_path[128];
snprintf(acpi_path, 127, ACPI_BATTERY_BASE_PATH "/%s/state", bat);
+ init_batteries();
+
+ idx = get_battery_idx(bat);
+
/* don't update battery too often */
- if (current_update_time - last_battery_time < 29.5)
- goto set_return_value;
+ if (current_update_time - last_battery_time[idx] < 29.5)
+ goto set_return_value;
- last_battery_time = current_update_time;
+ last_battery_time[idx] = current_update_time;
- memset (last_battery_str, 0, sizeof (last_battery_str));
- memset (last_battery_time_str, 0, sizeof (last_battery_time_str));
+ memset (last_battery_str[idx], 0, sizeof (last_battery_str[idx]));
+ memset (last_battery_time_str[idx], 0, sizeof (last_battery_time_str[idx]));
/* first try ACPI */
- if (acpi_bat_fp == NULL && apm_bat_fp == NULL)
- acpi_bat_fp = open_file(acpi_path, &rep);
+ if (acpi_bat_fp[idx] == NULL && apm_bat_fp[idx] == NULL)
+ acpi_bat_fp[idx] = open_file(acpi_path, &rep);
- if (acpi_bat_fp != NULL) {
+ if (acpi_bat_fp[idx] != NULL) {
int present_rate = -1;
int remaining_capacity = -1;
char charging_state[64];
char present[4];
/* read last full capacity if it's zero */
- if (acpi_last_full == 0) {
+ if (acpi_last_full[idx] == 0) {
static int rep = 0;
- char path[128];
+ char path[128];
FILE *fp;
snprintf(path, 127,
ACPI_BATTERY_BASE_PATH "/%s/info", bat);
char b[256];
if (fgets(b, 256, fp) == NULL)
break;
- if (sscanf(b, "last full capacity: %d", &acpi_last_full) != 0) {
+ if (sscanf(b, "last full capacity: %d", &acpi_last_full[idx]) != 0) {
break;
}
}
}
}
- fseek(acpi_bat_fp, 0, SEEK_SET);
+ fseek(acpi_bat_fp[idx], 0, SEEK_SET);
strcpy(charging_state, "unknown");
- while (!feof(acpi_bat_fp)) {
+ while (!feof(acpi_bat_fp[idx])) {
char buf[256];
- if (fgets(buf, 256, acpi_bat_fp) == NULL)
+ if (fgets(buf, 256, acpi_bat_fp[idx]) == NULL)
break;
/* let's just hope units are ok */
- if (strncmp (buf, "present:", 8) == 0)
+ if (strncmp (buf, "present:", 8) == 0)
sscanf(buf, "present: %4s", present);
else if (strncmp (buf, "charging state:", 15) == 0)
sscanf(buf, "charging state: %63s", charging_state);
}
/* Hellf[i]re notes that remaining capacity can exceed acpi_last_full */
- if (remaining_capacity > acpi_last_full)
- acpi_last_full = remaining_capacity; /* normalize to 100% */
+ if (remaining_capacity > acpi_last_full[idx])
+ acpi_last_full[idx] = remaining_capacity; /* normalize to 100% */
/* not present */
if (strcmp(present, "no") == 0) {
- strncpy(last_battery_str, "not present", 64);
+ strncpy(last_battery_str[idx], "not present", 64);
}
/* charging */
else if (strcmp(charging_state, "charging") == 0) {
- if (acpi_last_full != 0 && present_rate > 0) {
+ if (acpi_last_full[idx] != 0 && present_rate > 0) {
/* e.g. charging 75% */
- snprintf(last_battery_str, sizeof(last_battery_str)-1, "charging %i%%",
- (int) ((remaining_capacity * 100) / acpi_last_full));
+ snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "charging %i%%",
+ (int) ((remaining_capacity * 100) / acpi_last_full[idx]));
/* e.g. 2h 37m */
- format_seconds(last_battery_time_str, sizeof(last_battery_time_str)-1,
- (long) (((acpi_last_full - remaining_capacity) * 3600) /
+ format_seconds(last_battery_time_str[idx], sizeof(last_battery_time_str[idx])-1,
+ (long) (((acpi_last_full[idx] - remaining_capacity) * 3600) /
present_rate));
- } else if (acpi_last_full != 0 && present_rate <= 0) {
- snprintf(last_battery_str, sizeof(last_battery_str)-1, "charging %d%%",
- (int) ((remaining_capacity * 100) / acpi_last_full));
+ } else if (acpi_last_full[idx] != 0 && present_rate <= 0) {
+ snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "charging %d%%",
+ (int) ((remaining_capacity * 100) / acpi_last_full[idx]));
} else {
- strncpy(last_battery_str, "charging", sizeof(last_battery_str)-1);
+ strncpy(last_battery_str[idx], "charging", sizeof(last_battery_str[idx])-1);
}
}
/* discharging */
else if (strncmp(charging_state, "discharging", 64) == 0) {
if (present_rate > 0) {
/* e.g. discharging 35% */
- snprintf(last_battery_str, sizeof(last_battery_str)-1, "discharging %i%%",
- (int) ((remaining_capacity * 100) / acpi_last_full));
+ snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "discharging %i%%",
+ (int) ((remaining_capacity * 100) / acpi_last_full[idx]));
/* e.g. 1h 12m */
- format_seconds(last_battery_time_str, sizeof(last_battery_time_str)-1,
+ format_seconds(last_battery_time_str[idx], sizeof(last_battery_time_str[idx])-1,
(long) ((remaining_capacity * 3600) / present_rate));
} else if (present_rate == 0) { /* Thanks to Nexox for this one */
- snprintf(last_battery_str, sizeof(last_battery_str)-1, "full");
+ snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "full");
} else {
- snprintf(last_battery_str, sizeof(last_battery_str)-1,
+ snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1,
"discharging %d%%",
- (int) ((remaining_capacity * 100) / acpi_last_full));
+ (int) ((remaining_capacity * 100) / acpi_last_full[idx]));
}
}
/* charged */
/* thanks to Lukas Zapletal <lzap@seznam.cz> */
else if (strncmp(charging_state, "charged", 64) == 0) {
- strcpy(last_battery_str, "charged");
- }
+ /* Below happens with the second battery on my X40,
+ * when the second one is empty and the first one
+ * being charged. */
+ if (remaining_capacity == 0)
+ strcpy(last_battery_str[idx], "empty");
+ else
+ strcpy(last_battery_str[idx], "charged");
+ }
/* unknown, probably full / AC */
else {
- if (acpi_last_full != 0
- && remaining_capacity != acpi_last_full)
- snprintf(last_battery_str, 64, "unknown %d%%",
- (int) ((remaining_capacity * 100) / acpi_last_full));
+ if (acpi_last_full[idx] != 0
+ && remaining_capacity != acpi_last_full[idx])
+ snprintf(last_battery_str[idx], 64, "unknown %d%%",
+ (int) ((remaining_capacity * 100) / acpi_last_full[idx]));
else
- strncpy(last_battery_str, "AC", 64);
+ strncpy(last_battery_str[idx], "AC", 64);
}
} else {
/* APM */
- if (apm_bat_fp == NULL)
- apm_bat_fp = open_file(APM_PATH, &rep2);
+ if (apm_bat_fp[idx] == NULL)
+ apm_bat_fp[idx] = open_file(APM_PATH, &rep2);
- if (apm_bat_fp != NULL) {
+ if (apm_bat_fp[idx] != NULL) {
int ac, status, flag, life;
- fscanf(apm_bat_fp,
+ fscanf(apm_bat_fp[idx],
"%*s %*s %*x %x %x %x %d%%",
&ac, &status, &flag, &life);
if (life == -1) {
/* could check now that there is ac */
- snprintf(last_battery_str, 64, "AC");
+ snprintf(last_battery_str[idx], 64, "AC");
} else if (ac && life != 100) { /* could check that status==3 here? */
- snprintf(last_battery_str, 64,
+ snprintf(last_battery_str[idx], 64,
"charging %d%%", life);
} else {
- snprintf(last_battery_str, 64, "%d%%",
+ snprintf(last_battery_str[idx], 64, "%d%%",
life);
}
/* it seemed to buffer it so file must be closed (or could use syscalls
* directly but I don't feel like coding it now) */
- fclose(apm_bat_fp);
- apm_bat_fp = NULL;
+ fclose(apm_bat_fp[idx]);
+ apm_bat_fp[idx] = NULL;
}
}
switch (item) {
case BATTERY_STATUS:
{
- snprintf(buf, n, "%s", last_battery_str);
+ snprintf(buf, n, "%s", last_battery_str[idx]);
break;
}
case BATTERY_TIME:
{
- snprintf(buf, n, "%s", last_battery_time_str);
+ snprintf(buf, n, "%s", last_battery_time_str[idx]);
break;
}
default:
break;
- }
+ }
return;
}
+int get_battery_perct(const char *bat)
+{
+ static int rep;
+ int idx;
+ char acpi_path[128];
+ snprintf(acpi_path, 127, ACPI_BATTERY_BASE_PATH "/%s/state", bat);
+
+ init_batteries();
+
+ idx = get_battery_idx(bat);
+
+ /* don't update battery too often */
+ if (current_update_time - last_battery_perct_time[idx] < 30) {
+ return last_battery_perct[idx];
+ }
+ last_battery_perct_time[idx] = current_update_time;
+
+ /* Only check for ACPI */
+
+ if (acpi_bat_fp[idx] == NULL && apm_bat_fp[idx] == NULL)
+ acpi_bat_fp[idx] = open_file(acpi_path, &rep);
+
+ int remaining_capacity = -1;
+ if (acpi_bat_fp[idx] != NULL) {
+ /* read last full capacity if it's zero */
+ if (acpi_design_capacity[idx] == 0) {
+ static int rep;
+ char path[128];
+ FILE *fp;
+ snprintf(path, 127,
+ ACPI_BATTERY_BASE_PATH "/%s/info", bat);
+ fp = open_file(path, &rep);
+ if (fp != NULL) {
+ while (!feof(fp)) {
+ char b[256];
+ if (fgets(b, 256, fp) == NULL)
+ break;
+ if (sscanf(b, "last full capacity: %d", &acpi_design_capacity[idx]) != 0) {
+ break;
+ }
+ }
+ fclose(fp);
+ }
+ }
+
+ fseek(acpi_bat_fp[idx], 0, SEEK_SET);
+
+ while (!feof(acpi_bat_fp[idx])) {
+ char buf[256];
+ if (fgets(buf, 256, acpi_bat_fp[idx]) == NULL)
+ break;
+
+ if (buf[0] == 'r')
+ sscanf(buf, "remaining capacity: %d",
+ &remaining_capacity);
+ }
+ }
+ if(remaining_capacity < 0)
+ return 0;
+ /* compute the battery percentage */
+ last_battery_perct[idx] =
+ (int) (((float)remaining_capacity/acpi_design_capacity[idx]) * 100);
+ return last_battery_perct[idx];
+}
+
+int get_battery_perct_bar(const char *bar)
+{
+ int idx;
+ get_battery_perct(bar);
+ idx = get_battery_idx(bar);
+ return (int) (last_battery_perct[idx] * 2.56 - 1);
+}
+
+
+
/* On Apple powerbook and ibook:
$ cat /proc/pmu/battery_0
flags : 00000013
static FILE* pmu_info_fp;
static char pb_battery_info[3][32];
static double pb_battery_info_update;
-
+
#define PMU_PATH "/proc/pmu"
void get_powerbook_batt_info(char *buf, size_t n, int i)
{
/* update percentage string */
if (time == 0)
- pb_battery_info[PB_BATT_PERCENT][0] = 0;
+ pb_battery_info[PB_BATT_PERCENT][0] = 0;
else
snprintf(pb_battery_info[PB_BATT_PERCENT],
sizeof(pb_battery_info[PB_BATT_PERCENT]),
/* update time string */
if (time == 0) /* fully charged or battery not present */
- pb_battery_info[PB_BATT_TIME][0] = 0;
+ pb_battery_info[PB_BATT_TIME][0] = 0;
else if (time < 60*60) /* don't show secs */
format_seconds_short(pb_battery_info[PB_BATT_TIME],
sizeof(pb_battery_info[PB_BATT_TIME]), time);
void update_diskio()
{
static unsigned int last = UINT_MAX;
+ static unsigned int last_read = UINT_MAX;
+ static unsigned int last_write = UINT_MAX;
FILE* fp;
- static int rep=0;
+ static int rep=0;
char buf[512];
int major, minor;
unsigned int current = 0;
+ unsigned int current_read = 0;
+ unsigned int current_write = 0;
unsigned int reads, writes = 0;
int col_count = 0;
- if (!(fp =open_file("/proc/diskstats", &rep)))
- {
- diskio_value=0;
- return;
- }
+ if (!(fp =open_file("/proc/diskstats", &rep))) {
+ diskio_value=0;
+ return;
+ }
/* read reads and writes from all disks (minor = 0), including
* cd-roms and floppies, and summ them up
*/
- current = 0;
while (!feof(fp)) {
fgets(buf, 512, fp);
col_count = sscanf(buf, "%u %u %*s %*u %*u %u %*u %*u %*u %u",
major != LVM_BLK_MAJOR && major != NBD_MAJOR &&
major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
current += reads + writes;
+ current_read += reads;
+ current_write += writes;
}
}
* "sectors read", and we therefore have to divide by two to
* get KB */
int tot = ((double)(current-last)/2);
+ int tot_read = ((double)(current_read-last_read)/2);
+ int tot_write = ((double)(current_write-last_write)/2);
+
+ if (last_read > current_read)
+ tot_read = 0;
+ if (last_write > current_write)
+ tot_write = 0;
+
if (last > current) {
/* we hit this either if it's the very first time we
* run this, or when /proc/diskstats overflows; while
tot = 0;
}
last = current;
+ last_read = current_read;
+ last_write = current_write;
diskio_value = tot;
+ diskio_read_value = tot_read;
+ diskio_write_value = tot_write;
- fclose(fp);
+ fclose(fp);
}
/* Here come the IBM ACPI-specific things. For reference, see
if ( !p_client_buffer || client_buffer_size <= 0 )
return;
-
+
FILE *fp;
unsigned int speed=0;
char fan[128];
- snprintf(fan, 127, "%s/fan",IBM_ACPI_DIR);
+ snprintf(fan, 127, "%s/fan",IBM_ACPI_DIR);
fp = fopen(fan, "r");
if (fp != NULL)
{
char line[256];
if (fgets(line, 255, fp) == NULL) break;
- if (sscanf(line, "speed: %d", &speed)) break;
+ if (sscanf(line, "speed: %d", &speed)) break;
}
}
- else
+ else
{
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove ibm* from your Conky config file.", fan, strerror(errno));
}
fclose(fp);
snprintf( p_client_buffer, client_buffer_size, "%d", speed );
return;
-
-}
+
+}
static double last_ibm_acpi_temp_time;
void get_ibm_acpi_temps()
{
-/* get the measured temperatures from the temperature sensors
+/* get the measured temperatures from the temperature sensors
on IBM/Lenovo laptops running the ibm acpi.
- There are 8 values in /proc/acpi/ibm/thermal, and according to
+ There are 8 values in /proc/acpi/ibm/thermal, and according to
http://ibm-acpi.sourceforge.net/README
these mean the following (at least on an IBM R51...)
0: CPU (also on the T series laptops)
4: Battery (?)
5: N/A
6: Battery (?)
-7: N/A
- I'm not too sure about those with the question mark, but the values I'm
- reading from *my* thermal file (on a T42p) look realistic for the
- hdd and the battery.
- #5 and #7 are always -128.
+7: N/A
+ I'm not too sure about those with the question mark, but the values I'm
+ reading from *my* thermal file (on a T42p) look realistic for the
+ hdd and the battery.
+ #5 and #7 are always -128.
/proc/acpi/ibm/thermal looks like this (1 line):
temperatures: 41 43 31 46 33 -128 29 -128
Peter Tarjan (ptarjan@citromail.hu)
*/
/* don't update too often */
- if (current_update_time - last_ibm_acpi_temp_time < 10.00)
+ if (current_update_time - last_ibm_acpi_temp_time < 10.00)
{
return;
}
- last_ibm_acpi_temp_time = current_update_time;
-
+ last_ibm_acpi_temp_time = current_update_time;
+
/* if ( !p_client_buffer || client_buffer_size <= 0 )
return; */
FILE *fp;
char thermal[128];
- snprintf(thermal, 127, "%s/thermal",IBM_ACPI_DIR);
+ snprintf(thermal, 127, "%s/thermal",IBM_ACPI_DIR);
fp = fopen(thermal, "r");
if (fp != NULL)
if (sscanf(line, "temperatures: %d %d %d %d %d %d %d %d",
&ibm_acpi.temps[0], &ibm_acpi.temps[1],
&ibm_acpi.temps[2], &ibm_acpi.temps[3],
- &ibm_acpi.temps[4], &ibm_acpi.temps[5],
+ &ibm_acpi.temps[4], &ibm_acpi.temps[5],
&ibm_acpi.temps[6], &ibm_acpi.temps[7])) break;
}
}
- else
+ else
{
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove ibm* from your Conky config file.", thermal, strerror(errno));
}
fclose(fp);
-}
+}
void get_ibm_acpi_volume( char * p_client_buffer, size_t client_buffer_size )
commands: level <level> (<level> is 0-15)
Peter Tarjan (ptarjan@citromail.hu)
*/
-
+
if ( !p_client_buffer || client_buffer_size <= 0 )
return;
-
+
FILE *fp;
char volume[128];
- snprintf(volume, 127, "%s/volume",IBM_ACPI_DIR);
+ snprintf(volume, 127, "%s/volume",IBM_ACPI_DIR);
unsigned int vol=-1;
char mute[3]="";
if (sscanf(line, "mute: %s", mute)) break;
}
}
- else
+ else
{
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove ibm* from your Conky config file.", volume, strerror(errno));
}
FILE *fp;
unsigned int brightness=0;
char filename[128];
- snprintf(filename, 127, "%s/brightness",IBM_ACPI_DIR);
+ snprintf(filename, 127, "%s/brightness",IBM_ACPI_DIR);
fp = fopen(filename, "r");
if (fp != NULL)
{
char line[256];
if (fgets(line, 255, fp) == NULL) break;
- if (sscanf(line, "level: %d", &brightness)) break;
+ if (sscanf(line, "level: %d", &brightness)) break;
}
}
- else
+ else
{
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove ibm* from your Conky config file.", filename, strerror(errno));
}
snprintf( p_client_buffer, client_buffer_size, "%d", brightness );
return;
-
-}
+
+}
void update_entropy (void)
{
info.mask |= (1 << INFO_ENTROPY);
}
-
-#ifdef HAVE_LIBDEXTER
-FILE *open_file(const char *file, int *reported)
-{
- /* this version of open_file() is the hook that ties the client/server code
- * into conky. if conky wants to open a /proc file that the server is feeding
- * us, we do not return an ordinary file stream pointer to the local /proc
- * filesystem. instead, we return a string stream pointer to the proc surrogate,
- * so conky parses remote data as if it were local.
- */
- FILE *fp;
-
- if ((strcmp (file,"/proc/cpuinfo")==0) && (procraw_mask & PROCRAW_CPUINFO))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.cpuinfo, procraw_data.cpuinfo_sz, "r");
- }
- else if ((strcmp (file,"/proc/loadavg")==0) && (procraw_mask & PROCRAW_LOADAVG))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.loadavg, procraw_data.loadavg_sz, "r");
- }
- else if ((strcmp (file,"/proc/meminfo")==0) && (procraw_mask & PROCRAW_MEMINFO))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.meminfo, procraw_data.meminfo_sz, "r");
- }
- else if ((strcmp (file,"/proc/stat")==0) && (procraw_mask & PROCRAW_STAT))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.stat, procraw_data.stat_sz, "r");
- }
- else if ((strcmp (file,"/proc/uptime")==0) && (procraw_mask & PROCRAW_UPTIME))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.uptime, procraw_data.uptime_sz, "r");
- }
- else if ((strcmp (file,"/proc/net/dev")==0) && (procraw_mask & PROCRAW_NET_DEV))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.net_dev, procraw_data.net_dev_sz, "r");
- }
- else if ((strcmp (file,"/proc/diskstats")==0) && (procraw_mask & PROCRAW_DISKSTATS))
- {
- if (!procraw_sampler)
- return NULL;
- fp = fmemopen (procraw_data.diskstats, procraw_data.diskstats_sz, "r");
- }
- else
- {
- fp = fopen(file, "r");
- }
-
- if (!fp)
- {
- if (!reported || *reported == 0)
- {
- ERR("can't open %s: %s", file, strerror(errno));
- if (reported)
- *reported = 1;
- }
- return 0;
- }
- return fp;
-}
-
-void sampler_data_callback (gpointer sampler, gpointer sampler_data)
-{
- /* callback runs in a thread */
- if (!sampler)
- return;
-
- if (sampler_data)
- {
- FILE *out;
- char *p;
- unsigned int i;
- DxtSysinfoProcrawData *data = (DxtSysinfoProcrawData *)sampler_data;
-
- /* use GNU string streams and stdio locking to exchange data with main thread. */
-
- /* update /proc/cpuinfo surrogate */
- for (;data->cpuinfo;)
- {
- if (!(out = open_memstream (&procraw_data.cpuinfo, &procraw_data.cpuinfo_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.cpuinfo)
- {
- free (procraw_data.cpuinfo); procraw_data.cpuinfo=NULL;
- }
- for (p=data->cpuinfo, i=0; i<data->cpuinfo_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/loadavg surrogate */
- for (;data->loadavg;)
- {
- if (!(out = open_memstream (&procraw_data.loadavg, &procraw_data.loadavg_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.loadavg)
- {
- free (procraw_data.loadavg); procraw_data.loadavg=NULL;
- }
- for (p=data->loadavg, i=0; i<data->loadavg_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/meminfo surrogate */
- for (;data->meminfo;)
- {
- if (!(out = open_memstream (&procraw_data.meminfo, &procraw_data.meminfo_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.meminfo)
- {
- free (procraw_data.meminfo); procraw_data.meminfo=NULL;
- }
- for (p=data->meminfo, i=0; i<data->meminfo_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/stat surrogate */
- for (;data->stat;)
- {
- if (!(out = open_memstream (&procraw_data.stat, &procraw_data.stat_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.stat)
- {
- free (procraw_data.stat); procraw_data.stat=NULL;
- }
- for (p=data->stat, i=0; i<data->stat_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/uptime surrogate */
- for (;data->uptime;)
- {
- if (!(out = open_memstream (&procraw_data.uptime, &procraw_data.uptime_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.uptime)
- {
- free (procraw_data.uptime); procraw_data.uptime=NULL;
- }
- for (p=data->uptime, i=0; i<data->uptime_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/net/dev surrogate */
- for (;data->net_dev;)
- {
- if (!(out = open_memstream (&procraw_data.net_dev, &procraw_data.net_dev_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.net_dev)
- {
- free (procraw_data.net_dev); procraw_data.net_dev=NULL;
- }
- for (p=data->net_dev, i=0; i<data->net_dev_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* update /proc/diskstats surrogate */
- for (;data->diskstats;)
- {
- if (!(out = open_memstream (&procraw_data.diskstats, &procraw_data.diskstats_sz)))
- break;
-
- flockfile (out);
- if (procraw_data.diskstats)
- {
- free (procraw_data.diskstats); procraw_data.diskstats=NULL;
- }
- for (p=data->diskstats, i=0; i<data->diskstats_sz; i++, p++)
- {
- /* we have the FILE lock so use faster putc_unlocked() */
- if (fputc_unlocked (*p, out) == EOF)
- break;
- }
- fclose (out);
- funlockfile (out);
- break;
- }
-
- /* record data packet arrival time */
- g_mutex_lock (packet_mutex);
- clock_gettime (CLOCK_REALTIME, &packet_arrival_time);
- g_mutex_unlock (packet_mutex);
-#ifdef DEBUG
- fprintf(stderr, "Conky: data packet arrived\n");
-#endif
-
- } /* if (sampler_data) ... */
-}
-
-/* return 0 on success, -1 on failure */
-int dexter_client_init (void)
-{
- /* init libdexter for linux-specific client-side activity */
-
- DexterServiceBroker *broker;
- DexterPluginServiceGroup *service_group;
- DexterPluginService *procraw_service;
- DexterSamplerDataCallback *callbacks;
- GError *error = NULL;
-
- /* create a service broker so we can query the server for its services */
- if (!(broker = dexter_service_broker_new (info.dexter.channel)))
- {
- ERR ("unable to create service broker");
- return (-1);
- }
-
- /* fetch the services from the server */
- service_group = dexter_service_broker_get_services (broker, DEXTER_SERVICE_SAMPLER, &error);
- if (error)
- {
- ERR("%s", error->message);
- g_clear_error (&error);
- dexter_service_broker_free (broker);
- return (-1);
- }
-
- /* dont need service broker any more */
- dexter_service_broker_free (broker);
- broker=NULL;
-
- /* find the procraw service */
- procraw_service=NULL;
- if (!dexterplugin_service_group_find_uuid (&procraw_service, service_group, PROCRAW_SERVICE_UUID))
- {
- ERR ("server doesn't offer the procraw service: (%s)", PROCRAW_SERVICE_UUID);
- dexterplugin_service_group_free (service_group);
- return (-1);
- }
-
- /* create null-terminated callback list with one callback on it */
- callbacks = g_new0 (DexterSamplerDataCallback, 2);
- callbacks[0] = sampler_data_callback;
-
- /* create the procraw timed sampler, timed to match conky's update_interval */
- procraw_sampler = dexter_timedsampler_new (procraw_service, update_interval*G_USEC_PER_SEC,
- callbacks, info.dexter.channel, &error);
- if (error)
- {
- ERR("%s", error->message);
- g_clear_error (&error);
- dexterplugin_service_group_free (service_group);
- return (-1);
- }
-
- /* free callbacks as libdexter makes internal copy */
- g_free (callbacks);
- callbacks=NULL;
-
- /* initialize the timed sampler */
- procraw_mask = 0;
- if (need_mask & (1 << INFO_FREQ))
- procraw_mask |= PROCRAW_CPUINFO;
- if (need_mask & (1 << INFO_LOADAVG))
- procraw_mask |= PROCRAW_LOADAVG;
- if ((need_mask & (1 << INFO_MEM)) || (need_mask & (1 << INFO_BUFFERS)))
- procraw_mask |= PROCRAW_MEMINFO;
- if ((need_mask & (1 << INFO_CPU)) || (need_mask & (1 << INFO_PROCS)) ||
- (need_mask & (1 << INFO_RUN_PROCS)) || (need_mask & (1 << INFO_FREQ )))
- procraw_mask |= PROCRAW_STAT;
- if (need_mask & (1 << INFO_UPTIME))
- procraw_mask |= PROCRAW_UPTIME;
- if (need_mask & (1 << INFO_NET))
- procraw_mask |= PROCRAW_NET_DEV;
- if (need_mask & (1 << INFO_DISKIO))
- procraw_mask |= PROCRAW_DISKSTATS;
-
- dexter_timedsampler_initialize (procraw_sampler, &procraw_mask, NULL, &error);
- if (error)
- {
- ERR("%s", error->message);
- g_clear_error (&error);
- dexter_timedsampler_free (procraw_sampler, NULL);
- dexterplugin_service_group_free (service_group);
- return (-1);
- }
-
- /* start the timed sampler and begin receiving updates from server */
- dexter_timedsampler_start (procraw_sampler, &error);
- if (error)
- {
- ERR("%s", error->message);
- g_clear_error (&error);
- dexter_timedsampler_free (procraw_sampler, NULL);
- dexterplugin_service_group_free (service_group);
- return (-1);
- }
-
- dexterplugin_service_group_free (service_group);
-
- /* so far, so good. tell the linux routines to read /proc,
- * even if other api's are available. */
- prefer_proc = 1;
-
- return 0;
-}
-
-/* return 0 on success, -1 on failure */
-int dexter_client_exit (void)
-{
- /* de-init libdexter for linux-specific client-side activity */
-
- if (procraw_sampler)
- {
- dexter_timedsampler_stop (procraw_sampler, NULL);
- dexter_timedsampler_free (procraw_sampler, NULL);
- procraw_sampler=NULL;
- }
-
- /* free left-over sampler data. ok to do this without thread sync because
- * this function runs in the same thread that conky issues open_file(). */
- if (procraw_data.cpuinfo)
- {
- free (procraw_data.cpuinfo); procraw_data.cpuinfo=NULL;
- }
- if (procraw_data.loadavg)
- {
- free (procraw_data.loadavg); procraw_data.loadavg=NULL;
- }
- if (procraw_data.meminfo)
- {
- free (procraw_data.meminfo); procraw_data.meminfo=NULL;
- }
- if (procraw_data.stat)
- {
- free (procraw_data.stat); procraw_data.stat=NULL;
- }
- if (procraw_data.uptime)
- {
- free (procraw_data.uptime); procraw_data.uptime=NULL;
- }
- if (procraw_data.net_dev)
- {
- free (procraw_data.net_dev); procraw_data.net_dev=NULL;
- }
- if (procraw_data.diskstats)
- {
- free (procraw_data.diskstats); procraw_data.diskstats=NULL;
- }
-
- info.uptime=0.0;
- info.procs=0;
- info.mem = info.memmax = info.swap = info.swapmax = info.bufmem = info.buffers = info.cached = 0;
- info.run_procs=0;
- if (info.cpu_usage)
- {
- memset(info.cpu_usage, 0, info.cpu_count * sizeof (float));
- }
- clear_net_stats ();
- diskio_value=0;
- return 0;
-}
-#endif
projects / monky / blobdiff