Use new method to describe table entries in OpenFlow wire protocol.

[openvswitch] / switch / table.h

diff --git a/switch/table.h b/switch/table.h
index c86380a04d4eac02ba4cdd8d182817c8f519da79..1068a48fa26396e8581bb090df71ede8dbaa4e7f 100644 (file)
--- a/switch/table.h
+++ b/switch/table.h
@@ -45,9 +45,12 @@ struct list;
 
 /* Table statistics. */
 struct sw_table_stats {
-    const char *name;       /* Human-readable name. */
-    unsigned long int n_flows; /* Number of active flows. */
-    unsigned long int max_flows; /* Flow capacity. */
+    const char *name;            /* Human-readable name. */
+    uint32_t wildcards;          /* Bitmap of OFPFW_* wildcards that are
+                                    supported by the table. */
+    unsigned int n_flows;        /* Number of active flows. */
+    unsigned int max_flows;      /* Flow capacity. */
+    unsigned long int n_matched; /* Number of packets that have hit. */
 };
 
 /* Position within an iteration of a sw_table.
@@ -55,11 +58,16 @@ struct sw_table_stats {
  * The contents are private to the table implementation, except that a position
  * initialized to all-zero-bits represents the start of a table. */
 struct sw_table_position {
-       unsigned long private[4];
+    unsigned long private[4];
 };
 
 /* A single table of flows.  */
 struct sw_table {
+    /* Keep track of the number of packets that matched this table.  To
+     * make this 100% accurate, it should be atomic.  However, we're
+     * primarily concerned about speed. */
+    unsigned long int n_matched;
+
     /* Searches 'table' for a flow matching 'key', which must not have any
      * wildcard fields.  Returns the flow if successful, a null pointer
      * otherwise. */
@@ -89,23 +97,23 @@ struct sw_table {
     /* Destroys 'table', which must not have any users. */
     void (*destroy)(struct sw_table *table);
 
-       /* Iterates through the flow entries in 'table', passing each one
-        * matches 'key' to 'callback'.  The callback function should return 0
-        * to continue iteration or a nonzero error code to stop.  The iterator
-        * function returns either 0 if the table iteration completed or the
-        * value returned by the callback function otherwise.
-        *
-        * The iteration starts at 'position', which may be initialized to
-        * all-zero-bits to iterate from the beginning of the table.  If the
-        * iteration terminates due to an error from the callback function,
-        * 'position' is updated to a value that can be passed back to the
-        * iterator function to resume iteration later with the following
-        * flow. */
-       int (*iterate)(struct sw_table *table,
-                      const struct sw_flow_key *key,
-                      struct sw_table_position *position,
-                      int (*callback)(struct sw_flow *flow, void *private),
-                      void *private);
+    /* Iterates through the flow entries in 'table', passing each one
+     * matches 'key' to 'callback'.  The callback function should return 0
+     * to continue iteration or a nonzero error code to stop.  The iterator
+     * function returns either 0 if the table iteration completed or the
+     * value returned by the callback function otherwise.
+     *
+     * The iteration starts at 'position', which may be initialized to
+     * all-zero-bits to iterate from the beginning of the table.  If the
+     * iteration terminates due to an error from the callback function,
+     * 'position' is updated to a value that can be passed back to the
+     * iterator function to resume iteration later with the following
+     * flow. */
+    int (*iterate)(struct sw_table *table,
+               const struct sw_flow_key *key,
+               struct sw_table_position *position,
+               int (*callback)(struct sw_flow *flow, void *private),
+               void *private);
 
     /* Dumps statistics for 'table' into 'stats'. */
     void (*stats)(struct sw_table *table, struct sw_table_stats *stats);