From: Haomai Wang <haomaiwang@gmail.com>
Date: Tue, 30 Sep 2014 05:44:02 +0000 (+0800)
Subject: Pipe: avoid redundancy new/delete for struct iovec
X-Git-Tag: v0.88~135^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05fd5077ddf5bc852265aa37d6c05e0894e70867;p=ceph.git

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 0e529e017c2..aaa04cb3bcc 100644
--- 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 c2c799a4631..b6d743207b3 100644
--- 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;