match/filter: cache the number of arg matches to check

Signed-off-by: Tom Gundersen <[email protected]>
bus1 · Jan 29, 2018 · ccd06b2 · ccd06b2
1 parent dfcdee3
commit ccd06b2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/src/bus/driver.c b/src/bus/driver.c
@@ -328,6 +328,8 @@ static int driver_monitor(Bus *bus, Peer *sender, Message *message) {
         filter.interface = message->metadata.fields.interface;
         filter.member = message->metadata.fields.member,
         filter.path = message->metadata.fields.path;
+        filter.n_args = message->metadata.n_args;
+        filter.n_argpaths = message->metadata.n_args;
 
         for (size_t i = 0; i < message->metadata.n_args; ++i) {
                 if (message->metadata.args[i].element == 's') {
@@ -552,6 +554,8 @@ static int driver_notify_name_owner_changed(Bus *bus, MatchRegistry *matches, co
                 .argpaths[1] = old_owner,
                 .args[2] = new_owner,
                 .argpaths[2] = new_owner,
+                .n_args = 3,
+                .n_argpaths = 3,
         };
         static const CDVarType type[] = {
                 C_DVAR_T_INIT(

diff --git a/src/bus/match.c b/src/bus/match.c
@@ -92,8 +92,12 @@ static int match_keys_assign(MatchKeys *keys, const char *key, size_t n_key, con
 
                 if (match_key_equal("", key, n_key)) {
                         keys->filter.args[i] = value;
+                        if (i + 1 > keys->filter.n_args)
+                                keys->filter.n_args = i + 1;
                 } else if (match_key_equal("path", key, n_key)) {
                         keys->filter.argpaths[i] = value;
+                        if (i + 1 > keys->filter.n_argpaths)
+                                keys->filter.n_argpaths = i + 1;
                 } else
                         return MATCH_E_INVALID;
         } else {
@@ -306,7 +310,10 @@ static bool match_keys_match_filter(MatchKeys *keys, MatchFilter *filter) {
         if (keys->arg0namespace && !match_string_prefix(filter->args[0], keys->arg0namespace, '.', false))
                 return false;
 
-        for (unsigned int i = 0; i < C_ARRAY_SIZE(filter->args); i ++) {
+        if (keys->filter.n_args > filter->n_args)
+                return false;
+
+        for (unsigned int i = 0; i < keys->filter.n_args || i < keys->filter.n_argpaths; i ++) {
                 if (keys->filter.args[i] && !c_string_equal(keys->filter.args[i], filter->args[i]))
                         return false;
 
@@ -348,7 +355,17 @@ static int match_rule_compare(CRBTree *tree, void *k, CRBNode *rb) {
         if (key1->filter.type < key2->filter.type)
                 return -1;
 
-        for (size_t i = 0; i < C_ARRAY_SIZE(key1->filter.args); i ++) {
+        if (key1->filter.n_args < key2->filter.n_args)
+                return -1;
+        if (key1->filter.n_args > key2->filter.n_args)
+                return 1;
+
+        if (key1->filter.n_argpaths < key2->filter.n_argpaths)
+                return -1;
+        if (key1->filter.n_argpaths > key2->filter.n_argpaths)
+                return 1;
+
+        for (size_t i = 0; i < key1->filter.n_args || i < key1->filter.n_argpaths; i ++) {
                 if ((r = c_string_compare(key1->filter.args[i], key2->filter.args[i])) ||
                     (r = c_string_compare(key1->filter.argpaths[i], key2->filter.argpaths[i])))
                         return r;

diff --git a/src/bus/match.h b/src/bus/match.h
@@ -34,7 +34,9 @@ struct MatchFilter {
         const char *member;
         const char *path;
         const char *args[64];
+        size_t n_args;
         const char *argpaths[64];
+        size_t n_argpaths;
 };
 
 #define MATCH_FILTER_INIT {                             \

diff --git a/src/bus/peer.c b/src/bus/peer.c
@@ -772,6 +772,8 @@ int peer_broadcast(PolicySnapshot *sender_policy, NameSet *sender_names, MatchRe
                 filter->interface = message->metadata.fields.interface;
                 filter->member = message->metadata.fields.member,
                 filter->path = message->metadata.fields.path;
+                filter->n_args = message->metadata.n_args;
+                filter->n_argpaths = message->metadata.n_args;
 
                 for (size_t i = 0; i < message->metadata.n_args; ++i) {
                         if (message->metadata.args[i].element == 's') {

diff --git a/src/bus/test-match.c b/src/bus/test-match.c
@@ -198,6 +198,7 @@ static void test_individual_matches(void) {
         filter = (MatchFilter)MATCH_FILTER_INIT;
         assert(!test_match("arg0=/com/example/foo/", &filter));
         filter.args[0] = "/com/example/foo/";
+        filter.n_args = 1;
         assert(test_match("arg0=/com/example/foo/", &filter));
         assert(!test_match("arg0=/com/example/foo/bar", &filter));
         assert(!test_match("arg0=/com/example/foobar", &filter));
@@ -219,6 +220,7 @@ static void test_individual_matches(void) {
         filter = (MatchFilter)MATCH_FILTER_INIT;
         assert(!test_match("arg0path=/com/example/foo/", &filter));
         filter.argpaths[0] = "/com/example/foo/";
+        filter.n_argpaths = 1;
         assert(test_match("arg0path=/com/example/foo/", &filter));
         assert(test_match("arg0path=/com/example/foo/bar", &filter));
         assert(!test_match("arg0path=/com/example/foobar", &filter));
@@ -229,6 +231,7 @@ static void test_individual_matches(void) {
         filter = (MatchFilter)MATCH_FILTER_INIT;
         assert(!test_match("arg0path=/com/example/foo", &filter));
         filter.argpaths[0] = "/com/example/foo";
+        filter.n_argpaths = 1;
         assert(test_match("arg0path=/com/example/foo", &filter));
         assert(!test_match("arg0path=/com/example/foo/bar", &filter));
         assert(!test_match("arg0path=/com/example/foobar", &filter));
@@ -239,6 +242,7 @@ static void test_individual_matches(void) {
         filter = (MatchFilter)MATCH_FILTER_INIT;
         assert(!test_match("arg0namespace=com.example.foo", &filter));
         filter.args[0] = "com.example.foo";
+        filter.n_args = 1;
         assert(test_match("arg0namespace=com.example.foo", &filter));
         assert(!test_match("arg0namespace=com.example.foo.bar", &filter));
         assert(!test_match("arg0namespace=com.example.foobar", &filter));