From 1e158e80c89cee6badea9ee2bfc1112959bbff54 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Fri, 14 Oct 2016 17:43:11 +0200
Subject: [PATCH] improvements

---
 src/uvw/stream.hpp | 49 ++++++++++++++++++++++++++++++++++------------
 src/uvw/udp.hpp    | 44 +++++++++++++++++++++++++++++++----------
 2 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp
index c2674969..fd661f42 100644
--- a/src/uvw/stream.hpp
+++ b/src/uvw/stream.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 
+#include <algorithm>
 #include <iterator>
 #include <cstddef>
 #include <utility>
@@ -103,20 +104,42 @@ public:
 
 
 class WriteReq final: public Request<WriteReq, uv_write_t> {
-    using Request::Request;
+    using Deleter = void(*)(uv_buf_t *);
+
+    template<std::size_t N>
+    static void deleter(uv_buf_t *bufs) {
+        std::for_each(bufs, bufs+N, [](uv_buf_t &buf){ delete[] buf.base; });
+        delete[] bufs;
+    }
+
+    template<std::size_t N>
+    WriteReq(std::shared_ptr<Loop> loop, const uv_buf_t (&arr)[N])
+        : Request<WriteReq, uv_write_t>{std::move(loop)},
+          bufs{new uv_buf_t[N], &deleter<N>},
+          nbufs{N}
+    {
+        for(std::size_t i = 0; i < N; ++i) {
+            bufs[i] = arr[i];
+        }
+    }
 
 public:
-    static std::shared_ptr<WriteReq> create(std::shared_ptr<Loop> loop) {
-        return std::shared_ptr<WriteReq>{new WriteReq{std::move(loop)}};
+    template<typename... Args>
+    static std::shared_ptr<WriteReq> create(Args&&... args) {
+        return std::shared_ptr<WriteReq>{new WriteReq{std::forward<Args>(args)...}};
     }
 
-    void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs) {
-        invoke(&uv_write, get(), handle, bufs, nbufs, &defaultCallback<WriteEvent>);
+    void write(uv_stream_t *handle) {
+        invoke(&uv_write, get(), handle, bufs.get(), nbufs, &defaultCallback<WriteEvent>);
     }
 
-    void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs, uv_stream_t *send) {
-        invoke(&uv_write2, get(), handle, bufs, nbufs, send, &defaultCallback<WriteEvent>);
+    void write(uv_stream_t *handle, uv_stream_t *send) {
+        invoke(&uv_write2, get(), handle, bufs.get(), nbufs, send, &defaultCallback<WriteEvent>);
     }
+
+private:
+    std::unique_ptr<uv_buf_t[], Deleter> bufs;
+    std::size_t nbufs;
 };
 
 
@@ -253,16 +276,16 @@ public:
      * @param len The lenght of the submitted data.
      */
     void write(std::unique_ptr<char[]> data, ssize_t len) {
-        uv_buf_t bufs[] = { uv_buf_init(data.get(), len) };
+        const uv_buf_t bufs[] = { uv_buf_init(data.release(), len) };
 
         auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
             ptr->publish(event);
         };
 
-        auto write = this->loop().template resource<details::WriteReq>();
+        auto write = this->loop().template resource<details::WriteReq>(bufs);
         write->template once<ErrorEvent>(listener);
         write->template once<WriteEvent>(listener);
-        write->write(this->template get<uv_stream_t>(), bufs, 1);
+        write->write(this->template get<uv_stream_t>());
     }
 
 
@@ -284,16 +307,16 @@ public:
      */
     template<typename S>
     void write(S &send, std::unique_ptr<char[]> data, ssize_t len) {
-        uv_buf_t bufs[] = { uv_buf_init(data.get(), len) };
+        const uv_buf_t bufs[] = { uv_buf_init(data.release(), len) };
 
         auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
             ptr->publish(event);
         };
 
-        auto write = this->loop().template resource<details::WriteReq>();
+        auto write = this->loop().template resource<details::WriteReq>(bufs);
         write->template once<ErrorEvent>(listener);
         write->template once<WriteEvent>(listener);
-        write->write(this->template get<uv_stream_t>(), bufs, 1, send.template get<uv_stream_t>());
+        write->write(this->template get<uv_stream_t>(), send.template get<uv_stream_t>());
     }
 
     /**
diff --git a/src/uvw/udp.hpp b/src/uvw/udp.hpp
index 0d05f3d0..30fc60c9 100644
--- a/src/uvw/udp.hpp
+++ b/src/uvw/udp.hpp
@@ -2,7 +2,9 @@
 
 
 #include <type_traits>
+#include <algorithm>
 #include <utility>
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <uv.h>
@@ -55,17 +57,39 @@ enum class UVMembership: std::underlying_type_t<uv_membership> {
 };
 
 
-class Send final: public Request<Send, uv_udp_send_t> {
-    using Request::Request;
+class SendReq final: public Request<SendReq, uv_udp_send_t> {
+    using Deleter = void(*)(uv_buf_t *);
+
+    template<std::size_t N>
+    static void deleter(uv_buf_t *bufs) {
+        std::for_each(bufs, bufs+N, [](uv_buf_t &buf){ delete[] buf.base; });
+        delete[] bufs;
+    }
+
+    template<std::size_t N>
+    SendReq(std::shared_ptr<Loop> loop, const uv_buf_t (&arr)[N])
+        : Request<SendReq, uv_udp_send_t>{std::move(loop)},
+          bufs{new uv_buf_t[N], &deleter<N>},
+          nbufs{N}
+    {
+        for(std::size_t i = 0; i < N; ++i) {
+            bufs[i] = arr[i];
+        }
+    }
 
 public:
-    static std::shared_ptr<Send> create(std::shared_ptr<Loop> loop) {
-        return std::shared_ptr<Send>{new Send{std::move(loop)}};
+    template<typename... Args>
+    static std::shared_ptr<SendReq> create(Args&&... args) {
+        return std::shared_ptr<SendReq>{new SendReq{std::forward<Args>(args)...}};
     }
 
-    void send(uv_udp_t *handle, const uv_buf_t bufs[], unsigned int nbufs, const struct sockaddr* addr) {
-        invoke(&uv_udp_send, get(), handle, bufs, nbufs, addr, &defaultCallback<SendEvent>);
+    void send(uv_udp_t *handle, const struct sockaddr* addr) {
+        invoke(&uv_udp_send, get(), handle, bufs.get(), nbufs, addr, &defaultCallback<SendEvent>);
     }
+
+private:
+    std::unique_ptr<uv_buf_t[], Deleter> bufs;
+    std::size_t nbufs;
 };
 
 
@@ -299,16 +323,16 @@ public:
         typename details::IpTraits<I>::Type addr;
         details::IpTraits<I>::addrFunc(ip.data(), port, &addr);
 
-        uv_buf_t bufs[] = { uv_buf_init(data.get(), len) };
+        const uv_buf_t bufs[] = { uv_buf_init(data.release(), len) };
 
-        auto listener = [ptr = shared_from_this()](const auto &event, details::Send &) {
+        auto listener = [ptr = shared_from_this()](const auto &event, details::SendReq &) {
             ptr->publish(event);
         };
 
-        auto send = loop().resource<details::Send>();
+        auto send = loop().resource<details::SendReq>(bufs);
         send->once<ErrorEvent>(listener);
         send->once<SendEvent>(listener);
-        send->send(get(), bufs, 1, reinterpret_cast<const sockaddr *>(&addr));
+        send->send(get(), reinterpret_cast<const sockaddr *>(&addr));
     }
 
     /**