uhd: added inline message testing to the messages example

Renamed the example to test_messages (not just async).
Fixed bug in super recv packet handler related to messages.
Basically, the sequence number for messages should be ignored.
Fixed some quirks with usrp1 soft time control to get it work as well.

2 files changed, 22 insertions, 17 deletions

diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index a27962042..d79e0b2c0 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -313,34 +313,30 @@ private:
         info.time = time_spec_t(time_t(info.ifpi.tsi), size_t(info.ifpi.tsf), _tick_rate); //assumes has_tsi and has_tsf are true
         info.copy_buff = reinterpret_cast<const char *>(info.vrt_hdr + info.ifpi.num_header_words32);
 
-        //store the packet count for the next iteration
-        #ifndef SRPH_DONT_CHECK_SEQUENCE
-        const size_t expected_packet_count = _props[index].packet_count;
-        _props[index].packet_count = (info.ifpi.packet_count + 1)%16;
-        #endif
-
         //--------------------------------------------------------------
         //-- Determine return conditions:
         //-- The order of these checks is HOLY.
         //--------------------------------------------------------------
 
-        //1) check for out of order timestamps
-        if (info.ifpi.has_tsi and info.ifpi.has_tsf and prev_buffer_info[index].time > info.time){
-            return PACKET_TIMESTAMP_ERROR;
-        }
-
-        //2) check for inline IF message packets
+        //1) check for inline IF message packets
         if (info.ifpi.packet_type != vrt::if_packet_info_t::PACKET_TYPE_DATA){
             return PACKET_INLINE_MESSAGE;
         }
 
-        //3) check for sequence errors
+        //2) check for sequence errors
         #ifndef SRPH_DONT_CHECK_SEQUENCE
+        const size_t expected_packet_count = _props[index].packet_count;
+        _props[index].packet_count = (info.ifpi.packet_count + 1)%16;
         if (expected_packet_count != info.ifpi.packet_count){
             return PACKET_SEQUENCE_ERROR;
         }
         #endif
 
+        //3) check for out of order timestamps
+        if (info.ifpi.has_tsi and info.ifpi.has_tsf and prev_buffer_info[index].time > info.time){
+            return PACKET_TIMESTAMP_ERROR;
+        }
+
         //4) otherwise the packet is normal!
         return PACKET_IF_DATA;
     }
@@ -446,8 +442,10 @@ private:
                 curr_info.metadata.start_of_burst = false;
                 curr_info.metadata.end_of_burst = false;
                 curr_info.metadata.error_code = rx_metadata_t::error_code_t(get_context_code(next_info[index].vrt_hdr, next_info[index].ifpi));
-                if (curr_info.metadata.error_code == rx_metadata_t::ERROR_CODE_OVERFLOW) _props[index].handle_overflow();
-                UHD_MSG(fastpath) << "O";
+                if (curr_info.metadata.error_code == rx_metadata_t::ERROR_CODE_OVERFLOW){
+                    _props[index].handle_overflow();
+                    UHD_MSG(fastpath) << "O";
+                }
                 return;
 
             case PACKET_TIMEOUT_ERROR:
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index cf602185d..2728ff755 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -93,6 +93,12 @@ public:
     void recv_post(rx_metadata_t &md, size_t &nsamps){
         boost::mutex::scoped_lock lock(_update_mutex);
 
+        //Since it timed out on the receive, check for inline messages...
+        //Must do a post check because recv() will not wake up for a message.
+        if (md.error_code == rx_metadata_t::ERROR_CODE_TIMEOUT){
+            if (_inline_msg_queue.pop_with_haste(md)) return;
+        }
+
         //load the metadata with the expected time
         md.has_time_spec = true;
         md.time_spec = time_now();
@@ -114,7 +120,7 @@ public:
         case stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE:
             nsamps = _nsamps_remaining; //set nsamps, then stop
             md.end_of_burst = true;
-            stream_on_off(false);
+            this->issue_stream_cmd(stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
             return;
         default: break;
         }
@@ -173,7 +179,8 @@ public:
                 metadata.time_spec = this->time_now();
                 metadata.error_code = rx_metadata_t::ERROR_CODE_LATE_COMMAND;
                 _inline_msg_queue.push_with_pop_on_full(metadata);
-                _stream_mode = stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS;
+                this->issue_stream_cmd(stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
+                return;
             }
             else{
                 sleep_until_time(lock, time_at);