examples: added options for specifying number of samples to transmit

2 files changed, 32 insertions, 7 deletions

diff --git a/host/examples/tx_samples_c.c b/host/examples/tx_samples_c.c
index ebf368ec7..e10d585ce 100644
--- a/host/examples/tx_samples_c.c
+++ b/host/examples/tx_samples_c.c
@@ -21,6 +21,7 @@
 
 #include <math.h>
 #include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,6 +40,7 @@ void print_help(void){
                     "    -f (frequency in Hz)\n"
                     "    -r (sample rate in Hz)\n"
                     "    -g (gain)\n"
+                    "    -n (number of samples to transmit)\n"
                     "    -v (enable verbose prints)\n"
                     "    -h (print this help message)\n");
 }
@@ -57,12 +59,13 @@ int main(int argc, char* argv[]){
     double gain = 0;
     char* device_args = "";
     size_t channel = 0;
+    uint64_t total_num_samps = 0;
     bool verbose = false;
     int return_code = EXIT_SUCCESS;
     char error_string[512];
 
     // Process options
-    while((option = getopt(argc, argv, "a:f:r:g:vh")) != -1){
+    while((option = getopt(argc, argv, "a:f:r:g:n:vh")) != -1){
         switch(option){
             case 'a':
                 device_args = strdup(optarg);
@@ -80,6 +83,10 @@ int main(int argc, char* argv[]){
                 gain = atof(optarg);
                 break;
 
+            case 'n':
+                total_num_samps = atoll(optarg);
+                break;
+
             case 'v':
                 verbose = true;
                 break;
@@ -198,11 +205,19 @@ int main(int argc, char* argv[]){
     fprintf(stderr, "Press Ctrl+C to stop streaming...\n");
 
     // Actual streaming
-    size_t num_samps_sent = 0;
-    while(!stop_signal_called){
+    uint64_t num_acc_samps = 0;
+    uint64_t num_samps_sent = 0;
+
+    while(1) {
+        if (stop_signal_called) break;
+        if (total_num_samps > 0 && num_acc_samps >= total_num_samps) break;
+
         EXECUTE_OR_GOTO(free_tx_streamer,
             uhd_tx_streamer_send(tx_streamer, buffs_ptr, samps_per_buff, &md, 0.1, &num_samps_sent)
         )
+
+        num_acc_samps += num_samps_sent;
+
         if(verbose){
             fprintf(stderr, "Sent %zu samples\n", num_samps_sent);
         }
diff --git a/host/examples/tx_waveforms.cpp b/host/examples/tx_waveforms.cpp
index af8f92607..ef878722c 100644
--- a/host/examples/tx_waveforms.cpp
+++ b/host/examples/tx_waveforms.cpp
@@ -28,6 +28,7 @@
 #include <boost/thread.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
+#include <stdint.h>
 #include <iostream>
 #include <csignal>
 
@@ -47,7 +48,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
 
     //variables to be set by po
     std::string args, wave_type, ant, subdev, ref, pps, otw, channel_list;
-    size_t spb;
+    uint64_t total_num_samps, spb;
     double rate, freq, gain, wave_freq, bw;
     float ampl;
 
@@ -56,7 +57,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     desc.add_options()
         ("help", "help message")
         ("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
-        ("spb", po::value<size_t>(&spb)->default_value(0), "samples per buffer, 0 for default")
+        ("spb", po::value<uint64_t>(&spb)->default_value(0), "samples per buffer, 0 for default")
+        ("nsamps", po::value<uint64_t>(&total_num_samps)->default_value(0), "total number of samples to transmit")
         ("rate", po::value<double>(&rate), "rate of outgoing samples")
         ("freq", po::value<double>(&freq), "RF center frequency in Hz")
         ("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of the waveform [0 to 0.7]")
@@ -241,14 +243,22 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     md.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.1);
 
     //send data until the signal handler gets called
-    while(not stop_signal_called){
+    //or if we accumulate the number of samples specified (unless it's 0)
+    uint64_t num_acc_samps = 0;
+    while(true){
+
+        if (stop_signal_called) break;
+        if (total_num_samps > 0 and num_acc_samps >= total_num_samps) break;
+
         //fill the buffer with the waveform
         for (size_t n = 0; n < buff.size(); n++){
             buff[n] = wave_table(index += step);
         }
 
         //send the entire contents of the buffer
-        tx_stream->send(buffs, buff.size(), md);
+        num_acc_samps += tx_stream->send(
+            buffs, buff.size(), md
+        );
 
         md.start_of_burst = false;
         md.has_time_spec = false;