* derivatives without specific, written prior permission.
*/
+#include <config.h>
#include "table.h"
#include <stdlib.h>
#include "flow.h"
unsigned int max_flows;
unsigned int n_flows;
struct list flows;
+ struct list iter_flows;
+ unsigned long int next_serial;
};
static struct sw_flow *table_linear_lookup(struct sw_table *swt,
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow;
LIST_FOR_EACH (flow, struct sw_flow, node, &tl->flows) {
- if (flow_matches(&flow->key, key))
+ if (flow_matches_1wild(key, &flow->key))
return flow;
}
return NULL;
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *f;
- /* Replace flows that match exactly. */
+ /* Loop through the existing list of entries. New entries will
+ * always be placed behind those with equal priority. Just replace
+ * any flows that match exactly.
+ */
LIST_FOR_EACH (f, struct sw_flow, node, &tl->flows) {
- if (f->key.wildcards == flow->key.wildcards
- && flow_matches(&f->key, &flow->key)) {
+ if (f->priority == flow->priority
+ && f->key.wildcards == flow->key.wildcards
+ && flow_matches_2wild(&f->key, &flow->key)) {
+ /* Keep stats from the original flow */
+ flow->used = f->used;
+ flow->created = f->created;
+ flow->packet_count = f->packet_count;
+ flow->byte_count = f->byte_count;
+
+ flow->serial = f->serial;
list_replace(&flow->node, &f->node);
+ list_replace(&flow->iter_node, &f->iter_node);
flow_free(f);
return 1;
}
+
+ if (f->priority < flow->priority)
+ break;
}
- /* Table overflow? */
+ /* Make sure there's room in the table. */
if (tl->n_flows >= tl->max_flows) {
return 0;
}
tl->n_flows++;
- /* FIXME: need to order rules from most to least specific. */
- list_push_back(&tl->flows, &flow->node);
+ /* Insert the entry immediately in front of where we're pointing. */
+ flow->serial = tl->next_serial++;
+ list_insert(&f->node, &flow->node);
+ list_push_front(&tl->iter_flows, &flow->iter_node);
+
return 1;
}
+static int table_linear_modify(struct sw_table *swt,
+ const struct sw_flow_key *key,
+ const struct ofp_action *actions, int n_actions)
+{
+ struct sw_table_linear *tl = (struct sw_table_linear *) swt;
+ struct sw_flow *flow;
+ unsigned int count = 0;
+
+ LIST_FOR_EACH (flow, struct sw_flow, node, &tl->flows) {
+ if (flow_matches_1wild(&flow->key, key)) {
+ flow_replace_acts(flow, actions, n_actions);
+ count++;
+ }
+ }
+ return count;
+}
+
static void
do_delete(struct sw_flow *flow)
{
list_remove(&flow->node);
+ list_remove(&flow->iter_node);
flow_free(flow);
}
static int table_linear_delete(struct sw_table *swt,
- const struct sw_flow_key *key, int strict)
+ const struct sw_flow_key *key,
+ uint16_t priority, int strict)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow, *n;
unsigned int count = 0;
LIST_FOR_EACH_SAFE (flow, n, struct sw_flow, node, &tl->flows) {
- if (flow_del_matches(&flow->key, key, strict)) {
+ if (flow_del_matches(&flow->key, key, strict)
+ && (!strict || (flow->priority == priority))) {
do_delete(flow);
count++;
}
return count;
}
-static int table_linear_timeout(struct datapath *dp, struct sw_table *swt)
+static void table_linear_timeout(struct sw_table *swt, struct list *deleted)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow, *n;
- int count = 0;
LIST_FOR_EACH_SAFE (flow, n, struct sw_flow, node, &tl->flows) {
if (flow_timeout(flow)) {
- dp_send_flow_expired(dp, flow);
- do_delete(flow);
- count++;
+ list_remove(&flow->node);
+ list_remove(&flow->iter_node);
+ list_push_back(deleted, &flow->node);
+ tl->n_flows--;
}
}
- tl->n_flows -= count;
- return count;
}
static void table_linear_destroy(struct sw_table *swt)
free(tl);
}
-/* Linear table's private data is just a pointer to the table */
-
-static int table_linear_iterator(struct sw_table *swt,
- struct swt_iterator *swt_iter)
+static int table_linear_iterate(struct sw_table *swt,
+ const struct sw_flow_key *key,
+ struct sw_table_position *position,
+ int (*callback)(struct sw_flow *, void *),
+ void *private)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
-
- swt_iter->private = tl;
-
- if (!tl->n_flows)
- swt_iter->flow = NULL;
- else
- swt_iter->flow = CONTAINER_OF(list_front(&tl->flows), struct sw_flow, node);
-
- return 1;
-}
-
-static void table_linear_next(struct swt_iterator *swt_iter)
-{
- struct sw_table_linear *tl;
- struct list *next;
-
- if (swt_iter->flow == NULL)
- return;
-
- tl = (struct sw_table_linear *) swt_iter->private;
-
- next = swt_iter->flow->node.next;
- if (next == &tl->flows)
- swt_iter->flow = NULL;
- else
- swt_iter->flow = CONTAINER_OF(next, struct sw_flow, node);
+ struct sw_flow *flow;
+ unsigned long start;
+
+ start = ~position->private[0];
+ LIST_FOR_EACH (flow, struct sw_flow, iter_node, &tl->iter_flows) {
+ if (flow->serial <= start && flow_matches_2wild(key, &flow->key)) {
+ int error = callback(flow, private);
+ if (error) {
+ position->private[0] = ~(flow->serial - 1);
+ return error;
+ }
+ }
+ }
+ return 0;
}
-static void table_linear_iterator_destroy(struct swt_iterator *swt_iter)
-{}
-
static void table_linear_stats(struct sw_table *swt,
struct sw_table_stats *stats)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
stats->name = "linear";
- stats->n_flows = tl->n_flows;
+ stats->wildcards = OFPFW_ALL;
+ stats->n_flows = tl->n_flows;
stats->max_flows = tl->max_flows;
+ stats->n_matched = swt->n_matched;
}
swt = &tl->swt;
swt->lookup = table_linear_lookup;
swt->insert = table_linear_insert;
+ swt->modify = table_linear_modify;
swt->delete = table_linear_delete;
swt->timeout = table_linear_timeout;
swt->destroy = table_linear_destroy;
+ swt->iterate = table_linear_iterate;
swt->stats = table_linear_stats;
- swt->iterator = table_linear_iterator;
- swt->iterator_next = table_linear_next;
- swt->iterator_destroy = table_linear_iterator_destroy;
-
tl->max_flows = max_flows;
tl->n_flows = 0;
list_init(&tl->flows);
+ list_init(&tl->iter_flows);
+ tl->next_serial = 0;
return swt;
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff