From 1be6d4fa61369a6dcae87740c4b3cca385a86143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Wed, 8 Mar 2023 14:23:59 +0100
Subject: [PATCH] udp: uring: improve log messages

---
 aquatic_udp/src/workers/socket/uring/mod.rs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/aquatic_udp/src/workers/socket/uring/mod.rs b/aquatic_udp/src/workers/socket/uring/mod.rs
index 16df167..faf34cd 100644
--- a/aquatic_udp/src/workers/socket/uring/mod.rs
+++ b/aquatic_udp/src/workers/socket/uring/mod.rs
@@ -196,7 +196,7 @@ impl SocketWorker {
                             break;
                         }
                         Err(send_buffers::Error::SerializationFailed(err)) => {
-                            ::log::error!("write response to buffer: {:#}", err);
+                            ::log::error!("Failed serializing response: {:#}", err);
                         }
                     }
                 } else {
@@ -245,7 +245,7 @@ impl SocketWorker {
                         break;
                     }
                     Err(send_buffers::Error::SerializationFailed(err)) => {
-                        ::log::error!("write response to buffer: {:#}", err);
+                        ::log::error!("Failed serializing response: {:#}", err);
                     }
                 }
             }
@@ -291,7 +291,7 @@ impl SocketWorker {
 
                         if result < 0 {
                             ::log::error!(
-                                "send: {:#}",
+                                "Couldn't send response: {:#}",
                                 ::std::io::Error::from_raw_os_error(-result)
                             );
                         } else if self.config.statistics.active() {
@@ -337,8 +337,14 @@ impl SocketWorker {
         let result = cqe.result();
 
         if result < 0 {
-            // Will produce ENOBUFS if there were no free buffers
-            ::log::warn!("recv: {:#}", ::std::io::Error::from_raw_os_error(-result));
+            if -result == libc::ENOBUFS {
+                ::log::warn!("recv failed due to lack of buffers, try increasing ring size");
+            } else {
+                ::log::warn!(
+                    "recv failed: {:#}",
+                    ::std::io::Error::from_raw_os_error(-result)
+                );
+            }
 
             return;
         }
@@ -347,12 +353,12 @@ impl SocketWorker {
             match self.buf_ring.get_buf(result as u32, cqe.flags()) {
                 Ok(Some(buffer)) => buffer,
                 Ok(None) => {
-                    ::log::error!("Couldn't get buffer");
+                    ::log::error!("Couldn't get recv buffer");
 
                     return;
                 }
                 Err(err) => {
-                    ::log::error!("Couldn't get buffer: {:#}", err);
+                    ::log::error!("Couldn't get recv buffer: {:#}", err);
 
                     return;
                 }