Optimize the elements the iterator visits.

In this patch we introduce testing whether the iterator points to a
unique set of entries that have not been seen before at one of the previous
iterations. The point is to eliminate duplicates and with that unnecessary
filtering rules by preventing identical filtering rules from being
instantiated.
Example with two lists:

list1 = [1,2,1]
list2 = [1,3,1]

The 1st iteration would take the 1st items of each list -> 1,1
The 2nd iteration would take the 2nd items of each list -> 2,3
The 3rd iteration would take the 3rd items of each list -> 1,1 but
skip them since this same pair has already been encountered in the 1st
iteration

Implementation-wise this is solved by taking the n-th element of list1 and
comparing it against elements 1..n-1. If no equivalent is found, then there
is no possibility of this being a duplicate. In case an equivalent element
is found at position i, then the n-th element in the 2nd list is compared
against the i-th element in the 2nd list and if that is not the same, then
this is a unique pair, otherwise it is not unique and we may need to do
the same comparison on the 3rd list.

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index f821b9c043c937c63d500eaf0f3ede01b9c2cfbd..b009edf15251fe9430f4859e4c494b2a012f8c2b 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -347,6 +347,52 @@ virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntryPtr cie,
     return 0;
 }
 
+/*
+ * Test whether the iterator entry points to a distinguished set of entries
+ * that have not been seen before at one of the previous iterations.
+ *
+ * The point of this function is to eliminate duplicates.
+ * Example with two lists:
+ *
+ * list1 = [1,2,1]
+ * list2 = [1,3,1]
+ *
+ * The 1st iteration would take the 1st items of each list -> 1,1
+ * The 2nd iteration would take the 2nd items of each list -> 2,3
+ * The 3rd iteration would take the 3rd items of each list -> 1,1 but
+ * skip them since this pair has already been encountered in the 1st iteration
+ */
+static bool
+virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie,
+                                            virNWFilterHashTablePtr hash)
+{
+    unsigned int i, j;
+    virNWFilterVarValuePtr varValue, tmp;
+    const char *value;
+
+    varValue = virHashLookup(hash->hashTable, cie->varNames[0]);
+
+    value = virNWFilterVarValueGetNthValue(varValue, cie->curValue);
+
+    for (i = 0; i < cie->curValue; i++) {
+        if (STREQ(value, virNWFilterVarValueGetNthValue(varValue, i))) {
+            bool isSame = true;
+            for (j = 1; j < cie->nVarNames; j++) {
+                tmp = virHashLookup(hash->hashTable, cie->varNames[j]);
+                if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue),
+                           virNWFilterVarValueGetNthValue(tmp, i))) {
+                    isSame = false;
+                    break;
+                }
+            }
+            if (isSame)
+                return false;
+        }
+    }
+
+    return true;
+}
+
 /*
  * Create an iterator over the contents of the given variables. All variables
  * must have entries in the hash table.
@@ -414,11 +460,16 @@ virNWFilterVarCombIterNext(virNWFilterVarCombIterPtr ci)
     unsigned int i;
 
     for (i = 0; i < ci->nIter; i++) {
+next:
         ci->iter[i].curValue++;
-        if (ci->iter[i].curValue <= ci->iter[i].maxValue)
+        if (ci->iter[i].curValue <= ci->iter[i].maxValue) {
+            if (!virNWFilterVarCombIterEntryAreUniqueEntries(
+                                              &ci->iter[i], ci->hashTable))
+                goto next;
             break;
-        else
+        } else {
             ci->iter[i].curValue = 0;
+        }
     }
 
     if (ci->nIter == i) {