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 5ce7f3bbccb43caaf792294bfd4d776bfcc6b8b6..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.
@@ -60,6 +63,11 @@ struct sw_table_position {
 
 /* 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. */