snprintf(p_client_buffer, client_buffer_size, "%s", buf);
}
-#define SYSFS_AC_ADAPTER_DIR "/sys/class/power_supply/AC"
+#define SYSFS_AC_ADAPTER_DIR "/sys/class/power_supply"
#define ACPI_AC_ADAPTER_DIR "/proc/acpi/ac_adapter/"
/* Linux 2.6.25 onwards ac adapter info is in
/sys/class/power_supply/AC/
POWER_SUPPLY_NAME=AC
POWER_SUPPLY_TYPE=Mains
POWER_SUPPLY_ONLINE=1
+
+ Update: it seems the folder name is hardware-dependent. We add an aditional adapter
+ argument, specifying the folder name.
+
+ Update: on some systems it's /sys/class/power_supply/ADP1 instead of /sys/class/power_supply/AC
*/
-void get_acpi_ac_adapter(char *p_client_buffer, size_t client_buffer_size)
+void get_acpi_ac_adapter(char *p_client_buffer, size_t client_buffer_size, const char *adapter)
{
static int rep = 0;
char buf[256];
char buf2[256];
+ struct stat sb;
FILE *fp;
if (!p_client_buffer || client_buffer_size <= 0) {
return;
}
- snprintf(buf2, sizeof(buf2), "%s/uevent", SYSFS_AC_ADAPTER_DIR);
- fp = open_file(buf2, &rep);
+ if(adapter)
+ snprintf(buf2, sizeof(buf2), "%s/%s/uevent", SYSFS_AC_ADAPTER_DIR, adapter);
+ else{
+ snprintf(buf2, sizeof(buf2), "%s/AC/uevent", SYSFS_AC_ADAPTER_DIR);
+ if(stat(buf2, &sb) == -1) snprintf(buf2, sizeof(buf2), "%s/ADP1/uevent", SYSFS_AC_ADAPTER_DIR);
+ }
+ if(stat(buf2, &sb) == 0) fp = open_file(buf2, &rep); else fp = 0;
if (fp) {
/* sysfs processing */
while (!feof(fp)) {
return (state > 0) ? "frozen" : "free ";
}
+typedef struct DEV_LIST_TYPE
+{
+ char *dev_name;
+ int memoized;
+ struct DEV_LIST_TYPE *next;
+
+} DEV_LIST, *DEV_LIST_PTR;
+
+/* Same as sf #2942117 but memoized using a linked list */
+int is_disk(char *dev)
+{
+ char syspath[PATH_MAX];
+ char *slash;
+ static DEV_LIST_PTR dev_head = NULL;
+ DEV_LIST_PTR dev_cur, dev_last;
+
+ dev_cur = dev_head;
+
+ while (dev_cur) {
+ if (strcmp(dev_cur->dev_name, dev) == 0)
+ return dev_cur->memoized;
+ dev_last = dev_cur;
+ dev_cur = dev_cur->next;
+ }
+
+ dev_cur = (DEV_LIST_PTR)malloc(sizeof(DEV_LIST));
+ dev_cur->dev_name = (char *)malloc((strlen(dev)+1)*sizeof(char));
+ strcpy(dev_cur->dev_name,dev);
+ dev_cur->next = NULL;
+
+ while ((slash = strchr(dev, '/')))
+ *slash = '!';
+ snprintf(syspath, sizeof(syspath), "/sys/block/%s", dev);
+ dev_cur->memoized = !(access(syspath, F_OK));
+
+ if (dev_head)
+ dev_last->next = dev_cur;
+ else
+ dev_head = dev_cur;
+
+ return dev_cur->memoized;
+}
+
void update_diskio(void)
{
FILE *fp;
* XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
&& major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
- total_reads += reads;
- total_writes += writes;
+ /* check needed for kernel >= 2.6.31, see sf #2942117 */
+ if (is_disk(devbuf)) {
+ total_reads += reads;
+ total_writes += writes;
+ }
} else {
col_count = sscanf(buf, "%u %u %s %*u %u %*u %u",
&major, &minor, devbuf, &reads, &writes);