Make FileStream::Seek async and add FileStream::SeekSync for sync operation

net/base/file_stream_unittest.cc

 // Copyright (c) 2012 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 "net/base/file_stream.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 137 matching lines @@
 
   // 1. Test reading with a file handle.
   ASSERT_EQ(kTestDataSize,
       file_util::WriteFile(temp_file_path(), kTestData, kTestDataSize));
   int flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_READ;
   base::PlatformFile file = base::CreatePlatformFile(
       temp_file_path(), flags, &created, NULL);
 
   // Seek to the beginning of the file and read.
   FileStream read_stream(file, flags, NULL);
-  ASSERT_EQ(0, read_stream.Seek(FROM_BEGIN, 0));
+  ASSERT_EQ(0, read_stream.SeekSync(FROM_BEGIN, 0));

[willchan no longer on Chromium, 2012/04/05 15:12:28]

We need new tests for the asynchronous API too.

[kinuko, 2012/04/06 12:42:37]

Added AsyncSeekAround test and replaced SeekSync with Seek in Async{Read,Write}
tests.

   ASSERT_EQ(kTestDataSize, read_stream.Available());
   // Read into buffer and compare.
   char buffer[kTestDataSize];
   ASSERT_EQ(kTestDataSize,
             read_stream.ReadSync(buffer, kTestDataSize));
   ASSERT_EQ(0, memcmp(kTestData, buffer, kTestDataSize));
   read_stream.CloseSync();
 
   // 2. Test writing with a file handle.
   file_util::Delete(temp_file_path(), false);
   flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_WRITE;
   file = base::CreatePlatformFile(temp_file_path(), flags, &created, NULL);
 
   FileStream write_stream(file, flags, NULL);
