Mojo: POSIX: Add a PlatformChannelSendmsgWithHandles().

mojo/embedder/platform_channel_pair_posix_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/embedder/platform_channel_pair.h"
 
 #include <errno.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
@@ skipping 111 matching lines @@
     std::deque<PlatformHandle> received_handles;
     ssize_t result = PlatformChannelRecvmsg(client_handle.get(), buf,
                                             sizeof(buf), &received_handles);
     EXPECT_EQ(static_cast<ssize_t>(send_string.size()), result);
     EXPECT_EQ(send_string, std::string(buf, static_cast<size_t>(result)));
     EXPECT_TRUE(received_handles.empty());
   }
 }
 
 TEST_F(PlatformChannelPairPosixTest, SendReceiveFDs) {
+  static const char kHello[] = "hello";
+
   PlatformChannelPair channel_pair;
   ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass();
   ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass();
 
   for (size_t i = 1; i < kPlatformChannelMaxNumHandles; i++) {
     // Make |i| files, with the j-th file consisting of j copies of the digit i.
     PlatformHandleVector platform_handles;
     for (size_t j = 1; j <= i; j++) {
       base::FilePath ignored;
       base::ScopedFILE fp(base::CreateAndOpenTemporaryFile(&ignored));
       ASSERT_TRUE(fp);
       fwrite(std::string(j, '0' + i).data(), 1, j, fp.get());
       platform_handles.push_back(
           test::PlatformHandleFromFILE(fp.Pass()).release());
       ASSERT_TRUE(platform_handles.back().is_valid());
     }
 
-    // Send the FDs.
-    EXPECT_TRUE(PlatformChannelSendHandles(server_handle.get(),
-                                           &platform_handles[0],
-                                           platform_handles.size()));
+    // Send the FDs (+ "hello").
+    struct iovec iov = { const_cast<char*>(kHello), sizeof(kHello) };
+    // We assume that the |sendmsg()| actually sends all the data.
+    EXPECT_EQ(static_cast<ssize_t>(sizeof(kHello)),
+              PlatformChannelSendmsgWithHandles(server_handle.get(), &iov, 1,
+                                                &platform_handles[0],
+                                                platform_handles.size()));
 
     WaitReadable(client_handle.get());
 
-    char buf[100] = { 'a' };
+    char buf[100] = {};
     std::deque<PlatformHandle> received_handles;
-    EXPECT_EQ(1, PlatformChannelRecvmsg(client_handle.get(), buf, sizeof(buf),
-                                        &received_handles));
-    EXPECT_EQ('\0', buf[0]);
-    ASSERT_FALSE(received_handles.empty());
+    // We assume that the |recvmsg()| actually reads all the data.
+    EXPECT_EQ(static_cast<ssize_t>(sizeof(kHello)),
+              PlatformChannelRecvmsg(client_handle.get(), buf, sizeof(buf),
+                                     &received_handles));
+    EXPECT_STREQ(kHello, buf);
     EXPECT_EQ(i, received_handles.size());
 
     for (size_t j = 0; !received_handles.empty(); j++) {
       base::ScopedFILE fp(test::FILEFromPlatformHandle(
           ScopedPlatformHandle(received_handles.front()), "rb"));
       received_handles.pop_front();
       ASSERT_TRUE(fp);
       rewind(fp.get());
       char read_buf[100];
       size_t bytes_read = fread(read_buf, 1, sizeof(read_buf), fp.get());
       EXPECT_EQ(j + 1, bytes_read);
       EXPECT_EQ(std::string(j + 1, '0' + i), std::string(read_buf, bytes_read));
     }
   }
 }
 
 TEST_F(PlatformChannelPairPosixTest, AppendReceivedFDs) {
+  static const char kHello[] = "hello";
+
   PlatformChannelPair channel_pair;
   ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass();
   ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass();
 
   const std::string file_contents("hello world");
 
   {
     base::FilePath ignored;
     base::ScopedFILE fp(base::CreateAndOpenTemporaryFile(&ignored));
     ASSERT_TRUE(fp);
     fwrite(file_contents.data(), 1, file_contents.size(), fp.get());
     PlatformHandleVector platform_handles;
     platform_handles.push_back(
         test::PlatformHandleFromFILE(fp.Pass()).release());
     ASSERT_TRUE(platform_handles.back().is_valid());
 
-    // Send the FD.
-    EXPECT_TRUE(PlatformChannelSendHandles(server_handle.get(),
-                                           &platform_handles[0],
-                                           platform_handles.size()));
+    // Send the FD (+ "hello").
+    struct iovec iov = { const_cast<char*>(kHello), sizeof(kHello) };
+    // We assume that the |sendmsg()| actually sends all the data.
+    EXPECT_EQ(static_cast<ssize_t>(sizeof(kHello)),
+              PlatformChannelSendmsgWithHandles(server_handle.get(), &iov, 1,
+                                                &platform_handles[0],
+                                                platform_handles.size()));
   }
 
   WaitReadable(client_handle.get());
 
   // Start with an invalid handle in the deque.
   std::deque<PlatformHandle> received_handles;
   received_handles.push_back(PlatformHandle());
 
-  char buf[100] = { 'a' };
-  EXPECT_EQ(1, PlatformChannelRecvmsg(client_handle.get(), buf, sizeof(buf),
-                                      &received_handles));
-  EXPECT_EQ('\0', buf[0]);
+  char buf[100] = {};
+  // We assume that the |recvmsg()| actually reads all the data.
+  EXPECT_EQ(static_cast<ssize_t>(sizeof(kHello)),
+            PlatformChannelRecvmsg(client_handle.get(), buf, sizeof(buf),
+                                   &received_handles));
+  EXPECT_STREQ(kHello, buf);
   ASSERT_EQ(2u, received_handles.size());
   EXPECT_FALSE(received_handles[0].is_valid());
   EXPECT_TRUE(received_handles[1].is_valid());
 
   {
     base::ScopedFILE fp(test::FILEFromPlatformHandle(
         ScopedPlatformHandle(received_handles[1]), "rb"));
     received_handles[1] = PlatformHandle();
     ASSERT_TRUE(fp);
     rewind(fp.get());
     char read_buf[100];
     size_t bytes_read = fread(read_buf, 1, sizeof(read_buf), fp.get());
     EXPECT_EQ(file_contents.size(), bytes_read);
     EXPECT_EQ(file_contents, std::string(read_buf, bytes_read));
   }
 }
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo