diff options
author | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-18 09:45:34 -0800 |
---|---|---|
committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-18 17:51:35 -0800 |
commit | a53130679944ddd179593259eb953b89ab1a7a38 (patch) | |
tree | 5d8274750bed0b21aa133bc93d97d75bbce0ecd9 /host/lib/transport/xport_benchmarker.cpp | |
parent | 2a44d6836ca08b6b67b83b63487b838e138ac379 (diff) | |
download | uhd-a53130679944ddd179593259eb953b89ab1a7a38.tar.gz uhd-a53130679944ddd179593259eb953b89ab1a7a38.tar.bz2 uhd-a53130679944ddd179593259eb953b89ab1a7a38.zip |
lib: transport: apply clang-format
This is a continuation of 967be2a4.
$ find host/lib/transport -iname *.hpp -o -iname *.cpp |\
xargs clang-format -i -style=file
Skipping host/lib/transport/nirio/ because of build errors.
$ git checkout host/lib/transport/nirio
Diffstat (limited to 'host/lib/transport/xport_benchmarker.cpp')
-rw-r--r-- | host/lib/transport/xport_benchmarker.cpp | 107 |
1 files changed, 59 insertions, 48 deletions
diff --git a/host/lib/transport/xport_benchmarker.cpp b/host/lib/transport/xport_benchmarker.cpp index 0351d5106..67582ff2c 100644 --- a/host/lib/transport/xport_benchmarker.cpp +++ b/host/lib/transport/xport_benchmarker.cpp @@ -11,8 +11,7 @@ namespace uhd { namespace transport { -const device_addr_t& xport_benchmarker::benchmark_throughput_chdr -( +const device_addr_t& xport_benchmarker::benchmark_throughput_chdr( zero_copy_if::sptr tx_transport, zero_copy_if::sptr rx_transport, uint32_t sid, @@ -24,8 +23,16 @@ const device_addr_t& xport_benchmarker::benchmark_throughput_chdr _reset_counters(); boost::posix_time::ptime start_time(boost::posix_time::microsec_clock::local_time()); - _tx_thread.reset(new boost::thread(boost::bind(&xport_benchmarker::_stream_tx, this, tx_transport.get(), &pkt_info, big_endian))); - _rx_thread.reset(new boost::thread(boost::bind(&xport_benchmarker::_stream_rx, this, rx_transport.get(), &pkt_info, big_endian))); + _tx_thread.reset(new boost::thread(boost::bind(&xport_benchmarker::_stream_tx, + this, + tx_transport.get(), + &pkt_info, + big_endian))); + _rx_thread.reset(new boost::thread(boost::bind(&xport_benchmarker::_stream_rx, + this, + rx_transport.get(), + &pkt_info, + big_endian))); std::this_thread::sleep_for(std::chrono::milliseconds(duration_ms)); @@ -35,17 +42,19 @@ const device_addr_t& xport_benchmarker::benchmark_throughput_chdr _rx_thread->join(); boost::posix_time::ptime stop_time(boost::posix_time::microsec_clock::local_time()); - double duration_s = ((double)(stop_time-start_time).total_microseconds())/1e6; - - uint64_t tx_bytes = pkt_info.num_payload_words32*sizeof(uint32_t)*_num_tx_packets; - uint64_t rx_bytes = pkt_info.num_payload_words32*sizeof(uint32_t)*_num_rx_packets; - double tx_rate = (((double)tx_bytes)/duration_s); - double rx_rate = (((double)rx_bytes)/duration_s); - - _results["TX-Bytes"] = (boost::format("%.2fMB") % (tx_bytes/(1024*1024))).str(); - _results["RX-Bytes"] = (boost::format("%.2fMB") % (rx_bytes/(1024*1024))).str(); - _results["TX-Throughput"] = (boost::format("%.2fMB/s") % (tx_rate/(1024*1024))).str(); - _results["RX-Throughput"] = (boost::format("%.2fMB/s") % (rx_rate/(1024*1024))).str(); + double duration_s = ((double)(stop_time - start_time).total_microseconds()) / 1e6; + + uint64_t tx_bytes = pkt_info.num_payload_words32 * sizeof(uint32_t) * _num_tx_packets; + uint64_t rx_bytes = pkt_info.num_payload_words32 * sizeof(uint32_t) * _num_rx_packets; + double tx_rate = (((double)tx_bytes) / duration_s); + double rx_rate = (((double)rx_bytes) / duration_s); + + _results["TX-Bytes"] = (boost::format("%.2fMB") % (tx_bytes / (1024 * 1024))).str(); + _results["RX-Bytes"] = (boost::format("%.2fMB") % (rx_bytes / (1024 * 1024))).str(); + _results["TX-Throughput"] = + (boost::format("%.2fMB/s") % (tx_rate / (1024 * 1024))).str(); + _results["RX-Throughput"] = + (boost::format("%.2fMB/s") % (rx_rate / (1024 * 1024))).str(); _results["TX-Timeouts"] = std::to_string(_num_tx_timeouts); _results["RX-Timeouts"] = std::to_string(_num_rx_timeouts); _results["Data-Errors"] = std::to_string(_num_data_errors); @@ -53,20 +62,21 @@ const device_addr_t& xport_benchmarker::benchmark_throughput_chdr return _results; } -void xport_benchmarker::_stream_tx(zero_copy_if* transport, vrt::if_packet_info_t* pkt_info, bool big_endian) +void xport_benchmarker::_stream_tx( + zero_copy_if* transport, vrt::if_packet_info_t* pkt_info, bool big_endian) { while (not boost::this_thread::interruption_requested()) { managed_send_buffer::sptr buff = transport->get_send_buff(_tx_timeout); if (buff) { - uint32_t *packet_buff = buff->cast<uint32_t *>(); - //Populate packet + uint32_t* packet_buff = buff->cast<uint32_t*>(); + // Populate packet if (big_endian) { vrt::if_hdr_pack_be(packet_buff, *pkt_info); } else { vrt::if_hdr_pack_le(packet_buff, *pkt_info); } - //send the buffer over the interface - buff->commit(sizeof(uint32_t)*(pkt_info->num_packet_words32)); + // send the buffer over the interface + buff->commit(sizeof(uint32_t) * (pkt_info->num_packet_words32)); _num_tx_packets++; } else { _num_tx_timeouts++; @@ -74,20 +84,21 @@ void xport_benchmarker::_stream_tx(zero_copy_if* transport, vrt::if_packet_info_ } } -void xport_benchmarker::_stream_rx(zero_copy_if* transport, const vrt::if_packet_info_t* exp_pkt_info, bool big_endian) +void xport_benchmarker::_stream_rx( + zero_copy_if* transport, const vrt::if_packet_info_t* exp_pkt_info, bool big_endian) { while (not boost::this_thread::interruption_requested()) { managed_recv_buffer::sptr buff = transport->get_recv_buff(_rx_timeout); if (buff) { - //Extract packet info + // Extract packet info vrt::if_packet_info_t pkt_info; - pkt_info.link_type = exp_pkt_info->link_type; - pkt_info.num_packet_words32 = buff->size()/sizeof(uint32_t); - const uint32_t *packet_buff = buff->cast<const uint32_t *>(); + pkt_info.link_type = exp_pkt_info->link_type; + pkt_info.num_packet_words32 = buff->size() / sizeof(uint32_t); + const uint32_t* packet_buff = buff->cast<const uint32_t*>(); _num_rx_packets++; - //unpacking can fail + // unpacking can fail try { if (big_endian) { vrt::if_hdr_unpack_be(packet_buff, pkt_info); @@ -95,11 +106,11 @@ void xport_benchmarker::_stream_rx(zero_copy_if* transport, const vrt::if_packet vrt::if_hdr_unpack_le(packet_buff, pkt_info); } - if (exp_pkt_info->packet_type != pkt_info.packet_type || - exp_pkt_info->num_payload_bytes != pkt_info.num_payload_bytes) { + if (exp_pkt_info->packet_type != pkt_info.packet_type + || exp_pkt_info->num_payload_bytes != pkt_info.num_payload_bytes) { _num_data_errors++; } - } catch(const std::exception &ex) { + } catch (const std::exception& ex) { _num_data_errors++; } } else { @@ -110,15 +121,14 @@ void xport_benchmarker::_stream_rx(zero_copy_if* transport, const vrt::if_packet void xport_benchmarker::_reset_counters(void) { - _num_tx_packets = 0; - _num_rx_packets = 0; + _num_tx_packets = 0; + _num_rx_packets = 0; _num_tx_timeouts = 0; _num_rx_timeouts = 0; _num_data_errors = 0; } -void xport_benchmarker::_initialize_chdr( - zero_copy_if::sptr tx_transport, +void xport_benchmarker::_initialize_chdr(zero_copy_if::sptr tx_transport, zero_copy_if::sptr rx_transport, uint32_t sid, vrt::if_packet_info_t& pkt_info) @@ -126,22 +136,23 @@ void xport_benchmarker::_initialize_chdr( _tx_timeout = 0.5; _rx_timeout = 0.5; - size_t frame_size = std::min(tx_transport->get_send_frame_size(), rx_transport->get_recv_frame_size()); + size_t frame_size = std::min( + tx_transport->get_send_frame_size(), rx_transport->get_recv_frame_size()); - pkt_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR; - pkt_info.packet_type = vrt::if_packet_info_t::PACKET_TYPE_DATA; - pkt_info.num_packet_words32 = (frame_size/sizeof(uint32_t)); + pkt_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR; + pkt_info.packet_type = vrt::if_packet_info_t::PACKET_TYPE_DATA; + pkt_info.num_packet_words32 = (frame_size / sizeof(uint32_t)); pkt_info.num_payload_words32 = pkt_info.num_packet_words32 - 2; - pkt_info.num_payload_bytes = pkt_info.num_payload_words32*sizeof(uint32_t); - pkt_info.packet_count = 0; - pkt_info.sob = false; - pkt_info.eob = false; - pkt_info.sid = sid; - pkt_info.has_sid = true; - pkt_info.has_cid = false; - pkt_info.has_tsi = false; - pkt_info.has_tsf = false; - pkt_info.has_tlr = false; + pkt_info.num_payload_bytes = pkt_info.num_payload_words32 * sizeof(uint32_t); + pkt_info.packet_count = 0; + pkt_info.sob = false; + pkt_info.eob = false; + pkt_info.sid = sid; + pkt_info.has_sid = true; + pkt_info.has_cid = false; + pkt_info.has_tsi = false; + pkt_info.has_tsf = false; + pkt_info.has_tlr = false; } -}} +}} // namespace uhd::transport |