[ovs-git] Open vSwitch: ofproto-dpif: Make sure one-packet flows have zero duration. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  6a0a5bbbca747ef3b12bb6810cc5e16a5fd7068e (commit)
       via  3b145dd7c001eb22f520b5ffd4179aaec59ebffe (commit)
      from  25f78c28faf4f3e059a006c8423b701fe9e9e77c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a0a5bbbca747ef3b12bb6810cc5e16a5fd7068e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6a0a5bbbca747ef3b12bb6810cc5e16a5fd7068e
Author: Ben Pfaff <blp at nicira.com>
		
ofproto-dpif: Make sure one-packet flows have zero duration.
		
A Nicira internal build recently failed the "ofproto-dpif - NetFlow flow
expiration" test because of the following difference in output:

     header: v5, seq 0, engine 2,1
    -rec: [...], 1 pkts, 60 bytes, ICMP 8:0, time <moment>
    +rec: [...], 1 pkts, 60 bytes, ICMP 8:0, time <range>

Looking at the actual output, it is:
    rec: 192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes,
    ICMP 8:0, time 8...9

That is, a one-packet flow was shown to have more than a momentary
duration, which doesn't make sense.

This commit fixes the problem by making sure that creating a facet and then
its initial subfacet only checks the current time once.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 3b145dd7c001eb22f520b5ffd4179aaec59ebffe
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=3b145dd7c001eb22f520b5ffd4179aaec59ebffe
Author: Ben Pfaff <blp at nicira.com>
		
ofproto-dpif: Avoid searching all subfacets when creating first in a facet.
		
When we create the first subfacet within a facet, we know that there
cannot be an existing subfacet with the same key, so we can skip the search
through the ofproto's table of subfacets.

This is a small optimization, but it should not affect the flow setup rate
in most benchmarks, because in the stressful situations that benchmarks
create, OVS does not set up flows.

Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 ofproto/ofproto-dpif.c |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Open vSwitch