From 17c494b79a99d947a150cdbc582ba331aeb57786 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 18 May 2010 14:26:43 -0700
Subject: Added tx timed samples example. Added called to device to get max
 samples per packet. Removed device props that gave max samples per packet.

---
 host/examples/rx_timed_samples.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'host/examples/rx_timed_samples.cpp')

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 4b8774036..d2306c7c4 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -29,7 +29,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     std::string args;
     int seconds_in_future;
     size_t total_num_samps;
-    double rx_rate;
+    double rx_rate, freq;
 
     //setup the program options
     po::options_description desc("Allowed options");
@@ -39,10 +39,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         ("secs", po::value<int>(&seconds_in_future)->default_value(3), "number of seconds in the future to receive")
         ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
         ("rxrate", po::value<double>(&rx_rate)->default_value(100e6/16), "rate of incoming samples")
+        ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
     ;
     po::variables_map vm;
     po::store(po::parse_command_line(argc, argv, desc), vm);
-    po::notify(vm); 
+    po::notify(vm);
 
     //print the help message
     if (vm.count("help")){
@@ -62,6 +63,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     sdev->set_rx_rate(rx_rate);
     std::cout << boost::format("Actual RX Rate: %f Msps...") % (sdev->get_rx_rate()/1e6) << std::endl;
     std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
+    sdev->set_rx_freq(freq);
     sdev->set_time_now(uhd::time_spec_t(0));
 
     //setup streaming
@@ -78,10 +80,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     size_t num_acc_samps = 0; //number of accumulated samples
     while(num_acc_samps < total_num_samps){
         uhd::rx_metadata_t md;
-        std::complex<float> buff[1000];
+        std::vector<std::complex<float> > buff(dev->get_max_recv_samps_per_packet());
         size_t num_rx_samps = dev->recv(
-            boost::asio::buffer(buff, sizeof(buff)),
-            md, uhd::io_type_t::COMPLEX_FLOAT32
+            boost::asio::buffer(buff),
+            md, uhd::io_type_t::COMPLEX_FLOAT32,
+            uhd::device::RECV_MODE_ONE_PACKET
         );
         if (num_rx_samps == 0) continue; //wait for packets with contents
 
-- 
cgit v1.2.3


From 71169b8e030d984220eadde83c4b40481f97cf6b Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 24 May 2010 14:38:25 -0700
Subject: Added timeout error message to timed samples example. Added try catch
 to recv helper because vrt unpack can throw.

---
 host/examples/rx_timed_samples.cpp        |  4 ++++
 host/lib/transport/vrt_packet_handler.hpp | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'host/examples/rx_timed_samples.cpp')

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index d2306c7c4..64da260d5 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -86,6 +86,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
             md, uhd::io_type_t::COMPLEX_FLOAT32,
             uhd::device::RECV_MODE_ONE_PACKET
         );
+        if (num_rx_samps == 0 and num_acc_samps > 0){
+            std::cout << "Got timeout before all samples received, possible packet loss, exiting loop..." << std::endl;
+            break;
+        }
         if (num_rx_samps == 0) continue; //wait for packets with contents
 
         std::cout << boost::format("Got packet: %u samples, %u secs, %u nsecs")
diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index 2a7f995a1..81420b39e 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -122,9 +122,14 @@ namespace vrt_packet_handler{
             state.fragment_offset_in_samps = 0;
             state.managed_buff = zc_iface->get_recv_buff();
             recv_cb(state.managed_buff); //callback before vrt unpack
-            _recv1_helper(
-                state, metadata, tick_rate, vrt_header_offset_words32
-            );
+            try{
+                _recv1_helper(
+                    state, metadata, tick_rate, vrt_header_offset_words32
+                );
+            }catch(const std::exception &e){
+                std::cerr << "Error (recv): " << e.what() << std::endl;
+                return 0;
+            }
         }
 
         //extract the number of samples available to copy
-- 
cgit v1.2.3