Pipe: avoid redundancy new/delete for struct iovec

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 0e529e017c239e52109a3c4b9370148709128f5d..aaa04cb3bcc4ed523b87d985729d23a1e327a5f7 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -2192,7 +2192,6 @@ int Pipe::write_message(ceph_msg_header& header, ceph_msg_footer& footer, buffer
   // set up msghdr and iovecs
   struct msghdr msg;
   memset(&msg, 0, sizeof(msg));
-  struct iovec *msgvec = new iovec[3 + blist.buffers().size()];  // conservative upper bound
   msg.msg_iov = msgvec;
   int msglen = 0;
   
@@ -2297,7 +2296,6 @@ int Pipe::write_message(ceph_msg_header& header, ceph_msg_footer& footer, buffer
   ret = 0;
 
  out:
-  delete[] msgvec;
   return ret;
 
  fail:

diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index c2c799a463103fba6f49bd7ce31b4ee269fd1502..b6d743207b3f25a2cbea37b473f68d2a19059a4f 100644 (file)
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -173,6 +173,8 @@ class DispatchQueue;
 
   private:
     int sd;
+    struct iovec msgvec[IOV_MAX];
+
   public:
     int port;
     int peer_type;