uhd: Added nicer error reporting to rx examples

7 files changed, 18 insertions, 21 deletions

diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp
index ea49d48d9..9e9aa67e9 100644
--- a/host/examples/benchmark_rate.cpp
+++ b/host/examples/benchmark_rate.cpp
@@ -98,7 +98,7 @@ void benchmark_rx_rate(uhd::usrp::multi_usrp::sptr usrp, const std::string &rx_c
             break;
 
         default:
-            std::cerr << "Error code: " << md.error_code << std::endl;
+            std::cerr << "Receiver error: " << md.strerror() << std::endl;
             std::cerr << "Unexpected error on recv, continuing..." << std::endl;
             break;
         }
diff --git a/host/examples/rx_multi_samples.cpp b/host/examples/rx_multi_samples.cpp
index 9e5970978..a50b5f0e0 100644
--- a/host/examples/rx_multi_samples.cpp
+++ b/host/examples/rx_multi_samples.cpp
@@ -172,8 +172,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) break;
         if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
             throw std::runtime_error(str(boost::format(
-                "Unexpected error code 0x%x"
-            ) % md.error_code));
+                "Receiver error %s"
+            ) % md.strerror()));
         }
 
         if(verbose) std::cout << boost::format(
diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp
index 0d42404d3..de3640794 100644
--- a/host/examples/rx_samples_to_file.cpp
+++ b/host/examples/rx_samples_to_file.cpp
@@ -101,18 +101,15 @@ template<typename samp_type> void recv_to_file(
             continue;
         }
         if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
-			std::string error = str(boost::format(
-                "Unexpected error code 0x%x"
-            ) % md.error_code);
-            
-			if (continue_on_bad_packet){
-				std::cerr << error << std::endl;
-				continue;
-			}
-			else
-				throw std::runtime_error(error);
+            std::string error = str(boost::format("Receiver error: %s") % md.strerror());
+            if (continue_on_bad_packet){
+                std::cerr << error << std::endl;
+                continue;
+            }
+            else
+                throw std::runtime_error(error);
         }
-        
+
         if (enable_size_map){
 			SizeMap::iterator it = mapSizes.find(num_rx_samps);
 			if (it == mapSizes.end())
diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index cc9216cb7..30535907f 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -130,8 +130,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) break;
         if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
             throw std::runtime_error(str(boost::format(
-                "Unexpected error code 0x%x"
-            ) % md.error_code));
+                "Receiver error %s"
+            ) % md.strerror()));
         }
 
         if(verbose) std::cout << boost::format(
diff --git a/host/examples/test_timed_commands.cpp b/host/examples/test_timed_commands.cpp
index 8c6011c68..3da4bc707 100644
--- a/host/examples/test_timed_commands.cpp
+++ b/host/examples/test_timed_commands.cpp
@@ -139,8 +139,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md, 1.0);
     if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
         throw std::runtime_error(str(boost::format(
-            "Unexpected error code 0x%x"
-        ) % md.error_code));
+            "Receiver error %s"
+        ) % md.strerror()));
     }
     std::cout << boost::format(
         " Received packet: %u samples, %u full secs, %f frac secs"
diff --git a/host/examples/transport_hammer.cpp b/host/examples/transport_hammer.cpp
index 4b949e5bd..3f233b2a5 100644
--- a/host/examples/transport_hammer.cpp
+++ b/host/examples/transport_hammer.cpp
@@ -88,7 +88,7 @@ void rx_hammer(uhd::usrp::multi_usrp::sptr usrp, const std::string &rx_cpu, uhd:
             break;
 
         default:
-            std::cerr << "Error code: " << md.error_code << std::endl;
+            std::cerr << "Receiver error: " << md.strerror() << std::endl;
             std::cerr << "Unexpected error on recv, continuing..." << std::endl;
             break;
         }
diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp
index 3d3cf1dfc..a62ccd7b2 100644
--- a/host/examples/txrx_loopback_to_file.cpp
+++ b/host/examples/txrx_loopback_to_file.cpp
@@ -181,8 +181,8 @@ template<typename samp_type> void recv_to_file(
         }
         if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
             throw std::runtime_error(str(boost::format(
-                "Unexpected error code 0x%x"
-            ) % md.error_code));
+                "Receiver error %s"
+            ) % md.strerror()));
         }
 
         num_total_samps += num_rx_samps;