umockdev-record: Support attributes in subdirs

The previous commit added support for mocking subdirectory attributes. This
provides the corresponding recording.

Thanks to evgeni for the initial patch!

#41

Author: martinpitt

NEWS

@@ -2,6 +2,7 @@
 ------------------
 - Fix compilation on sparc with gcc 4.9.
 - Support attributes with leading directory names, such as "queue/rotational".
+  (issue #41)
 
 0.8.5 (2014-07-11)
 ------------------

src/umockdev-record.vala

@@ -164,6 +164,58 @@ dev_contents(string dev)
     return result;
 }
 
+static void
+print_device_attributes(string devpath, string subdir)
+{
+    Dir d;
+    var attr_dir = Path.build_filename(devpath, subdir);
+    try {
+        d = Dir.open(attr_dir);
+    } catch (Error e) {
+        if (subdir == "") {
+            exit_error("Cannot open directory %s: %s", attr_dir, e.message);
+        } else {
+            // we ignore this on subdirs, some might be transient or
+            // inaccessible
+            debug("Cannot open directory %s: %s", attr_dir, e.message);
+        }
+        return;
+    }
+
+    var attributes = new List<string>();
+    string entry;
+    // filter out the uninteresting attributes, sort the others
+    while ((entry = d.read_name()) != null)
+        if (entry != "subsystem" && entry != "firmware_node" && entry != "uevent")
+            attributes.append(entry);
+        else {
+            // don't look into subdirs which are devices by themselves
+            if (subdir != "")
+                return;
+        }
+    attributes.sort(strcmp);
+
+    foreach (var attr in attributes) {
+        string attr_path = Path.build_filename(attr_dir, attr);
+        string attr_name = Path.build_filename(subdir, attr);
+        if (FileUtils.test(attr_path, FileTest.IS_SYMLINK)) {
+            try {
+                stdout.printf("L: %s=%s\n", attr_name, FileUtils.read_link(attr_path));
+            } catch (Error e) {
+                exit_error("Cannot read link %s: %s", attr_path, e.message);
+            }
+        } else if (FileUtils.test(attr_path, FileTest.IS_REGULAR)) {
+            uint8[] contents;
+            try {
+                FileUtils.get_data(attr_path, out contents);
+                write_attr(attr_name, contents);
+            } catch (FileError e) {} // some attributes are EACCES, or "no such device", etc.
+        } else if (FileUtils.test(attr_path, FileTest.IS_DIR)) {
+            print_device_attributes(devpath, attr);
+        }
+    }
+}
+
 static void
 record_device(string dev)
 {
@@ -208,39 +260,7 @@ record_device(string dev)
     }
 
     // now append all attributes
-    Dir d;
-    try {
-        d = Dir.open(dev);
-    } catch (Error e) {
-        exit_error("Cannot open directory %s: %s", dev, e.message);
-        return; /* not reached, just to avoid warnings */
-    }
-    var attributes = new List<string>();
-    string entry;
-    // filter out the uninteresting attributes, sort the others
-    while ((entry = d.read_name()) != null)
-        if (entry != "subsystem" && entry != "firmware_node" && entry != "uevent")
-            attributes.append(entry);
-    attributes.sort(strcmp);
-
-    foreach (var attr in attributes) {
-        string attr_path = Path.build_filename(dev, attr);
-        // only look at files or symlinks
-        if (FileUtils.test(attr_path, FileTest.IS_SYMLINK)) {
-            try {
-                stdout.printf("L: %s=%s\n", attr, FileUtils.read_link(attr_path));
-            } catch (Error e) {
-                exit_error("Cannot read link %s: %s", attr, e.message);
-            }
-        } else if (FileUtils.test(attr_path, FileTest.IS_REGULAR)) {
-            uint8[] contents;
-            try {
-                FileUtils.get_data(attr_path, out contents);
-                write_attr(attr, contents);
-            } catch (FileError e) {} // some attributes are EACCES, or "no such device", etc.
-        }
-    }
-
+    print_device_attributes(dev, "");
     stdout.putc('\n');
 }
 

src/umockdev.vala

@@ -210,6 +210,9 @@ public class Testbed: GLib.Object {
     public void set_attribute_link(string devpath, string name, string value)
     {
         var path = Path.build_filename(this.root_dir, devpath, name);
+        var dir = Path.get_dirname(path);
+        if (DirUtils.create_with_parents(dir, 0755) != 0)
+            error("cannot create attribute dir '%s': %s", dir, strerror(errno));
         if (FileUtils.symlink(value, path) < 0) {
             error("Cannot create symlink %s: %s", path, strerror(errno));
         }

tests/test-umockdev-record.vala

@@ -84,10 +84,13 @@ t_testbed_one ()
 
     var tb = new UMockdev.Testbed ();
     var syspath = tb.add_devicev ("pci", "dev1", null,
-                                  {"simple_attr", "1", "multiline_attr", "a\\b\nc\\d\nlast"},
+                                  {"simple_attr", "1",
+                                   "multiline_attr", "a\\b\nc\\d\nlast",
+                                   "knobs/red", "off"},
                                   {"SIMPLE_PROP", "1"});
     tb.set_attribute_binary (syspath, "binary_attr", {0x41, 0xFF, 0, 5, 0xFF, 0});
     tb.set_attribute_link (syspath, "driver", "../../drivers/foo");
+    tb.set_attribute_link (syspath, "power/fiddle", "../some/where");
 
     spawn (umockdev_record_path + " --all", out sout, out serr, out exit);
     assert_cmpstr (serr, Op.EQ, "");
@@ -97,7 +100,9 @@ E: SIMPLE_PROP=1
 E: SUBSYSTEM=pci
 H: binary_attr=41FF0005FF00
 L: driver=../../drivers/foo
+A: knobs/red=off
 A: multiline_attr=a\\b\nc\\d\nlast
+L: power/fiddle=../some/where
 A: simple_attr=1
 
 """);
@@ -112,7 +117,9 @@ t_testbed_multiple ()
     int exit;
 
     var tb = new UMockdev.Testbed ();
-    var dev1 = tb.add_devicev ("pci", "dev1", null, {"dev1color", "green"}, {"DEV1COLOR", "GREEN"});
+    var dev1 = tb.add_devicev ("pci", "dev1", null,
+                               {"dev1color", "green", "knobs/red", "off"},
+                               {"DEV1COLOR", "GREEN"});
     var subdev1 = tb.add_devicev ("pci", "subdev1", dev1, {"subdev1color", "yellow"},
                                   {"SUBDEV1COLOR", "YELLOW"});
     tb.add_devicev ("pci", "dev2", null, {"dev2color", "brown"}, {"DEV2COLOR", "BROWN"});
@@ -130,6 +137,7 @@ P: /devices/dev1
 E: DEV1COLOR=GREEN
 E: SUBSYSTEM=pci
 A: dev1color=green
+A: knobs/red=off
 
 """);
 
@@ -141,6 +149,7 @@ A: dev1color=green
 E: DEV1COLOR=GREEN
 E: SUBSYSTEM=pci
 A: dev1color=green
+A: knobs/red=off
 
 """);