msgq: try again when no timeout on poll but also no message

JMPZ11 · Nov 18, 2019 · 30aaadd · 30aaadd
1 parent c4f2ad5
commit 30aaadd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/messaging/impl_msgq.cc b/messaging/impl_msgq.cc
@@ -92,9 +92,14 @@ Message * MSGQSubSocket::receive(bool non_blocking){
 
     int t = (timeout != -1) ? timeout : 100;
 
-    msgq_poll(items, 1, t);
+    int n = msgq_poll(items, 1, t);
     rc = msgq_msg_recv(&msg, q);
 
+    // The poll indicated a message was ready, but the receive failed. Try again
+    if (n == 1 && rc == 0){
+      continue;
+    }
+
     if (timeout != -1){
       break;
     }