From patchwork Fri Sep 11 18:11:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Romain Lenglet X-Patchwork-Id: 516926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 10183140134 for ; Sat, 12 Sep 2015 04:11:47 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 46A7122C3C9; Fri, 11 Sep 2015 11:11:47 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 886CC10C5B for ; Fri, 11 Sep 2015 11:11:46 -0700 (PDT) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 11AEE420222 for ; Fri, 11 Sep 2015 12:11:46 -0600 (MDT) X-ASG-Debug-ID: 1441995104-03dc534840150d0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id 2ziq5IsFdCuoMVZC (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Sep 2015 12:11:44 -0600 (MDT) X-Barracuda-Envelope-From: romain.lenglet@oracle.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO userp1040.oracle.com) (156.151.31.81) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 11 Sep 2015 18:11:44 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at spf_s.oracle.com designates 156.151.31.81 as permitted sender) X-Barracuda-Apparent-Source-IP: 156.151.31.81 X-Barracuda-RBL-IP: 156.151.31.81 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t8BIBgCH018922 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Sep 2015 18:11:42 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t8BIBfci009583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 11 Sep 2015 18:11:42 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t8BIBfr9022618; Fri, 11 Sep 2015 18:11:41 GMT Received: from rlenglet-mac (/10.159.254.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 11 Sep 2015 11:11:41 -0700 Date: Fri, 11 Sep 2015 11:11:40 -0700 X-CudaMail-Envelope-Sender: romain.lenglet@oracle.com From: Romain Lenglet To: dev@openvswitch.org, Joe Stringer Message-ID: In-Reply-To: <1441935692-6848-3-git-send-email-joestringer@nicira.com> References: <1441935692-6848-1-git-send-email-joestringer@nicira.com> <1441935692-6848-3-git-send-email-joestringer@nicira.com> X-CudaMail-MID: CM-E2-910057746 X-CudaMail-DTE: 091115 X-CudaMail-Originating-IP: 156.151.31.81 X-Mailer: Airmail (303) X-ASG-Orig-Subj: [##CM-E2-910057746##]Re: [PATCH 2/3] ipfix: Add bridge_exporter_enabled(). MIME-Version: 1.0 X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-GBUdb-Analysis: 0, 156.151.31.81, Ugly c=0.396759 p=-0.191489 Source Normal X-MessageSniffer-Rules: 0-0-0-10883-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1441995104 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, HTML_MESSAGE, RDNS_NONE, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.22447 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 0.00 HTML_MESSAGE BODY: HTML included in message 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.16 Subject: Re: [ovs-dev] [PATCH 2/3] ipfix: Add bridge_exporter_enabled(). X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" LGTM, thanks! Acked-by: Romain Lenglet --  Romain Lenglet On September 10, 2015 at 6:41:42 PM, Joe Stringer (joestringer@nicira.com) wrote: Rather than describing this intention after the fact, encode this meaning in the name of a function. Signed-off-by: Joe Stringer --- ofproto/ofproto-dpif-ipfix.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.1.4 diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index b4d3ea0..48ff827 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -1674,6 +1674,12 @@ dpif_ipfix_sample(struct dpif_ipfix_exporter *exporter, ipfix_cache_update(exporter, entry); } +static bool +bridge_exporter_enabled(struct dpif_ipfix *di) +{ + return di->bridge_exporter.probability > 0; +} + void dpif_ipfix_bridge_sample(struct dpif_ipfix *di, const struct dp_packet *packet, const struct flow *flow, @@ -1822,7 +1828,7 @@ dpif_ipfix_run(struct dpif_ipfix *di) OVS_EXCLUDED(mutex) ovs_mutex_lock(&mutex); get_export_time_now(&export_time_usec, &export_time_sec); - if (di->bridge_exporter.probability > 0) { /* Bridge exporter enabled. */ + if (bridge_exporter_enabled(di)) { dpif_ipfix_cache_expire( &di->bridge_exporter.exporter, false, export_time_usec, export_time_sec); @@ -1842,7 +1848,7 @@ dpif_ipfix_wait(struct dpif_ipfix *di) OVS_EXCLUDED(mutex) struct dpif_ipfix_flow_exporter_map_node *flow_exporter_node; ovs_mutex_lock(&mutex); - if (di->bridge_exporter.probability > 0) { /* Bridge exporter enabled. */ + if (bridge_exporter_enabled(di)) { if (ipfix_cache_next_timeout_msec( &di->bridge_exporter.exporter, &next_timeout_msec)) { poll_timer_wait_until(next_timeout_msec);