Commit: 5ba1330a29fca6ed22b118cf787bd6cfe94e3ecf - FlyingHttpServer (git)

C++ベースのLightweightなHTTPサーバー

Commit MetaInfo

• Revision: 5ba1330a29fca6ed22b118cf787bd6cfe94e3ecf (tree)
• Time: 2013-01-20 21:01:02
• Author: Michio Hirai <smg_ykz@user...>
• Commiter: Michio Hirai

Log Message

[Function] New support of mt::AutoPtr copy syntax to/from convertible types.

Change Summary

• modified: cm/cm_vector_socket.cpp
• modified: cm/test/cm_vector_socket_test.cpp
• modified: inc/cm_vector_socket.h
• modified: inc/mt_auto_ptr.h

Incremental Difference

--- a/cm/cm_vector_socket.cpp
+++ b/cm/cm_vector_socket.cpp
@@ -25,5 +25,11 @@ bool VectorSocket::writev(size_t& bytes_written, const IOVectorBase& vector, siz
     return true;
 }
 
+int VectorSocket::release()
+{
+    int fd_to_return = fd_;
+    fd_ = -1;
+    return fd_to_return;
+}
 
 } // namespace cm

--- a/cm/test/cm_vector_socket_test.cpp
+++ b/cm/test/cm_vector_socket_test.cpp
@@ -3,6 +3,7 @@
 
 #include "gmock/gmock.h"
 
+#include "mt_auto_ptr.h"
 #include "mt_typelist_algo_utility.h"
 #include "mt_shim_clear_memory.h"
 #include "cm_vector_socket.h"
@@ -76,4 +77,41 @@ TEST(CmVectorSocketTest, simple)
     EXPECT_EQ(bytes_read, total_bytes_written);
 }
 
+TEST(CmVectorSocketTest, ownership_move_from_socket)
+{
+    cm::Socket original_sock(STDOUT_FILENO);
+
+    cm::VectorSocket vec_sock(original_sock);
+
+    const cm::IOVectorBase& iov = cm::IOVec()(string1, sizeof(string1) - 1)
+                     (string2, sizeof(string2) - 1)
+                     (string3, sizeof(string3) - 1);
+
+    size_t bytes_written = 0u;
+    vec_sock.writev(bytes_written, iov);
+}
+
+TEST(CmVectorSocketTest, ownership_move_from_socket_via_auto_ptr)
+{
+    mt::AutoPtr<cm::SocketIf> original_socket(new cm::Socket(STDOUT_FILENO));
+
+    mt::AutoPtr<cm::VectorSocket> vec_sock(original_socket);
+
+    const cm::IOVectorBase& iov = cm::IOVec()(string1, sizeof(string1) - 1)
+                     (string2, sizeof(string2) - 1)
+                     (string3, sizeof(string3) - 1);
+
+    size_t bytes_written = 0u;
+    vec_sock->writev(bytes_written, iov);
+
+    mt::AutoPtr<cm::Socket> renewed_socket(vec_sock);
+
+    std::cout << std::endl;
+    renewed_socket->write(bytes_written, "hello world(2)!!!", sizeof("hello world(2)!!!") - 1);
+
+    vec_sock = renewed_socket;
+
+    vec_sock->writev(bytes_written, iov);
+}
+
 } // namespace

--- a/inc/cm_vector_socket.h
+++ b/inc/cm_vector_socket.h
@@ -27,6 +27,8 @@ public:
     bool writev(size_t& bytes_written, const IOVectorBase& vector, size_t skip_bytes = 0u);
     // bool readv(size_t& bytes_read, IOVector<T>& vector);
 
+    int release();
+
 private:
     int fd_;
 };

--- a/inc/mt_auto_ptr.h
+++ b/inc/mt_auto_ptr.h
@@ -31,8 +31,12 @@ public:
 
     AutoPtr(AutoPtr<T>& rhs)
         : raw_ptr_(rhs.release())
-    {
-    }
+    {}
+
+    template <typename X>
+    AutoPtr(AutoPtr<X>& rhs)
+        : raw_ptr_(rhs.get() ? new T(*(rhs.release())) : 0)
+    {}
 
     AutoPtr(AutoPtrRef<T> ref)
         : raw_ptr_(ref.raw_ptr_)
@@ -89,9 +93,19 @@ public:
 
     AutoPtr& operator=(AutoPtr& rhs)
     {
-        this->reset();
-        this->set(rhs.get());
-        rhs.release();
+        if (this != &rhs) {
+            this->reset();
+            this->set(rhs.get());
+            rhs.release();
+        }
+        return *this;
+    }
+
+    template <typename X>
+    AutoPtr& operator=(AutoPtr<X>& rhs)
+    {
+        X* ptr = rhs.get();
+        raw_ptr_ = ptr ? new T(*ptr) : 0;
         return *this;
     }