ovs-dpctl: Show number of flows

Expose the number of flows present in a datapath to user-space
and to users via ovs-dpctl show.

e.g.:

ovs-dpctl show br3
system@br3:
	lookups: frags:0, hit:0, missed:0, lost:0
	flows: 0
	...

Signed-off-by: Simon Horman <horms@verge.net.au>
[Jesse: Add same logic to userspace datapath.]
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 3ec5be4e3bf55b0c7a554c51788b6f6740acb59b..b19123975ad1cca2fec2a958a734e3e048fb2840 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -747,6 +747,9 @@ static struct genl_ops dp_packet_genl_ops[] = {
 static void get_dp_stats(struct datapath *dp, struct odp_stats *stats)
 {
        int i;
+       struct tbl *table = get_table_protected(dp);
+
+       stats->n_flows = tbl_count(table);
 
        stats->n_frags = stats->n_hit = stats->n_missed = stats->n_lost = 0;
        for_each_possible_cpu(i) {

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 0b755e8ff260441edefad5c38a004de952fb4772..426236cd543e01d06622acc30bd37f05c3868cf9 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -133,6 +133,7 @@ struct odp_stats {
     uint64_t n_hit;             /* Number of flow table matches. */
     uint64_t n_missed;          /* Number of flow table misses. */
     uint64_t n_lost;            /* Number of misses not sent to userspace. */
+    uint64_t n_flows;           /* Number of flows present */
 };
 
 /* Logical ports. */

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index d48d7ae1f030568656608a9426316a6e1746a659..14b919275d2f9d190175a5a39f533fec68b540aa 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -302,6 +302,7 @@ dpif_netdev_get_stats(const struct dpif *dpif, struct odp_stats *stats)
 {
     struct dp_netdev *dp = get_dp_netdev(dpif);
     memset(stats, 0, sizeof *stats);
+    stats->n_flows = hmap_count(&dp->flow_table);
     stats->n_frags = dp->n_frags;
     stats->n_hit = dp->n_hit;
     stats->n_missed = dp->n_missed;

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index c7350e5c4433a947c9ba244e79dd6879532979de..415d276ec31221b3130f8c3b3337001688ebd18f 100644 (file)
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -369,6 +369,7 @@ show_dpif(struct dpif *dpif)
                (unsigned long long int) stats.n_hit,
                (unsigned long long int) stats.n_missed,
                (unsigned long long int) stats.n_lost);
+        printf("\tflows: %llu\n", (unsigned long long int)stats.n_flows);
     }
     DPIF_PORT_FOR_EACH (&dpif_port, &dump, dpif) {
         printf("\tport %u: %s", dpif_port.port_no, dpif_port.name);