From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7FDF71E320 for ; Mon, 11 Jun 2018 05:44:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jun 2018 20:44:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,500,1520924400"; d="scan'208";a="48306658" Received: from juan.sh.intel.com ([10.67.118.154]) by orsmga008.jf.intel.com with ESMTP; 10 Jun 2018 20:44:13 -0700 From: Lijuan Tu To: dts@dpdk.org Cc: Lijuan Tu Date: Mon, 11 Jun 2018 20:14:30 +0800 Message-Id: <1528719270-5007-1-git-send-email-lijuan.tu@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [next][PATCH]framework/pktgen: fix redundant accounting for multiple streams. X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 03:44:16 -0000 Signed-off-by: Lijuan Tu --- framework/pktgen.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/framework/pktgen.py b/framework/pktgen.py index 8611038..5294ff8 100644 --- a/framework/pktgen.py +++ b/framework/pktgen.py @@ -162,14 +162,16 @@ class PacketGenerator(object): self._start_transmission(stream_ids) time.sleep(delay) + used_rx_port = [] for stream_id in stream_ids: - rxbps_rates, rxpps_rates = self._retrieve_port_statistic(stream_id) - - bps_rx.append(rxbps_rates) - pps_rx.append(rxpps_rates) - self._stop_transmission(stream_id) - bps_rx_total = self._summary_statistic(bps_rx) - pps_rx_total = self._summary_statistic(pps_rx) + if self.__streams[stream_id]['rx_port'] not in used_rx_port: + rxbps_rates, rxpps_rates = self._retrieve_port_statistic(stream_id) + used_rx_port.append(self.__streams[stream_id]['rx_port']) + bps_rx.append(rxbps_rates) + pps_rx.append(rxpps_rates) + self._stop_transmission(stream_id) + bps_rx_total = self._summary_statistic(bps_rx) + pps_rx_total = self._summary_statistic(pps_rx) print "throughput: pps_rx %f, bps_rx %f" % (pps_rx_total, bps_rx_total) @@ -367,7 +369,9 @@ class TrexPacketGenerator(PacketGenerator): vm = self.create_vm(ip_src_range, ip_dst_range, action=ip['action'], step=step_temp[3]) - stl_stream = self.trex_streampacket(self.trex_pkt_builder(pkt=pcap_file, vm=vm), mode=self.trex_tx_count(percentage=100)) + stl_stream = self.trex_stream( + packet=self.trex_pkt_builder(pkt=pcap_file, vm=vm), + mode=self.trex_tx_count(percentage=100)) self._transmit_streams[stream_id] = stl_stream -- 1.8.3.1