From 508af598a1b32345a53522b4d6d71e021f448347 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 12 Jul 2010 20:39:21 -0700 Subject: uhd: switch statements to handle error code, default md to error code none --- host/examples/benchmark_rx_rate.cpp | 15 ++++++++++----- host/examples/rx_timed_samples.cpp | 22 +++++++++++++++++----- 2 files changed, 27 insertions(+), 10 deletions(-) (limited to 'host/examples') diff --git a/host/examples/benchmark_rx_rate.cpp b/host/examples/benchmark_rx_rate.cpp index a63337b38..2bde3865d 100644 --- a/host/examples/benchmark_rx_rate.cpp +++ b/host/examples/benchmark_rx_rate.cpp @@ -62,13 +62,18 @@ static inline void test_device( uhd::io_type_t::COMPLEX_FLOAT32, uhd::device::RECV_MODE_ONE_PACKET ); - if (num_rx_samps == 0 and md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT){ - std::cerr << "Unexpected timeout on recv, exit test..." << std::endl; + + //handle the error codes + switch(md.error_code){ + case uhd::rx_metadata_t::ERROR_CODE_NONE: + case uhd::rx_metadata_t::ERROR_CODE_OVERRUN: + break; + + default: + std::cerr << "Unexpected error on recv, exit test..." << std::endl; return; } - if (num_rx_samps == 0 and md.error_code != uhd::rx_metadata_t::ERROR_CODE_OVERRUN){ - std::cerr << "Unexpected error on recv, continuing..." << std::endl; - } + if (not md.has_time_spec){ std::cerr << "Metadata missing time spec, exit test..." << std::endl; return; diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp index 95f805007..3b9acbb2c 100644 --- a/host/examples/rx_timed_samples.cpp +++ b/host/examples/rx_timed_samples.cpp @@ -92,20 +92,32 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ uhd::io_type_t::COMPLEX_FLOAT32, uhd::device::RECV_MODE_ONE_PACKET ); - if (num_rx_samps == 0 and num_acc_samps > 0){ + + //handle the error codes + switch(md.error_code){ + case uhd::rx_metadata_t::ERROR_CODE_NONE: + break; + + case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: + if (num_acc_samps == 0) continue; std::cout << boost::format( - "Got error code 0x%x before all samples received, possible packet loss, exiting loop..." + "Got timeout before all samples received, possible packet loss, exiting loop..." ) % md.error_code << std::endl; - break; + goto done_loop; + + default: + std::cout << boost::format( + "Got error code 0x%x, exiting loop..." + ) % md.error_code << std::endl; + goto done_loop; } - if (num_rx_samps == 0) continue; //wait for packets with contents if(verbose) std::cout << boost::format( "Got packet: %u samples, %u full secs, %f frac secs" ) % num_rx_samps % md.time_spec.get_full_secs() % md.time_spec.get_frac_secs() << std::endl; num_acc_samps += num_rx_samps; - } + } done_loop: //finished std::cout << std::endl << "Done!" << std::endl << std::endl; -- cgit v1.2.3 From 76d3ccce2598c1c91ee7e55f92bc571db455cc18 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 13 Jul 2010 14:41:28 -0700 Subject: uhd: benchmark app, stop if left running initially --- host/examples/benchmark_rx_rate.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'host/examples') diff --git a/host/examples/benchmark_rx_rate.cpp b/host/examples/benchmark_rx_rate.cpp index 2bde3865d..752facb0d 100644 --- a/host/examples/benchmark_rx_rate.cpp +++ b/host/examples/benchmark_rx_rate.cpp @@ -137,6 +137,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; uhd::usrp::simple_usrp::sptr sdev = uhd::usrp::simple_usrp::make(args); std::cout << boost::format("Using Device: %s") % sdev->get_pp_string() << std::endl; + sdev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); //stop if left running if (not vm.count("rate")){ sdev->set_rx_rate(500e3); //initial rate -- cgit v1.2.3