Rework STP implementation in controller.

[sliver-openvswitch.git] / switch / table-hash.c

diff --git a/switch/table-hash.c b/switch/table-hash.c
index 014529b..bef7d9e 100644 (file)
--- a/switch/table-hash.c
+++ b/switch/table-hash.c
@@ -37,8 +37,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "crc32.h"
-#include "flow.h"
 #include "datapath.h"
+#include "flow.h"
+#include "switch-flow.h"
 
 struct sw_table_hash {
     struct sw_table swt;
@@ -52,7 +53,8 @@ static struct sw_flow **find_bucket(struct sw_table *swt,
                                     const struct sw_flow_key *key)
 {
     struct sw_table_hash *th = (struct sw_table_hash *) swt;
-    unsigned int crc = crc32_calculate(&th->crc32, key, sizeof *key);
+    unsigned int crc = crc32_calculate(&th->crc32, key, 
+            offsetof(struct sw_flow_key, wildcards));
     return &th->buckets[crc & th->bucket_mask];
 }
 
@@ -90,6 +92,37 @@ static int table_hash_insert(struct sw_table *swt, struct sw_flow *flow)
     return retval;
 }
 
+static int table_hash_modify(struct sw_table *swt, 
+        const struct sw_flow_key *key, uint16_t priority, int strict,
+        const struct ofp_action_header *actions, size_t actions_len) 
+{
+    struct sw_table_hash *th = (struct sw_table_hash *) swt;
+    unsigned int count = 0;
+
+    if (key->wildcards == 0) {
+        struct sw_flow **bucket = find_bucket(swt, key);
+        struct sw_flow *flow = *bucket;
+        if (flow && flow_matches_desc(&flow->key, key, strict)
+                && (!strict || (flow->priority == priority))) {
+            flow_replace_acts(flow, actions, actions_len);
+            count = 1;
+        }
+    } else {
+        unsigned int i;
+
+        for (i = 0; i <= th->bucket_mask; i++) {
+            struct sw_flow **bucket = &th->buckets[i];
+            struct sw_flow *flow = *bucket;
+            if (flow && flow_matches_desc(&flow->key, key, strict)
+                    && (!strict || (flow->priority == priority))) {
+                flow_replace_acts(flow, actions, actions_len);
+                count++;
+            }
+        }
+    }
+    return count;
+}
+
 /* Caller must update n_flows. */
 static void
 do_delete(struct sw_flow **bucket)
@@ -121,7 +154,7 @@ static int table_hash_delete(struct sw_table *swt,
         for (i = 0; i <= th->bucket_mask; i++) {
             struct sw_flow **bucket = &th->buckets[i];
             struct sw_flow *flow = *bucket;
-            if (flow && flow_del_matches(&flow->key, key, strict)) {
+            if (flow && flow_matches_desc(&flow->key, key, strict)) {
                 do_delete(bucket);
                 count++;
             }
@@ -197,8 +230,10 @@ static void table_hash_stats(struct sw_table *swt,
 {
     struct sw_table_hash *th = (struct sw_table_hash *) swt;
     stats->name = "hash";
-    stats->n_flows = th->n_flows;
+    stats->wildcards = 0;        /* No wildcards are supported. */
+    stats->n_flows   = th->n_flows;
     stats->max_flows = th->bucket_mask + 1;
+    stats->n_lookup  = swt->n_lookup;
     stats->n_matched = swt->n_matched;
 }
 
@@ -211,6 +246,7 @@ struct sw_table *table_hash_create(unsigned int polynomial,
     th = malloc(sizeof *th);
     if (th == NULL)
         return NULL;
+    memset(th, '\0', sizeof *th);
 
     assert(!(n_buckets & (n_buckets - 1)));
     th->buckets = calloc(n_buckets, sizeof *th->buckets);
@@ -225,6 +261,7 @@ struct sw_table *table_hash_create(unsigned int polynomial,
     swt = &th->swt;
     swt->lookup = table_hash_lookup;
     swt->insert = table_hash_insert;
+    swt->modify = table_hash_modify;
     swt->delete = table_hash_delete;
     swt->timeout = table_hash_timeout;
     swt->destroy = table_hash_destroy;
@@ -266,6 +303,17 @@ static int table_hash2_insert(struct sw_table *swt, struct sw_flow *flow)
     return table_hash_insert(t2->subtable[1], flow);
 }
 
+static int table_hash2_modify(struct sw_table *swt, 
+        const struct sw_flow_key *key, uint16_t priority, int strict,
+        const struct ofp_action_header *actions, size_t actions_len) 
+{
+    struct sw_table_hash2 *t2 = (struct sw_table_hash2 *) swt;
+    return (table_hash_modify(t2->subtable[0], key, priority, strict,
+                    actions, actions_len)
+            + table_hash_modify(t2->subtable[1], key, priority, strict,
+                    actions, actions_len));
+}
+
 static int table_hash2_delete(struct sw_table *swt,
                               const struct sw_flow_key *key, 
                               uint16_t priority, int strict)
@@ -321,8 +369,10 @@ static void table_hash2_stats(struct sw_table *swt,
     for (i = 0; i < 2; i++)
         table_hash_stats(t2->subtable[i], &substats[i]);
     stats->name = "hash2";
-    stats->n_flows = substats[0].n_flows + substats[1].n_flows;
+    stats->wildcards = 0;        /* No wildcards are supported. */
+    stats->n_flows   = substats[0].n_flows + substats[1].n_flows;
     stats->max_flows = substats[0].max_flows + substats[1].max_flows;
+    stats->n_lookup  = swt->n_lookup;
     stats->n_matched = swt->n_matched;
 }
 
@@ -336,6 +386,7 @@ struct sw_table *table_hash2_create(unsigned int poly0, unsigned int buckets0,
     t2 = malloc(sizeof *t2);
     if (t2 == NULL)
         return NULL;
+    memset(t2, '\0', sizeof *t2);
 
     t2->subtable[0] = table_hash_create(poly0, buckets0);
     if (t2->subtable[0] == NULL)
@@ -348,6 +399,7 @@ struct sw_table *table_hash2_create(unsigned int poly0, unsigned int buckets0,
     swt = &t2->swt;
     swt->lookup = table_hash2_lookup;
     swt->insert = table_hash2_insert;
+    swt->modify = table_hash2_modify;
     swt->delete = table_hash2_delete;
     swt->timeout = table_hash2_timeout;
     swt->destroy = table_hash2_destroy;