[ovs-dev] [PATCH] dpif-netdev: Rename "size" variable to "cnt".

[Darrell Ball]

I applied the patch to dpdk_merge here

https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_darball_ovs_commits_dpdk-5Fmerge&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=A2_FCacqbp2moAo3HGFlTuxsjONUGhlN42OBcAuQQ6w&s=b6btPKhgvOFr2GOUYvktND6kaC6jc3fXI-mXfvNgXOU&e=


    
    On 9/1/17, 6:01 AM, "ovs-dev-bounces at openvswitch.org on behalf of Cian Ferriter" <ovs-dev-bounces at openvswitch.org on behalf of cian.ferriter at intel.com> wrote:
    
        Commit 72c84bc (dp-packet: Enhance packet batch APIs.) changed how the amount
        of packets to be processed is retrieved. In the process, the patch used "size"
        as the variable holding the amount of packets rather than "cnt". Change this
        back to match with the "emc_processing()" comment.
        
        Signed-off-by: Cian Ferriter <cian.ferriter at intel.com>
        ---
        Alternatively the comment above "emc_processing()" could be changed:
        -/* Try to process all ('cnt') the 'packets' using only the exact match cache
        +/* Try to process all ('size') the 'packets' using only the exact match cache
        
         lib/dpif-netdev.c |    8 ++++----
         1 files changed, 4 insertions(+), 4 deletions(-)
        
        diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
        index 071ec14..08db217 100644
        --- a/lib/dpif-netdev.c
        +++ b/lib/dpif-netdev.c
        @@ -4872,13 +4872,13 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,
             struct netdev_flow_key *key = &keys[0];
             size_t n_missed = 0, n_dropped = 0;
             struct dp_packet *packet;
        -    const size_t size = dp_packet_batch_size(packets_);
        +    const size_t cnt = dp_packet_batch_size(packets_);
             uint32_t cur_min;
             int i;
         
             atomic_read_relaxed(&pmd->dp->emc_insert_min, &cur_min);
         
        -    DP_PACKET_BATCH_REFILL_FOR_EACH (i, size, packet, packets_) {
        +    DP_PACKET_BATCH_REFILL_FOR_EACH (i, cnt, packet, packets_) {
                 struct dp_netdev_flow *flow;
         
                 if (OVS_UNLIKELY(dp_packet_size(packet) < ETH_HEADER_LEN)) {
        @@ -4887,7 +4887,7 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,
                     continue;
                 }
         
        -        if (i != size - 1) {
        +        if (i != cnt - 1) {
                     struct dp_packet **packets = packets_->packets;
                     /* Prefetch next packet data and metadata. */
                     OVS_PREFETCH(dp_packet_data(packets[i+1]));
        @@ -4918,7 +4918,7 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,
             }
         
             dp_netdev_count_packet(pmd, DP_STAT_EXACT_HIT,
        -                           size - n_dropped - n_missed);
        +                           cnt - n_dropped - n_missed);
         
             return dp_packet_batch_size(packets_);
         }
        -- 
        1.7.0.7
        
        _______________________________________________
        dev mailing list
        dev at openvswitch.org
        https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=YhIBIOieNxH33xwsgt2o4hQ-0Tb35mwXpQdq_bkRMNc&s=fzlkWYRv_fESeA4LIgGGvW0mkT44D8qUK1EdA8GN740&e=