From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id C4F4F1EBA8 for ; Thu, 14 Jun 2018 10:22:27 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 01:22:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="64000806" Received: from dts-maintain.sh.intel.com (HELO [10.67.119.146]) ([10.67.119.146]) by fmsmga001.fm.intel.com with ESMTP; 14 Jun 2018 01:22:25 -0700 To: dts@dpdk.org References: <1528719270-5007-1-git-send-email-lijuan.tu@intel.com> From: Lijuan Tu Message-ID: <7bf95133-5432-0c91-32e5-06a8e548030b@intel.com> Date: Fri, 15 Jun 2018 00:52:42 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1528719270-5007-1-git-send-email-lijuan.tu@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [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: Thu, 14 Jun 2018 08:22:28 -0000 Applied, thanks On 2018年06月11日 20:14, Lijuan Tu wrote: > 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 >