Skip to contentSkip to conversation

udevd: Avoid repeated scans for goto targets (udev_iter_find_label)

PATCH In review Alan Jenkins 2 participants 2 messages Sep 28, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 udevd: Avoid repeated scans for goto targets (udev_iter_find_label)

The scans are now performed up-front at parse-time, instead of being repeated for each event at run-time.

Cachegrind reports a 5% reduction in cpu cycles
(excluding the time spent in-kernel).

udev/udev_rules.c +2 -2
index d4dcb06..9c37571 100644
@@ -1529,7 +1529,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
 				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
+				udev_rules_iter_goto(&iter, rule->goto_rule_off);
 			}
 		}
 	}
@@ -1609,7 +1609,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
 				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
+				udev_rules_iter_goto(&iter, rule->goto_rule_off);
 			}
 		}
 	}
udev/udev_rules.h +2 -1
index 02685e1..af96b81 100644
@@ -84,6 +84,7 @@ struct udev_rule {
 	struct key wait_for;
 	struct key label;
 	struct key goto_label;
+	size_t goto_rule_off;
 
 	struct key name;
 	struct key symlink;
@@ -122,7 +123,7 @@ extern void udev_rules_cleanup(struct udev_rules *rules);
 
 extern void udev_rules_iter_init(struct udev_rules_iter *iter, struct udev_rules *rules);
 extern struct udev_rule *udev_rules_iter_next(struct udev_rules_iter *iter);
-extern struct udev_rule *udev_rules_iter_label(struct udev_rules_iter *iter, const char *label);
+extern struct udev_rule *udev_rules_iter_goto(struct udev_rules_iter *iter, size_t rule_off);
 
 extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev);
 extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev);
udev/udev_rules_parse.c +41 -9

82 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Alan Jenkins

The scans are now performed up-front at parse-time, instead of being repeated for each event at run-time.

Cachegrind reports a 5% reduction in cpu cycles
(excluding the time spent in-kernel).

Both patches applied.

Thanks,
Kay