-  ASSERT_EQ(0, write_stream.Seek(FROM_BEGIN, 0));
+  ASSERT_EQ(0, write_stream.SeekSync(FROM_BEGIN, 0));
   ASSERT_EQ(kTestDataSize,
             write_stream.WriteSync(kTestData, kTestDataSize));
   write_stream.CloseSync();
 
   // Read into buffer and compare to make sure the handle worked fine.
   ASSERT_EQ(kTestDataSize,
       file_util::ReadFile(temp_file_path(), buffer, kTestDataSize));
   ASSERT_EQ(0, memcmp(kTestData, buffer, kTestDataSize));
 }
 
 TEST_F(FileStreamTest, UseClosedStream) {
   FileStream stream(NULL);
 
   EXPECT_FALSE(stream.IsOpen());
 
   // Try seeking...
-  int64 new_offset = stream.Seek(FROM_BEGIN, 5);
+  int64 new_offset = stream.SeekSync(FROM_BEGIN, 5);
   EXPECT_EQ(ERR_UNEXPECTED, new_offset);
 
   // Try available...
   int64 avail = stream.Available();
   EXPECT_EQ(ERR_UNEXPECTED, avail);
 
   // Try reading...
   char buf[10];
   int rv = stream.ReadSync(buf, arraysize(buf));
   EXPECT_EQ(ERR_UNEXPECTED, rv);
@@ skipping 172 matching lines @@
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 3;
-  int64 new_offset = stream.Seek(FROM_BEGIN, kOffset);
+  int64 new_offset = stream.SeekSync(FROM_BEGIN, kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size - kOffset, total_bytes_avail);
 
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
@@ skipping 15 matching lines @@
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 3;
-  int64 new_offset = stream.Seek(FROM_BEGIN, kOffset);
+  int64 new_offset = stream.SeekSync(FROM_BEGIN, kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size - kOffset, total_bytes_avail);
 
   TestCompletionCallback callback;
 
   int total_bytes_read = 0;
 
   std::string data_read;
@@ skipping 13 matching lines @@
 }
 
 TEST_F(FileStreamTest, SeekAround) {
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 3;
-  int64 new_offset = stream.Seek(FROM_BEGIN, kOffset);
+  int64 new_offset = stream.SeekSync(FROM_BEGIN, kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
-  new_offset = stream.Seek(FROM_CURRENT, kOffset);
+  new_offset = stream.SeekSync(FROM_CURRENT, kOffset);
   EXPECT_EQ(2 * kOffset, new_offset);
 
-  new_offset = stream.Seek(FROM_CURRENT, -kOffset);
+  new_offset = stream.SeekSync(FROM_CURRENT, -kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   const int kTestDataLen = arraysize(kTestData) - 1;
 
-  new_offset = stream.Seek(FROM_END, -kTestDataLen);
+  new_offset = stream.SeekSync(FROM_END, -kTestDataLen);
   EXPECT_EQ(0, new_offset);
 }
 
 TEST_F(FileStreamTest, BasicWrite) {
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
               base::PLATFORM_FILE_WRITE;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
@@ skipping 82 matching lines @@
               base::PLATFORM_FILE_WRITE;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize, file_size);
 
   const int64 kOffset = 0;
-  int64 new_offset = stream.Seek(FROM_END, kOffset);
+  int64 new_offset = stream.SeekSync(FROM_END, kOffset);
   EXPECT_EQ(kTestDataSize, new_offset);
 
   rv = stream.WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
   stream.CloseSync();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
 TEST_F(FileStreamTest, AsyncWrite_FromOffset) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 0;
-  int64 new_offset = stream.Seek(FROM_END, kOffset);
+  int64 new_offset = stream.SeekSync(FROM_END, kOffset);
   EXPECT_EQ(kTestDataSize, new_offset);
 
   TestCompletionCallback callback;
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
     rv = stream.Write(drainable, drainable->BytesRemaining(),
@@ skipping 58 matching lines @@
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
-  int64 offset = stream.Seek(FROM_END, 0);
+  int64 offset = stream.SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   rv = stream.WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
 
-  offset = stream.Seek(FROM_BEGIN, 0);
+  offset = stream.SeekSync(FROM_BEGIN, 0);
   EXPECT_EQ(0, offset);
 
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
     rv = stream.ReadSync(buf, arraysize(buf));
     EXPECT_LE(0, rv);
     if (rv <= 0)
@@ skipping 80 matching lines @@
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
-  int64 offset = stream.Seek(FROM_END, 0);
+  int64 offset = stream.SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   TestCompletionCallback callback;
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
     rv = stream.Write(drainable, drainable->BytesRemaining(),
                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
-  offset = stream.Seek(FROM_BEGIN, 0);
+  offset = stream.SeekSync(FROM_BEGIN, 0);
   EXPECT_EQ(0, offset);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
     rv = stream.Read(buf, buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
@@ skipping 63 matching lines @@
           stream_, &total_bytes_written, &total_bytes_read, &data_read);
       rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
                           callback.callback());
       DCHECK_EQ(ERR_IO_PENDING, rv);
       rv = callback.WaitForResult();
       drainable_->DidConsume(total_bytes_written);
       *total_bytes_written_ += total_bytes_written;
       *total_bytes_read_ += total_bytes_read;
       *data_read_ += data_read;
     } else {  // We're done writing all data.  Start reading the data.
-      stream_->Seek(FROM_BEGIN, 0);
+      stream_->SeekSync(FROM_BEGIN, 0);
 
       TestCompletionCallback callback;
       for (;;) {
         scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
         rv = stream_->Read(buf, buf->size(), callback.callback());
         if (rv == ERR_IO_PENDING) {
           MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
           rv = callback.WaitForResult();
         }
         EXPECT_LE(0, rv);
@@ skipping 33 matching lines @@
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
-  int64 offset = stream.Seek(FROM_END, 0);
+  int64 offset = stream.SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   int total_bytes_read = 0;
   std::string data_read;
   TestWriteReadCompletionCallback callback(&stream, &total_bytes_written,
                                            &total_bytes_read, &data_read);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   rv = stream.Write(buf, buf->size(), callback.callback());
@@ skipping 89 matching lines @@
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
-  int64 offset = stream.Seek(FROM_END, 0);
+  int64 offset = stream.SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   TestWriteCloseCompletionCallback callback(&stream, &total_bytes_written);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   rv = stream.Write(buf, buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     total_bytes_written = callback.WaitForResult();
   EXPECT_LT(0, total_bytes_written);
@@ skipping 155 matching lines @@
   // Delete the stream without waiting for the close operation to be
   // complete. Should be safe.
   stream.reset();
   // close_callback won't be called.
   EXPECT_FALSE(close_callback.have_result());
 }
 
 }  // namespace
 
 }  // namespace net