Changeset 5067

Timestamp:

12/10/07 14:30:22 (10 months ago)

Author:

khali

Message:

libsensors: No longer depend on libsysfs.
Instead, access sysfs directly, using 3 embedded helper
functions. My motivations for doing this are:
* As far as I know, libsysfs is no longer maintained.
* libsysfs does much more than we need. For example, when asking for a
device attribute list, libsysfs will read the contents and permissions
of all attributes. Not only does this waste CPU cycles per se, but in
the case of hwmon driver it also triggers register reads, which can be
slow for SMBus chips.
* libsysfs enforces the difference between devices and class devices,
while future changes will be easier if we can handle both types alike.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/INSTALL (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c (modified) (13 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -4 +4 @@
-SVN
-  documentation: Update the application writing guidelines
+  libsensors: No longer depend on libsysfs
-  Makefile: No warnings about ld configuration for staged installations
-  pwmconfig: Really hide errors on sysfs writes

lm-sensors/branches/lm-sensors-3.0.0/INSTALL

@@ -15 +15 @@
-* bison
-* flex
-* libsysfs header files (from sysfsutils-devel)
-* rrd header files (optional, for sensord)
-
-Run-time dependencies:
-* libsysfs (from sysfsutils)
-* perl (for sensors-detect)
-* rrd (optional, for sensord)

lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk

@@ -60 +60 @@
-# How to create the shared library
-$(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
- -lsysfs
+
-
-$(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME)

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -29 +29 @@
-#include <limits.h>
-#include <errno.h>
-sysfs/libsysfs
+dirent
-#include "data.h"
-#include "error.h"
@@ -35 +35 @@
-#include "general.h"
-#include "sysfs.h"
+
+
+/****************************************************************************/
+
+#define ATTR_MAX        128
+
+/*
+ * Read an attribute from sysfs
+ * Returns a pointer to a freshly allocated string; free it yourself.
+ * If the file doesn't exist or can't be read, NULL is returned.
+ */
+static char *sysfs_read_attr(const char *device, const char *attr)
+{
+        char path[NAME_MAX];
+        char buf[ATTR_MAX], *p;
+        FILE *f;
+
+        snprintf(path, NAME_MAX, "%s/%s", device, attr);
+
+        if (!(f = fopen(path, "r")))
+                return NULL;
+        p = fgets(buf, ATTR_MAX, f);
+        fclose(f);
+        if (!p)
+                return NULL;
+
+        /* Last byte is a '\n'; chop that off */
+        p = strndup(buf, strlen(buf) - 1);
+        if (!p)
+                sensors_fatal_error(__FUNCTION__, "out of memory");
+        return p;
+}
+
+/*
+ * Call an arbitrary function for each class device of the given class
+ * Returns 0 on success (all calls returned 0), a positive errno for
+ * local errors, or a negative error value if any call fails.
+ */
+static int sysfs_foreach_classdev(const char *class_name,
+                                   int (*func)(char *, const char*))
+{
+        char path[NAME_MAX];
+        int path_off, ret;
+        DIR *dir;
+        struct dirent *ent;
+
+        path_off = snprintf(path, NAME_MAX, "%s/class/%s",
+                            sensors_sysfs_mount, class_name);
+        if (!(dir = opendir(path)))
+                return errno;
+
+        ret = 0;
+        while (!ret && (ent = readdir(dir))) {
+                if (ent->d_name[0] == '.')      /* skip hidden entries */
+                        continue;
+
+                snprintf(path + path_off, NAME_MAX - path_off, "/%s",
+                         ent->d_name);
+                ret = func(path, ent->d_name);
+        }
+
+        closedir(dir);
+        return ret;
+}
+
+/*
+ * Call an arbitrary function for each device of the given bus type
+ * Returns 0 on success (all calls returned 0), a positive errno for
+ * local errors, or a negative error value if any call fails.
+ */
+static int sysfs_foreach_busdev(const char *bus_type,
+                                 int (*func)(char *, const char*))
+{
+        char path[NAME_MAX];
+        int path_off, ret;
+        DIR *dir;
+        struct dirent *ent;
+
+        path_off = snprintf(path, NAME_MAX, "%s/bus/%s/devices",
+                            sensors_sysfs_mount, bus_type);
+        if (!(dir = opendir(path)))
+                return errno;
+
+        ret = 0;
+        while (!ret && (ent = readdir(dir))) {
+                if (ent->d_name[0] == '.')      /* skip hidden entries */
+                        continue;
+
+                snprintf(path + path_off, NAME_MAX - path_off, "/%s",
+                         ent->d_name);
+                ret = func(path, ent->d_name);
+        }
+
+        closedir(dir);
+        return ret;
+}
+
+/****************************************************************************/
-
-char sensors_sysfs_mount[NAME_MAX];
@@ -177 +275 @@
-}
-
+static int sensors_get_attr_mode(const char *device, const char *attr)
+{
+        char path[NAME_MAX];
+        struct stat st;
+        int mode = 0;
+
+        snprintf(path, NAME_MAX, "%s/%s", device, attr);
+        if (!stat(path, &st)) {
+                if (st.st_mode & S_IRUSR)
+                        mode |= SENSORS_MODE_R;
+                if (st.st_mode & S_IWUSR)
+                        mode |= SENSORS_MODE_W;
+        }
+        return mode;
+}
+
-static int sensors_read_dynamic_chip(sensors_chip_features *chip,
-struct sysfs_device *sysdir
+const char *dev_path
-{
-        int i, fnum = 0, sfnum = 0, prev_slot;
-struct sysfs_attribute *att
-list *attrs
+DIR *di
+irent *ent
-        sensors_subfeature *all_subfeatures;
-        sensors_subfeature *dyn_subfeatures;
@@ -189 +303 @@
-        sensors_subfeature_type sftype;
-
-
-
-
-
+
+
-
-        /* We use a large sparse table at first to store all found
@@ -202 +314 @@
-                sensors_fatal_error(__FUNCTION__, "Out of memory");
-
-dlist_for_each_data(attrs, attr, struct sysfs_attribute
-attr->
+while ((ent = readdir(dir))
+ent->d_
-                int nr;
+
+                if (ent->d_name[0] == '.')
+                        continue;
-
-                sftype = sensors_subfeature_get_type(name, &nr);
@@ -258 +373 @@
-                if (!(sftype & 0x80))
-                        all_subfeatures[i].flags |= SENSORS_COMPUTE_MAPPING;
-
-
-
-
+
-
-                sfnum++;
-        }
+        closedir(dir);
-
-        if (!sfnum) { /* No subfeature */
@@ -334 +447 @@
-        struct stat statbuf;
-
-
-
-
-
+
+
-         || statbuf.st_nlink <= 2)      /* Empty directory */
-                return 0;
@@ -345 +456 @@
-
-/* returns: 0 if successful, !0 otherwise */
-struct sysfs_device *dev
+char *dev_path, const char *dev_name
-{
-        int domain, bus, slot, fn;
-        int err = -SENSORS_ERR_KERNEL;
-struct sysfs_attribute *attr,
-SYSFS_PATH
+char
+NAME
-        sensors_chip_features entry;
-
-        /* ignore any device without name attribute */
-attr = sysfs_get_device_attr(dev
+entry.chip.prefix = sysfs_read_attr(dev_path
-                return 0;
-
-
-
-
-
-
-
+
-        if (!entry.chip.path)
-                sensors_fatal_error(__FUNCTION__, "out of memory");
-
-->
+_
-                /* find out if legacy ISA or not */
-                if (entry.chip.bus.nr == 9191) {
@@ -374 +480 @@
-                        entry.chip.bus.type = SENSORS_BUS_TYPE_I2C;
-                        snprintf(bus_path, sizeof(bus_path),
-/name
+
-                                sensors_sysfs_mount, entry.chip.bus.nr);
-
-
-
-
-
-
-
-
-
+
+
-                                        entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
-                                        entry.chip.bus.nr = 0;
-                                }
-
-sysfs_close_attribut
+fre
-                        }
-                }
-->
+_
-                          &entry.chip.addr) == 2) {
-                /* SPI */
-                entry.chip.bus.type = SENSORS_BUS_TYPE_SPI;
-->
+_
-                /* must be new ISA (platform driver) */
-                entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
-                entry.chip.bus.nr = 0;
-->
+_
-                /* PCI */
-                entry.chip.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
@@ -412 +512 @@
-        }
-
-
+_path
-                goto exit_free;
-        if (!entry.subfeature) { /* No subfeature, discard chip */
@@ -431 +531 @@
-static int sensors_read_sysfs_chips_compat(void)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -463 +559 @@
-int sensors_read_sysfs_chips(void)
-{
-
-
-
-
-
-
+
+
+
+
-                /* compatibility function for kernel 2.6.n where n <= 13 */
-                return sensors_read_sysfs_chips_compat();
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return ret;
+}
+
+/* returns 0 if successful, !0 otherwise */
+static int sensors_add_i2c_bus(char *path, const char *classdev)
+{
+        sensors_bus entry;
+
+        if (sscanf(classdev, "i2c-%hd", &entry.bus.nr) != 1 ||
+            entry.bus.nr == 9191) /* legacy ISA */
+                return 0;
+        entry.bus.type = SENSORS_BUS_TYPE_I2C;
+
+        /* Get the adapter name from the classdev "name" attribute
+         * (Linux 2.6.20 and later). If it fails, fall back to
+         * the device "name" attribute (for older kernels). */
+        entry.adapter = sysfs_read_attr(path, "name");
+        if (!entry.adapter)
+                entry.adapter = sysfs_read_attr(path, "device/name");
+        if (entry.adapter)
+                sensors_add_proc_bus(&entry);
+
+        return 0;
-}
-
@@ -498 +597 @@
-int sensors_read_sysfs_bus(void)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-