[ovs-git] Open vSwitch: netflow: Fold netflow_expire() into netflow_flow_clear(). (branch-2.1)

dev at openvswitch.org dev at openvswitch.org
Mon Jun 9 18:06:00 UTC 2014


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, branch-2.1 has been updated
       via  6d83989b811bbc64632265d4bb8de7fe4a1042ab (commit)
      from  8fa77b72a667fbc550b5237726e26fbf0421a7aa (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 6d83989b811bbc64632265d4bb8de7fe4a1042ab
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6d83989b811bbc64632265d4bb8de7fe4a1042ab
Author: Anoob Soman <anoob.soman at citrix.com>
		
netflow: Fold netflow_expire() into netflow_flow_clear().
		
netflow_flow_clear() asserted that no packets or bytes were included
in the statistics for the flow being cleared.  Before threading Open
vSwitch, this assertion was always true because netflow_expire() was
always called before calling netflow_flow_clear().  Since Open
vSwitch was threaded, however, it was possible that a packet arrived
after netflow_expire() but before netflow_flow_clear(), since each of
these function separately took the netflow mutex.

This commit fixes the problem by merging netflow_expire() into
netflow_flow_clear(), under a single acquisition of the netflow
mutex.

Signed-off-by: Anoob Soman <anoob.soman at citrix.com>
[blp at nicira.com modified the patch to remove netflow_expire() and
 rewrote the commit message]
Signed-off-by: Ben Pfaff <blp at nicira.com>


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

Summary of changes:
 ofproto/netflow.c             |   16 +---------------
 ofproto/netflow.h             |    3 +--
 ofproto/ofproto-dpif-upcall.c |    2 --
 3 files changed, 2 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list