From 425c34b6223301bba1d739ab3b143fd7375a3d8f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 14 Mar 2016 14:10:12 -0700 Subject: Updated branch for upcoming 3.9.3 release - Updated changelog - Updated images package - Updated version string --- CHANGELOG | 12 ++++++++++++ host/CMakeLists.txt | 4 ++-- host/cmake/Modules/UHDVersion.cmake | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0fc142d4e..7b7e97908 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,18 @@ Change Log for Releases ============================== +## 003.009.003 +* UBX: Fixed a phase synchronization issue on the sub-1GHz band +* USB: Fixed transport issue that crashed when multiple USB devices were + connected on a Windows machine, more graceful handling of USB disconnects,, + provided .cdf file for installing on Windows +* B200: Fixed memory growth/increasing tune times issue +* E300: Fixed memory leak with udev, fixed issue with autoboot value, fixed + writing of, fixes to button behaviour +* usrp2, usrp3: Fixed IQ imbalance and DC bias in DDC chain +* CMake: Windows registry fixes +* Fixed several compiler warnings and minor bugs + ## 003.009.002 * E310: Added support for Speedgrade 3 * B205mini: Added support diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 3a5cae4bf..2d46c2bd3 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -274,8 +274,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "37081e1e73004bd9e74d7e5b6293fd39") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.002-release.zip") +SET(UHD_IMAGES_MD5SUM "e77bfb8e2d23d3e450986c781374f24d") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.003-rc1.zip") #}}} ######################################################################## diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 58a9c7076..6f906f8bf 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -28,7 +28,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 009) -SET(UHD_VERSION_PATCH 002) +SET(UHD_VERSION_PATCH 003) SET(UHD_VERSION_DEVEL FALSE) ######################################################################## -- cgit v1.2.3 From 8930d853f3ee2ac91fc7fd6b41046ca972da3c3f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 14 Mar 2016 15:07:53 -0700 Subject: examples: Modified benchmark_rate so thread interrupts cannot cause problems --- host/examples/benchmark_rate.cpp | 152 ++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 32 deletions(-) diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp index f8c0342c0..84b9611e1 100644 --- a/host/examples/benchmark_rate.cpp +++ b/host/examples/benchmark_rate.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011-2013 Ettus Research LLC +// Copyright 2011-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,12 +24,16 @@ #include #include #include +#include #include #include #include namespace po = boost::program_options; +const double INIT_DELAY = 0.05; // 50mS initial delay before transmit +typedef boost::atomic atomic_bool; + /*********************************************************************** * Test result variables **********************************************************************/ @@ -47,7 +51,8 @@ void benchmark_rx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &rx_cpu, uhd::rx_streamer::sptr rx_stream, - bool random_nsamps + bool random_nsamps, + atomic_bool& burst_timer_elapsed ) { uhd::set_thread_priority_safe(); @@ -68,31 +73,30 @@ void benchmark_rx_rate( const double rate = usrp->get_rx_rate(); uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); + cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); cmd.stream_now = (buffs.size() == 1); rx_stream->issue_stream_cmd(cmd); - while (not boost::this_thread::interruption_requested()){ + const float burst_pkt_time = std::max(0.100, (2 * max_samps_per_packet/rate)); + float recv_timeout = burst_pkt_time + INIT_DELAY; + + while (true) { + if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { + rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); + } if (random_nsamps) { cmd.num_samps = rand() % max_samps_per_packet; rx_stream->issue_stream_cmd(cmd); } try { - num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md)*rx_stream->get_num_channels(); + num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md, recv_timeout)*rx_stream->get_num_channels(); + recv_timeout = burst_pkt_time; } catch (uhd::io_error &e) { std::cerr << "Caught an IO exception. " << std::endl; std::cerr << e.what() << std::endl; - return; } - catch (...) { - /* apparently, the boost thread interruption can sometimes result in - throwing exceptions not of type boost::exception, this catch allows - this thread to still attempt to issue the STREAM_MODE_STOP_CONTINUOUS - */ - break; - } //handle the error codes switch(md.error_code){ @@ -112,13 +116,18 @@ void benchmark_rx_rate( num_overflows++; break; + case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: + // If we stopped the streamer, then we expect this at some point + if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { + return; + } + // Otherwise, it's an error default: std::cerr << "Receiver error: " << md.strerror() << std::endl; std::cerr << "Unexpected error on recv, continuing..." << std::endl; break; } } - rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); } /*********************************************************************** @@ -128,6 +137,7 @@ void benchmark_tx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &tx_cpu, uhd::tx_streamer::sptr tx_stream, + atomic_bool& burst_timer_elapsed, bool random_nsamps=false ) { uhd::set_thread_priority_safe(); @@ -139,7 +149,8 @@ void benchmark_tx_rate( //setup variables and allocate buffer uhd::tx_metadata_t md; - md.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); + md.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); + md.has_time_spec = (tx_stream->get_num_channels() > 1); const size_t max_samps_per_packet = tx_stream->get_max_num_samps(); std::vector buff(max_samps_per_packet*uhd::convert::get_bytes_per_item(tx_cpu)); std::vector buffs; @@ -148,8 +159,8 @@ void benchmark_tx_rate( md.has_time_spec = (buffs.size() != 1); if (random_nsamps) { - std::srand( (unsigned int)time(NULL) ); - while(not boost::this_thread::interruption_requested()){ + std::srand((unsigned int)time(NULL)); + while (not burst_timer_elapsed.load(boost::memory_order_acq_rel)) { size_t total_num_samps = rand() % max_samps_per_packet; size_t num_acc_samps = 0; const float timeout = 1; @@ -162,7 +173,7 @@ void benchmark_tx_rate( } } } else { - while (not boost::this_thread::interruption_requested()){ + while (not burst_timer_elapsed.load(boost::memory_order_acq_rel)) { num_tx_samps += tx_stream->send(buffs, max_samps_per_packet, md)*tx_stream->get_num_channels(); md.has_time_spec = false; } @@ -173,13 +184,24 @@ void benchmark_tx_rate( tx_stream->send(buffs, 0, md); } -void benchmark_tx_rate_async_helper(uhd::tx_streamer::sptr tx_stream){ +void benchmark_tx_rate_async_helper( + uhd::tx_streamer::sptr tx_stream, + atomic_bool& burst_timer_elapsed +) { //setup variables and allocate buffer uhd::async_metadata_t async_md; + bool exit_flag = false; - while (not boost::this_thread::interruption_requested()){ + while (true) { + if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { + exit_flag = true; + } - if (not tx_stream->recv_async_msg(async_md)) continue; + if (not tx_stream->recv_async_msg(async_md)) { + if (exit_flag == true) + return; + continue; + } //handle the error codes switch(async_md.event_code){ @@ -216,9 +238,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ double rx_rate, tx_rate; std::string rx_otw, tx_otw; std::string rx_cpu, tx_cpu; - std::string mode; + std::string mode, ref, pps; std::string channel_list; bool random_nsamps = false; + atomic_bool burst_timer_elapsed(false); //setup the program options po::options_description desc("Allowed options"); @@ -232,7 +255,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("tx_otw", po::value(&tx_otw)->default_value("sc16"), "specify the over-the-wire sample mode for TX") ("rx_cpu", po::value(&rx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for RX") ("tx_cpu", po::value(&tx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for TX") - ("mode", po::value(&mode)->default_value("none"), "multi-channel sync mode option: none, mimo") + ("ref", po::value(&ref), "clock reference (internal, external, mimo, gpsdo)") + ("pps", po::value(&pps), "PPS source (internal, external, mimo, gpsdo)") + ("mode", po::value(&mode), "DEPRECATED - use \"ref\" and \"pps\" instead (none, mimo)") ("random", "Run with random values of samples in send() and recv() to stress-test the I/O.") ("channels", po::value(&channel_list)->default_value("0"), "which channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)") ; @@ -257,6 +282,16 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ random_nsamps = true; } + if (vm.count("mode")) { + if (vm.count("pps") or vm.count("ref")) { + std::cout << "ERROR: The \"mode\" parameter cannot be used with the \"ref\" and \"pps\" parameters.\n" << std::endl; + return -1; + } else if (mode == "mimo") { + ref = pps = "mimo"; + std::cout << "The use of the \"mode\" parameter is deprecated. Please use \"ref\" and \"pps\" parameters instead\n" << std::endl; + } + } + //create a usrp device std::cout << std::endl; uhd::device_addrs_t device_addrs = uhd::device::find(args, uhd::device::USRP); @@ -267,14 +302,57 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl; + int num_mboards = usrp->get_num_mboards(); - if (mode == "mimo"){ - usrp->set_clock_source("mimo", 0); - usrp->set_time_source("mimo", 0); - boost::this_thread::sleep(boost::posix_time::seconds(1)); + boost::thread_group thread_group; + + if(vm.count("ref")) + { + if (ref == "mimo") + { + if (num_mboards != 2) { + std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; + return -1; + } + usrp->set_clock_source("mimo",1); + } else { + usrp->set_clock_source(ref); + } + + if(ref != "internal") { + std::cout << "Now confirming lock on clock signals..." << std::endl; + bool is_locked = false; + boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(80); + for (int i = 0; i < num_mboards; i++) { + if (ref == "mimo" and i == 0) continue; + while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and + boost::get_system_time() < end_time ) + { + boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + } + if (is_locked == false) { + std::cerr << "ERROR: Unable to confirm clock signal locked on board:" << i << std::endl; + return -1; + } + is_locked = false; + } + } } - boost::thread_group thread_group; + if(vm.count("pps")) + { + if(pps == "mimo") + { + if (num_mboards != 2) { + std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; + return -1; + } + //make mboard 1 a slave over the MIMO Cable + usrp->set_time_source("mimo", 1); + } else { + usrp->set_time_source(pps); + } + } //detect which channels to use std::vector channel_strings; @@ -288,6 +366,16 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ else channel_nums.push_back(boost::lexical_cast(channel_strings[ch])); } + std::cout << boost::format("Setting device timestamp to 0...") << std::endl; + + if (pps == "mimo" or ref == "mimo" or channel_nums.size() == 1) + { + usrp->set_time_now(0.0); + } else { + usrp->set_time_unknown_pps(uhd::time_spec_t(0.0)); + } + + //spawn the receive test thread if (vm.count("rx_rate")){ usrp->set_rx_rate(rx_rate); @@ -295,7 +383,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(rx_cpu, rx_otw); stream_args.channels = channel_nums; uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps)); + thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps, boost::ref(burst_timer_elapsed))); } //spawn the transmit test thread @@ -305,8 +393,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(tx_cpu, tx_otw); stream_args.channels = channel_nums; uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, random_nsamps)); - thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream)); + thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, boost::ref(burst_timer_elapsed), random_nsamps)); + thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream, boost::ref(burst_timer_elapsed))); } //sleep for the required duration @@ -315,7 +403,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ boost::this_thread::sleep(boost::posix_time::seconds(secs) + boost::posix_time::microseconds(usecs)); //interrupt and join the threads - thread_group.interrupt_all(); + burst_timer_elapsed.store(true, boost::memory_order_acq_rel); thread_group.join_all(); //print summary -- cgit v1.2.3 From 311ccee70f5206360f5f3ed6ae870f991e608bc4 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 16 Mar 2016 11:51:49 -0700 Subject: transport: Also send flow control ACKs on sequence errors --- host/lib/transport/super_recv_packet_handler.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp index 8742d1d16..8bfa1973a 100644 --- a/host/lib/transport/super_recv_packet_handler.hpp +++ b/host/lib/transport/super_recv_packet_handler.hpp @@ -421,6 +421,12 @@ private: const size_t expected_packet_count = _props[index].packet_count; _props[index].packet_count = (info.ifpi.packet_count + 1) & seq_mask; if (expected_packet_count != info.ifpi.packet_count){ + if (_props[index].handle_flowctrl) { + // Always update flow control in this case, because we don't + // know which packet was dropped and what state the upstream + // flow control is in. + _props[index].handle_flowctrl(info.ifpi.packet_count); + } return PACKET_SEQUENCE_ERROR; } #endif -- cgit v1.2.3 From c1c336e43a2513e920279472d76d0b2a5c5db249 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 16 Mar 2016 21:39:33 -0700 Subject: Revert "examples: Modified benchmark_rate so thread interrupts cannot cause problems" This reverts commit 8930d853f3ee2ac91fc7fd6b41046ca972da3c3f. --- host/examples/benchmark_rate.cpp | 152 +++++++++------------------------------ 1 file changed, 32 insertions(+), 120 deletions(-) diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp index 84b9611e1..f8c0342c0 100644 --- a/host/examples/benchmark_rate.cpp +++ b/host/examples/benchmark_rate.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011-2015 Ettus Research LLC +// Copyright 2011-2013 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,16 +24,12 @@ #include #include #include -#include #include #include #include namespace po = boost::program_options; -const double INIT_DELAY = 0.05; // 50mS initial delay before transmit -typedef boost::atomic atomic_bool; - /*********************************************************************** * Test result variables **********************************************************************/ @@ -51,8 +47,7 @@ void benchmark_rx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &rx_cpu, uhd::rx_streamer::sptr rx_stream, - bool random_nsamps, - atomic_bool& burst_timer_elapsed + bool random_nsamps ) { uhd::set_thread_priority_safe(); @@ -73,30 +68,31 @@ void benchmark_rx_rate( const double rate = usrp->get_rx_rate(); uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); + cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); cmd.stream_now = (buffs.size() == 1); rx_stream->issue_stream_cmd(cmd); - const float burst_pkt_time = std::max(0.100, (2 * max_samps_per_packet/rate)); - float recv_timeout = burst_pkt_time + INIT_DELAY; - - while (true) { - if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { - rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); - } + while (not boost::this_thread::interruption_requested()){ if (random_nsamps) { cmd.num_samps = rand() % max_samps_per_packet; rx_stream->issue_stream_cmd(cmd); } try { - num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md, recv_timeout)*rx_stream->get_num_channels(); - recv_timeout = burst_pkt_time; + num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md)*rx_stream->get_num_channels(); } catch (uhd::io_error &e) { std::cerr << "Caught an IO exception. " << std::endl; std::cerr << e.what() << std::endl; + return; } + catch (...) { + /* apparently, the boost thread interruption can sometimes result in + throwing exceptions not of type boost::exception, this catch allows + this thread to still attempt to issue the STREAM_MODE_STOP_CONTINUOUS + */ + break; + } //handle the error codes switch(md.error_code){ @@ -116,18 +112,13 @@ void benchmark_rx_rate( num_overflows++; break; - case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: - // If we stopped the streamer, then we expect this at some point - if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { - return; - } - // Otherwise, it's an error default: std::cerr << "Receiver error: " << md.strerror() << std::endl; std::cerr << "Unexpected error on recv, continuing..." << std::endl; break; } } + rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); } /*********************************************************************** @@ -137,7 +128,6 @@ void benchmark_tx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &tx_cpu, uhd::tx_streamer::sptr tx_stream, - atomic_bool& burst_timer_elapsed, bool random_nsamps=false ) { uhd::set_thread_priority_safe(); @@ -149,8 +139,7 @@ void benchmark_tx_rate( //setup variables and allocate buffer uhd::tx_metadata_t md; - md.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); - md.has_time_spec = (tx_stream->get_num_channels() > 1); + md.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); const size_t max_samps_per_packet = tx_stream->get_max_num_samps(); std::vector buff(max_samps_per_packet*uhd::convert::get_bytes_per_item(tx_cpu)); std::vector buffs; @@ -159,8 +148,8 @@ void benchmark_tx_rate( md.has_time_spec = (buffs.size() != 1); if (random_nsamps) { - std::srand((unsigned int)time(NULL)); - while (not burst_timer_elapsed.load(boost::memory_order_acq_rel)) { + std::srand( (unsigned int)time(NULL) ); + while(not boost::this_thread::interruption_requested()){ size_t total_num_samps = rand() % max_samps_per_packet; size_t num_acc_samps = 0; const float timeout = 1; @@ -173,7 +162,7 @@ void benchmark_tx_rate( } } } else { - while (not burst_timer_elapsed.load(boost::memory_order_acq_rel)) { + while (not boost::this_thread::interruption_requested()){ num_tx_samps += tx_stream->send(buffs, max_samps_per_packet, md)*tx_stream->get_num_channels(); md.has_time_spec = false; } @@ -184,24 +173,13 @@ void benchmark_tx_rate( tx_stream->send(buffs, 0, md); } -void benchmark_tx_rate_async_helper( - uhd::tx_streamer::sptr tx_stream, - atomic_bool& burst_timer_elapsed -) { +void benchmark_tx_rate_async_helper(uhd::tx_streamer::sptr tx_stream){ //setup variables and allocate buffer uhd::async_metadata_t async_md; - bool exit_flag = false; - while (true) { - if (burst_timer_elapsed.load(boost::memory_order_acq_rel)) { - exit_flag = true; - } + while (not boost::this_thread::interruption_requested()){ - if (not tx_stream->recv_async_msg(async_md)) { - if (exit_flag == true) - return; - continue; - } + if (not tx_stream->recv_async_msg(async_md)) continue; //handle the error codes switch(async_md.event_code){ @@ -238,10 +216,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ double rx_rate, tx_rate; std::string rx_otw, tx_otw; std::string rx_cpu, tx_cpu; - std::string mode, ref, pps; + std::string mode; std::string channel_list; bool random_nsamps = false; - atomic_bool burst_timer_elapsed(false); //setup the program options po::options_description desc("Allowed options"); @@ -255,9 +232,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("tx_otw", po::value(&tx_otw)->default_value("sc16"), "specify the over-the-wire sample mode for TX") ("rx_cpu", po::value(&rx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for RX") ("tx_cpu", po::value(&tx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for TX") - ("ref", po::value(&ref), "clock reference (internal, external, mimo, gpsdo)") - ("pps", po::value(&pps), "PPS source (internal, external, mimo, gpsdo)") - ("mode", po::value(&mode), "DEPRECATED - use \"ref\" and \"pps\" instead (none, mimo)") + ("mode", po::value(&mode)->default_value("none"), "multi-channel sync mode option: none, mimo") ("random", "Run with random values of samples in send() and recv() to stress-test the I/O.") ("channels", po::value(&channel_list)->default_value("0"), "which channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)") ; @@ -282,16 +257,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ random_nsamps = true; } - if (vm.count("mode")) { - if (vm.count("pps") or vm.count("ref")) { - std::cout << "ERROR: The \"mode\" parameter cannot be used with the \"ref\" and \"pps\" parameters.\n" << std::endl; - return -1; - } else if (mode == "mimo") { - ref = pps = "mimo"; - std::cout << "The use of the \"mode\" parameter is deprecated. Please use \"ref\" and \"pps\" parameters instead\n" << std::endl; - } - } - //create a usrp device std::cout << std::endl; uhd::device_addrs_t device_addrs = uhd::device::find(args, uhd::device::USRP); @@ -302,57 +267,14 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl; - int num_mboards = usrp->get_num_mboards(); - boost::thread_group thread_group; - - if(vm.count("ref")) - { - if (ref == "mimo") - { - if (num_mboards != 2) { - std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; - return -1; - } - usrp->set_clock_source("mimo",1); - } else { - usrp->set_clock_source(ref); - } - - if(ref != "internal") { - std::cout << "Now confirming lock on clock signals..." << std::endl; - bool is_locked = false; - boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(80); - for (int i = 0; i < num_mboards; i++) { - if (ref == "mimo" and i == 0) continue; - while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and - boost::get_system_time() < end_time ) - { - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); - } - if (is_locked == false) { - std::cerr << "ERROR: Unable to confirm clock signal locked on board:" << i << std::endl; - return -1; - } - is_locked = false; - } - } + if (mode == "mimo"){ + usrp->set_clock_source("mimo", 0); + usrp->set_time_source("mimo", 0); + boost::this_thread::sleep(boost::posix_time::seconds(1)); } - if(vm.count("pps")) - { - if(pps == "mimo") - { - if (num_mboards != 2) { - std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; - return -1; - } - //make mboard 1 a slave over the MIMO Cable - usrp->set_time_source("mimo", 1); - } else { - usrp->set_time_source(pps); - } - } + boost::thread_group thread_group; //detect which channels to use std::vector channel_strings; @@ -366,16 +288,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ else channel_nums.push_back(boost::lexical_cast(channel_strings[ch])); } - std::cout << boost::format("Setting device timestamp to 0...") << std::endl; - - if (pps == "mimo" or ref == "mimo" or channel_nums.size() == 1) - { - usrp->set_time_now(0.0); - } else { - usrp->set_time_unknown_pps(uhd::time_spec_t(0.0)); - } - - //spawn the receive test thread if (vm.count("rx_rate")){ usrp->set_rx_rate(rx_rate); @@ -383,7 +295,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(rx_cpu, rx_otw); stream_args.channels = channel_nums; uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps, boost::ref(burst_timer_elapsed))); + thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps)); } //spawn the transmit test thread @@ -393,8 +305,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(tx_cpu, tx_otw); stream_args.channels = channel_nums; uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, boost::ref(burst_timer_elapsed), random_nsamps)); - thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream, boost::ref(burst_timer_elapsed))); + thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, random_nsamps)); + thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream)); } //sleep for the required duration @@ -403,7 +315,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ boost::this_thread::sleep(boost::posix_time::seconds(secs) + boost::posix_time::microseconds(usecs)); //interrupt and join the threads - burst_timer_elapsed.store(true, boost::memory_order_acq_rel); + thread_group.interrupt_all(); thread_group.join_all(); //print summary -- cgit v1.2.3 From 4b24235c80b116cb8b2ddbd33db5fb3d53eddedb Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 16 Mar 2016 23:30:11 -0700 Subject: examples: Re-enabled better thread interruption in benchmark_rate The previous version (using atomic variables) was fine, but didn't work with all the Boost versions we currently support on the 3.9.X release line. This is a slightly less safe, but still sufficient example. --- host/examples/benchmark_rate.cpp | 158 +++++++++++++++++++++++++++++++-------- 1 file changed, 126 insertions(+), 32 deletions(-) diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp index f8c0342c0..bf3015119 100644 --- a/host/examples/benchmark_rate.cpp +++ b/host/examples/benchmark_rate.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011-2013 Ettus Research LLC +// Copyright 2011-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,12 +24,19 @@ #include #include #include +//#include #include #include #include namespace po = boost::program_options; +const double INIT_DELAY = 0.05; // 50mS initial delay before transmit +//typedef boost::atomic atomic_bool; +// We'll fake atomic bools for now, for more backward compat. +// This is just an example, after all. +typedef bool atomic_bool; + /*********************************************************************** * Test result variables **********************************************************************/ @@ -47,7 +54,8 @@ void benchmark_rx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &rx_cpu, uhd::rx_streamer::sptr rx_stream, - bool random_nsamps + bool random_nsamps, + atomic_bool& burst_timer_elapsed ) { uhd::set_thread_priority_safe(); @@ -68,31 +76,31 @@ void benchmark_rx_rate( const double rate = usrp->get_rx_rate(); uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); + cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); cmd.stream_now = (buffs.size() == 1); rx_stream->issue_stream_cmd(cmd); - while (not boost::this_thread::interruption_requested()){ + const float burst_pkt_time = std::max(0.100, (2 * max_samps_per_packet/rate)); + float recv_timeout = burst_pkt_time + INIT_DELAY; + + while (true) { + //if (burst_timer_elapsed.load(boost::memory_order_relaxed)) { + if (burst_timer_elapsed) { + rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); + } if (random_nsamps) { cmd.num_samps = rand() % max_samps_per_packet; rx_stream->issue_stream_cmd(cmd); } try { - num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md)*rx_stream->get_num_channels(); + num_rx_samps += rx_stream->recv(buffs, max_samps_per_packet, md, recv_timeout)*rx_stream->get_num_channels(); + recv_timeout = burst_pkt_time; } catch (uhd::io_error &e) { std::cerr << "Caught an IO exception. " << std::endl; std::cerr << e.what() << std::endl; - return; } - catch (...) { - /* apparently, the boost thread interruption can sometimes result in - throwing exceptions not of type boost::exception, this catch allows - this thread to still attempt to issue the STREAM_MODE_STOP_CONTINUOUS - */ - break; - } //handle the error codes switch(md.error_code){ @@ -112,13 +120,19 @@ void benchmark_rx_rate( num_overflows++; break; + case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: + // If we stopped the streamer, then we expect this at some point + //if (burst_timer_elapsed.load(boost::memory_order_relaxed)) { + if (burst_timer_elapsed) { + return; + } + // Otherwise, it's an error default: std::cerr << "Receiver error: " << md.strerror() << std::endl; std::cerr << "Unexpected error on recv, continuing..." << std::endl; break; } } - rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); } /*********************************************************************** @@ -128,6 +142,7 @@ void benchmark_tx_rate( uhd::usrp::multi_usrp::sptr usrp, const std::string &tx_cpu, uhd::tx_streamer::sptr tx_stream, + atomic_bool& burst_timer_elapsed, bool random_nsamps=false ) { uhd::set_thread_priority_safe(); @@ -139,7 +154,8 @@ void benchmark_tx_rate( //setup variables and allocate buffer uhd::tx_metadata_t md; - md.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05); + md.time_spec = usrp->get_time_now() + uhd::time_spec_t(INIT_DELAY); + md.has_time_spec = (tx_stream->get_num_channels() > 1); const size_t max_samps_per_packet = tx_stream->get_max_num_samps(); std::vector buff(max_samps_per_packet*uhd::convert::get_bytes_per_item(tx_cpu)); std::vector buffs; @@ -148,8 +164,9 @@ void benchmark_tx_rate( md.has_time_spec = (buffs.size() != 1); if (random_nsamps) { - std::srand( (unsigned int)time(NULL) ); - while(not boost::this_thread::interruption_requested()){ + std::srand((unsigned int)time(NULL)); + //while (not burst_timer_elapsed.load(boost::memory_order_relaxed)) { + while (not burst_timer_elapsed) { size_t total_num_samps = rand() % max_samps_per_packet; size_t num_acc_samps = 0; const float timeout = 1; @@ -162,7 +179,8 @@ void benchmark_tx_rate( } } } else { - while (not boost::this_thread::interruption_requested()){ + //while (not burst_timer_elapsed.load(boost::memory_order_relaxed)) { + while (not burst_timer_elapsed) { num_tx_samps += tx_stream->send(buffs, max_samps_per_packet, md)*tx_stream->get_num_channels(); md.has_time_spec = false; } @@ -173,13 +191,25 @@ void benchmark_tx_rate( tx_stream->send(buffs, 0, md); } -void benchmark_tx_rate_async_helper(uhd::tx_streamer::sptr tx_stream){ +void benchmark_tx_rate_async_helper( + uhd::tx_streamer::sptr tx_stream, + atomic_bool& burst_timer_elapsed +) { //setup variables and allocate buffer uhd::async_metadata_t async_md; + bool exit_flag = false; - while (not boost::this_thread::interruption_requested()){ + while (true) { + //if (burst_timer_elapsed.load(boost::memory_order_relaxed)) { + if (burst_timer_elapsed) { + exit_flag = true; + } - if (not tx_stream->recv_async_msg(async_md)) continue; + if (not tx_stream->recv_async_msg(async_md)) { + if (exit_flag == true) + return; + continue; + } //handle the error codes switch(async_md.event_code){ @@ -216,9 +246,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ double rx_rate, tx_rate; std::string rx_otw, tx_otw; std::string rx_cpu, tx_cpu; - std::string mode; + std::string mode, ref, pps; std::string channel_list; bool random_nsamps = false; + atomic_bool burst_timer_elapsed(false); //setup the program options po::options_description desc("Allowed options"); @@ -232,7 +263,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("tx_otw", po::value(&tx_otw)->default_value("sc16"), "specify the over-the-wire sample mode for TX") ("rx_cpu", po::value(&rx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for RX") ("tx_cpu", po::value(&tx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for TX") - ("mode", po::value(&mode)->default_value("none"), "multi-channel sync mode option: none, mimo") + ("ref", po::value(&ref), "clock reference (internal, external, mimo, gpsdo)") + ("pps", po::value(&pps), "PPS source (internal, external, mimo, gpsdo)") + ("mode", po::value(&mode), "DEPRECATED - use \"ref\" and \"pps\" instead (none, mimo)") ("random", "Run with random values of samples in send() and recv() to stress-test the I/O.") ("channels", po::value(&channel_list)->default_value("0"), "which channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)") ; @@ -257,6 +290,16 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ random_nsamps = true; } + if (vm.count("mode")) { + if (vm.count("pps") or vm.count("ref")) { + std::cout << "ERROR: The \"mode\" parameter cannot be used with the \"ref\" and \"pps\" parameters.\n" << std::endl; + return -1; + } else if (mode == "mimo") { + ref = pps = "mimo"; + std::cout << "The use of the \"mode\" parameter is deprecated. Please use \"ref\" and \"pps\" parameters instead\n" << std::endl; + } + } + //create a usrp device std::cout << std::endl; uhd::device_addrs_t device_addrs = uhd::device::find(args, uhd::device::USRP); @@ -267,14 +310,57 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl; + int num_mboards = usrp->get_num_mboards(); + + boost::thread_group thread_group; - if (mode == "mimo"){ - usrp->set_clock_source("mimo", 0); - usrp->set_time_source("mimo", 0); - boost::this_thread::sleep(boost::posix_time::seconds(1)); + if(vm.count("ref")) + { + if (ref == "mimo") + { + if (num_mboards != 2) { + std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; + return -1; + } + usrp->set_clock_source("mimo",1); + } else { + usrp->set_clock_source(ref); + } + + if(ref != "internal") { + std::cout << "Now confirming lock on clock signals..." << std::endl; + bool is_locked = false; + boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(80); + for (int i = 0; i < num_mboards; i++) { + if (ref == "mimo" and i == 0) continue; + while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and + boost::get_system_time() < end_time ) + { + boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + } + if (is_locked == false) { + std::cerr << "ERROR: Unable to confirm clock signal locked on board:" << i << std::endl; + return -1; + } + is_locked = false; + } + } } - boost::thread_group thread_group; + if(vm.count("pps")) + { + if(pps == "mimo") + { + if (num_mboards != 2) { + std::cerr << "ERROR: ref = \"mimo\" implies 2 motherboards; your system has " << num_mboards << " boards" << std::endl; + return -1; + } + //make mboard 1 a slave over the MIMO Cable + usrp->set_time_source("mimo", 1); + } else { + usrp->set_time_source(pps); + } + } //detect which channels to use std::vector channel_strings; @@ -288,6 +374,13 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ else channel_nums.push_back(boost::lexical_cast(channel_strings[ch])); } + std::cout << boost::format("Setting device timestamp to 0...") << std::endl; + if (pps == "mimo" or ref == "mimo" or channel_nums.size() == 1) { + usrp->set_time_now(0.0); + } else { + usrp->set_time_unknown_pps(uhd::time_spec_t(0.0)); + } + //spawn the receive test thread if (vm.count("rx_rate")){ usrp->set_rx_rate(rx_rate); @@ -295,7 +388,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(rx_cpu, rx_otw); stream_args.channels = channel_nums; uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps)); + thread_group.create_thread(boost::bind(&benchmark_rx_rate, usrp, rx_cpu, rx_stream, random_nsamps, boost::ref(burst_timer_elapsed))); } //spawn the transmit test thread @@ -305,8 +398,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::stream_args_t stream_args(tx_cpu, tx_otw); stream_args.channels = channel_nums; uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, random_nsamps)); - thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream)); + thread_group.create_thread(boost::bind(&benchmark_tx_rate, usrp, tx_cpu, tx_stream, boost::ref(burst_timer_elapsed), random_nsamps)); + thread_group.create_thread(boost::bind(&benchmark_tx_rate_async_helper, tx_stream, boost::ref(burst_timer_elapsed))); } //sleep for the required duration @@ -315,7 +408,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ boost::this_thread::sleep(boost::posix_time::seconds(secs) + boost::posix_time::microseconds(usecs)); //interrupt and join the threads - thread_group.interrupt_all(); + //burst_timer_elapsed.store(true, boost::memory_order_relaxed); + burst_timer_elapsed = true; thread_group.join_all(); //print summary -- cgit v1.2.3 From 7ae5aea5db4414cbed8504794ed10f8fb412e245 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 21 Mar 2016 11:46:49 -0700 Subject: debian: updated changelog converter for sensible defaults --- tools/debs/convert_changelog.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/debs/convert_changelog.py b/tools/debs/convert_changelog.py index 5d12a958c..eaad680fa 100755 --- a/tools/debs/convert_changelog.py +++ b/tools/debs/convert_changelog.py @@ -53,10 +53,22 @@ def get_footer(uploader_name, uploader_email): if __name__ == "__main__": parser = OptionParser() - parser.add_option("--input-file", type="string", help="Input UHD top-level changelog file") - parser.add_option("--output-file", type="string", help="Output Debian changelog file (will append onto existing)") - parser.add_option("--uploader-name", type="string", help="Uploader name (must match GPG key)") - parser.add_option("--uploader-email", type="string", help="Uploader email (must match GPG key)") + parser.add_option( + "--input-file", type="string", default='CHANGELOG', + help="Input UHD top-level changelog file" + ) + parser.add_option("--output-file", + type="string", default='host/cmake/debian/changelog', + help="Output Debian changelog file (will append onto existing)" + ) + parser.add_option("--uploader-name", + type="string", default='Ettus Research', + help="Uploader name (must match GPG key)", + ) + parser.add_option("--uploader-email", + type="string", default='packages@ettus.com', + help="Uploader email (must match GPG key)" + ) parser.add_option("--last-version", type="string", help="Manually specify last version (Debian format)", default="") (options, args) = parser.parse_args() -- cgit v1.2.3 From f0720677d6d02acbeb22d17595f767905c9b240b Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 21 Mar 2016 11:46:58 -0700 Subject: Final preparations for 3.9.3 release - Updated changelog (Debian + internal) - Updated images package for final release --- CHANGELOG | 5 +++-- host/CMakeLists.txt | 4 ++-- host/cmake/debian/changelog | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7b7e97908..b91d5fb4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,11 +7,12 @@ Change Log for Releases connected on a Windows machine, more graceful handling of USB disconnects,, provided .cdf file for installing on Windows * B200: Fixed memory growth/increasing tune times issue -* E300: Fixed memory leak with udev, fixed issue with autoboot value, fixed - writing of, fixes to button behaviour +* E300: Fixed memory leak with udev, fixed issue with autoboot value, fixes + to button behaviour * usrp2, usrp3: Fixed IQ imbalance and DC bias in DDC chain * CMake: Windows registry fixes * Fixed several compiler warnings and minor bugs +* Examples: Updated benchmark_rate for improved thread safety ## 003.009.002 * E310: Added support for Speedgrade 3 diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 2d46c2bd3..e8d4571c9 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -274,8 +274,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "e77bfb8e2d23d3e450986c781374f24d") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.003-rc1.zip") +SET(UHD_IMAGES_MD5SUM "07b9d06a068cf591fcd0e460552ed02d") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.003-release.zip") #}}} ######################################################################## diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog index 40f04bf74..75aeeab81 100644 --- a/host/cmake/debian/changelog +++ b/host/cmake/debian/changelog @@ -1,3 +1,19 @@ +uhd (3.9.3-0ubuntu1) trusty; urgency=low + + * UBX: Fixed a phase synchronization issue on the sub-1GHz band + * USB: Fixed transport issue that crashed when multiple USB devices were + connected on a Windows machine, more graceful handling of USB disconnects,, + provided .cdf file for installing on Windows + * B200: Fixed memory growth/increasing tune times issue + * E300: Fixed memory leak with udev, fixed issue with autoboot value, fixes + to button behaviour + * usrp2, usrp3: Fixed IQ imbalance and DC bias in DDC chain + * CMake: Windows registry fixes + * Fixed several compiler warnings and minor bugs + * Examples: Updated benchmark_rate for improved thread safety + + -- Ettus Research Mon, 21 Mar 2016 11:40:26 -0800 + uhd (3.9.2-0ubuntu1) trusty; urgency=low * E310: Added support for Speedgrade 3 -- cgit v1.2.3