From patchwork Tue Nov 24 13:10:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 57226 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2079034lbb; Tue, 24 Nov 2015 05:13:35 -0800 (PST) X-Received: by 10.141.6.69 with SMTP id i66mr35175122qhd.68.1448370815335; Tue, 24 Nov 2015 05:13:35 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 138si15650097qhq.66.2015.11.24.05.13.34; Tue, 24 Nov 2015 05:13:35 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id D32E361C98; Tue, 24 Nov 2015 13:13:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4B4E461B1D; Tue, 24 Nov 2015 13:11:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A98D261D3B; Tue, 24 Nov 2015 13:11:39 +0000 (UTC) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by lists.linaro.org (Postfix) with ESMTPS id 0E3F561D31 for ; Tue, 24 Nov 2015 13:11:02 +0000 (UTC) Received: by lfs39 with SMTP id 39so19606381lfs.3 for ; Tue, 24 Nov 2015 05:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u7L34LgvnCtvfoFqsGyF3Kmsh1H4PSPX1dhPz5JHy2Q=; b=gQ/426tGVzjhTMZGB9MGj3eJTJc3lPru5qRwBaFIR73cwDVPsVeeiiDgKQVerPD8dS FB5LXncRQjpMN9T8JwBAtdXluryqs1GLp+HGxziF4jaUl2cxL7uJZXbWkSxJGxgkyhTm ymV+qySx0rlM4teAAYkI8RM4Xp1BBikahorQ/bKu+A/CDrbcW5ccWLrnLVtdQ6LbFUR6 MYhh1BBk5n0xkQ5UU4raShVNpJfEXWHjW8eAU2FWlgaZIHO/qVr10EzmHJeunxsQkgx+ 5zGoXvMLVeYMwG5QWl4XjGHISCFUgn8/z3Zt4K5Ne5IoqLAUV4B4kRR5uZR+VyXEbBKW N38Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u7L34LgvnCtvfoFqsGyF3Kmsh1H4PSPX1dhPz5JHy2Q=; b=RNDq8eeuRzMr2/P/FTOIK4lGS6R68onZ3pd1Yn8irztqtLUHONK4psuv8/604BJq9V f1Ibm5m3t+mg9toyNTKw56aYmwjF3f6J0AJDwg8RSnxmfpvxQNPZXSebGAjWq4Su8vv+ cCgPUUxeEaxVVBVoCCPEEtunhp9VjffDfE2kD5xFEmd6wnjNaLiN+MgwUSDaekir5RBc u52EPvEsf+rGWRrdct5mqmAugdnqzBPcKAUcR+4BnyeS46nHRkmd0qI+UUciXRToxFVM MVEerySdJhLr/uw/sNYD88+mJuI1Bx+iTjZF1obeK4P60jjQsu8c9J83JOPoH27pQZEZ 4r3w== X-Gm-Message-State: ALoCoQk1W4wSLfwDZO0J4OC2xgy903dQ3B0spEOUc+jec6KmXTbDd/TVrX6r70unq5TbtHIywCtE X-Received: by 10.25.38.2 with SMTP id m2mr13611556lfm.113.1448370660747; Tue, 24 Nov 2015 05:11:00 -0800 (PST) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id jg3sm106332lbc.17.2015.11.24.05.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Nov 2015 05:11:00 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 24 Nov 2015 16:10:46 +0300 Message-Id: <1448370648-18974-4-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448370648-18974-1-git-send-email-maxim.uvarov@linaro.org> References: <1448370648-18974-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv4 3/5] linux-generic: pcap: implement pktio statistics counters X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/pktio/pcap.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 94b506d..ebcf2c8 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -51,6 +51,8 @@ #define PKTIO_PCAP_MTU (64 * 1024) static const char pcap_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x04}; +static int pcapif_stats_reset(pktio_entry_t *pktio_entry); + static int _pcapif_parse_devname(pkt_pcap_t *pcap, const char *devname) { char *tok; @@ -156,6 +158,8 @@ static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (ret == 0 && (!pcap->rx && !pcap->tx_dump)) ret = -1; + (void)pcapif_stats_reset(pktio_entry); + return ret; } @@ -251,6 +255,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], } packet_parse_l2(pkt_hdr); + pktio_entry->s.stats.in_octets += pkt_hdr->frame_len; pkts[i] = pkt; pkt = ODP_PACKET_INVALID; @@ -261,6 +266,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], if (pkt != ODP_PACKET_INVALID) odp_packet_free(pkt); + pktio_entry->s.stats.in_ucast_pkts += i; return i; } @@ -293,7 +299,9 @@ static int pcapif_send_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], ODP_ASSERT(pktio_entry->s.state == STATE_START); for (i = 0; i < len; ++i) { - if (odp_packet_len(pkts[i]) > PKTIO_PCAP_MTU) { + int pkt_len = odp_packet_len(pkts[i]); + + if (pkt_len > PKTIO_PCAP_MTU) { if (i == 0) return -1; break; @@ -302,9 +310,12 @@ static int pcapif_send_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], if (_pcapif_dump_pkt(pcap, pkts[i]) != 0) break; + pktio_entry->s.stats.out_octets += pkt_len; odp_packet_free(pkts[i]); } + pktio_entry->s.stats.out_ucast_pkts += i; + return i; } @@ -369,10 +380,25 @@ static int pcapif_promisc_mode_get(pktio_entry_t *pktio_entry) return pktio_entry->s.pkt_pcap.promisc; } +static int pcapif_stats_reset(pktio_entry_t *pktio_entry) +{ + memset(&pktio_entry->s.stats, 0, sizeof(odp_pktio_stats_t)); + return 0; +} + +static int pcapif_stats(pktio_entry_t *pktio_entry, + odp_pktio_stats_t *stats) +{ + memcpy(stats, &pktio_entry->s.stats, sizeof(odp_pktio_stats_t)); + return 0; +} + const pktio_if_ops_t pcap_pktio_ops = { .name = "pcap", .open = pcapif_init, .close = pcapif_close, + .stats = pcapif_stats, + .stats_reset = pcapif_stats_reset, .recv = pcapif_recv_pkt, .send = pcapif_send_pkt, .mtu_get = pcapif_mtu_get,