commit 9ca98ec9313568b75bb8eb40e845a03143a41d34
author Andrew Jeffery <andrew@aj.id.au> Tue Nov 02 09:50:47 2021 +1030
committer Andrew Jeffery <andrew@aj.id.au> Thu Nov 04 06:32:01 2021 +0000
tree b036ffa89d0d9800bfdc57034c30243d25dbf8f8
parent 3859c7f7c60208e4c761d1e75d593c6f1de99021

nvmesensor: Make commuication error messages more informative

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Id42ddfc29c73c092694e9e138eae3037ba400dd4

src/NVMeBasicContext.cpp

diff --git a/src/NVMeBasicContext.cpp b/src/NVMeBasicContext.cpp
index 3c8b74d..c828d27 100644
--- a/src/NVMeBasicContext.cpp
+++ b/src/NVMeBasicContext.cpp
@@ -83,8 +83,9 @@
     if (::ioctl(dev, I2C_SLAVE, addr) == -1)
     {
         rc = -errno;
-        std::cerr << "Failed to configure device address: " << strerror(errno)
-                  << "\n";
+        std::cerr << "Failed to configure device address 0x" << std::hex
+                  << (int)addr << " for bus " << std::dec << bus << ": "
+                  << strerror(errno) << "\n";
         goto cleanup_fds;
     }
 
@@ -95,14 +96,17 @@
     if (size < 0)
     {
         rc = size;
-        std::cerr << "Failed to read block data: " << strerror(errno) << "\n";
+        std::cerr << "Failed to read block data from device 0x" << std::hex
+                  << (int)addr << " on bus " << std::dec << bus << ": "
+                  << strerror(errno) << "\n";
         goto cleanup_fds;
     }
     else if (size > UINT8_MAX + 1)
     {
         rc = -EBADMSG;
-        std::cerr << "Unexpected message length: " << size << " (" << UINT8_MAX
-                  << ")\n";
+        std::cerr << "Unexpected message length from device 0x" << std::hex
+                  << (int)addr << " on bus " << std::dec << bus << ": " << size
+                  << " (" << UINT8_MAX << ")\n";
         goto cleanup_fds;
     }
 
@@ -111,7 +115,8 @@
 cleanup_fds:
     if (::close(dev) == -1)
     {
-        std::cerr << "Failed to close device descriptor: " << strerror(errno)
+        std::cerr << "Failed to close device descriptor " << std::dec << dev
+                  << " for bus " << std::dec << bus << ": " << strerror(errno)
                   << "\n";
     }
 
@@ -141,8 +146,8 @@
             rc = rc ? -errno : -EIO;
             if (errno)
             {
-                std::cerr << "Failed to read request: " << strerror(errno)
-                          << "\n";
+                std::cerr << "Failed to read request from in descriptor ("
+                          << std::dec << in << "): " << strerror(errno) << "\n";
             }
             goto done;
         }
@@ -174,8 +179,9 @@
         {
             assert(rc < 1);
             rc = rc ? -errno : -EIO;
-            std::cerr << "Failed to write block length to out pipe: "
-                      << strerror(-rc) << "\n";
+            std::cerr << "Failed to write block (" << std::dec << len
+                      << ") length to out descriptor (" << std::dec << out
+                      << "): " << strerror(-rc) << "\n";
             goto done;
         }
 
@@ -188,8 +194,8 @@
             if ((egress = ::write(out, cursor, len)) == -1)
             {
                 rc = -errno;
-                std::cerr << "Failed to write block data to out pipe: "
-                          << strerror(errno) << "\n";
+                std::cerr << "Failed to write block data of length " << std::dec
+                          << len << " to out pipe: " << strerror(errno) << "\n";
                 goto done;
             }
 
@@ -201,14 +207,14 @@
 done:
     if (::close(in) == -1)
     {
-        std::cerr << "Failed to close in descriptor: " << strerror(errno)
-                  << "\n";
+        std::cerr << "Failed to close in descriptor " << std::dec << in << ": "
+                  << strerror(errno) << "\n";
     }
 
     if (::close(out) == -1)
     {
-        std::cerr << "Failed to close out descriptor: " << strerror(errno)
-                  << "\n";
+        std::cerr << "Failed to close out descriptor " << std::dec << in << ": "
+                  << strerror(errno) << "\n";
     }
 
     return rc;