commit 3515fd14304099c3b9c8f206500de759e6464b49
author Ed Tanous <etanous@nvidia.com> Wed Dec 11 23:34:32 2024 -0800
committer Ed Tanous <ed@tanous.net> Thu Jan 02 02:09:02 2025 +0000
tree e52a262c97276c3d11312e639fe3c439f8ca6c51
parent 58c71488f1db00f81b8242938f75c27062e8487d

Replace unique ptrs with concrete classes

Static analysis notes that these constructors should be using
make_unique.  While it's right, these don't need to be pointers at all.

Tested: No tests for this code available.

Change-Id: Ia7383da573e8ffeed7542c94556f59b1e4022d16
Signed-off-by: Ed Tanous <etanous@nvidia.com>

include/vm_websocket.hpp

diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index 5d92f5f..56a0d9a 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -40,9 +40,7 @@
         pipeOut(ios), pipeIn(ios),
         proxy(ios, "/usr/bin/nbd-proxy", {media},
               boost::process::v2::process_stdio{
-                  .in = pipeIn, .out = pipeOut, .err = nullptr}),
-        outputBuffer(new boost::beast::flat_static_buffer<nbdBufferSize>),
-        inputBuffer(new boost::beast::flat_static_buffer<nbdBufferSize>)
+                  .in = pipeIn, .out = pipeOut, .err = nullptr})
     {}
 
     ~Handler() = default;
@@ -90,7 +88,7 @@
             return;
         }
 
-        if (inputBuffer->size() == 0)
+        if (inputBuffer.size() == 0)
         {
             BMCWEB_LOG_DEBUG("inputBuffer empty.  Bailing out");
             return;
@@ -98,12 +96,12 @@
 
         doingWrite = true;
         pipeIn.async_write_some(
-            inputBuffer->data(),
+            inputBuffer.data(),
             [this, self(shared_from_this())](const boost::beast::error_code& ec,
                                              std::size_t bytesWritten) {
                 BMCWEB_LOG_DEBUG("Wrote {}bytes", bytesWritten);
                 doingWrite = false;
-                inputBuffer->consume(bytesWritten);
+                inputBuffer.consume(bytesWritten);
 
                 if (session == nullptr)
                 {
@@ -126,10 +124,10 @@
 
     void doRead()
     {
-        std::size_t bytes = outputBuffer->capacity() - outputBuffer->size();
+        std::size_t bytes = outputBuffer.capacity() - outputBuffer.size();
 
         pipeOut.async_read_some(
-            outputBuffer->prepare(bytes),
+            outputBuffer.prepare(bytes),
             [this, self(shared_from_this())](
                 const boost::system::error_code& ec, std::size_t bytesRead) {
                 BMCWEB_LOG_DEBUG("Read done.  Read {} bytes", bytesRead);
@@ -147,12 +145,12 @@
                     return;
                 }
 
-                outputBuffer->commit(bytesRead);
+                outputBuffer.commit(bytesRead);
                 std::string_view payload(
-                    static_cast<const char*>(outputBuffer->data().data()),
+                    static_cast<const char*>(outputBuffer.data().data()),
                     bytesRead);
                 session->sendBinary(payload);
-                outputBuffer->consume(bytesRead);
+                outputBuffer.consume(bytesRead);
 
                 doRead();
             });
@@ -163,10 +161,8 @@
     boost::process::v2::process proxy;
     bool doingWrite{false};
 
-    std::unique_ptr<boost::beast::flat_static_buffer<nbdBufferSize>>
-        outputBuffer;
-    std::unique_ptr<boost::beast::flat_static_buffer<nbdBufferSize>>
-        inputBuffer;
+    boost::beast::flat_static_buffer<nbdBufferSize> outputBuffer;
+    boost::beast::flat_static_buffer<nbdBufferSize> inputBuffer;
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
@@ -582,14 +578,14 @@
 
                 session = nullptr;
                 handler->doClose();
-                handler->inputBuffer->clear();
-                handler->outputBuffer->clear();
+                handler->inputBuffer.clear();
+                handler->outputBuffer.clear();
                 handler.reset();
             })
             .onmessage([](crow::websocket::Connection& conn,
                           const std::string& data, bool) {
-                if (data.length() > handler->inputBuffer->capacity() -
-                                        handler->inputBuffer->size())
+                if (data.length() > handler->inputBuffer.capacity() -
+                                        handler->inputBuffer.size())
                 {
                     BMCWEB_LOG_ERROR("Buffer overrun when writing {} bytes",
                                      data.length());
@@ -598,9 +594,9 @@
                 }
 
                 size_t copied = boost::asio::buffer_copy(
-                    handler->inputBuffer->prepare(data.size()),
+                    handler->inputBuffer.prepare(data.size()),
                     boost::asio::buffer(data));
-                handler->inputBuffer->commit(copied);
+                handler->inputBuffer.commit(copied);
                 handler->doWrite();
             });
     }