Remaining cleanup (base::Bind): Replacing FileUtilProxy calls with new callback

base/file_util_proxy.h

Index: base/file_util_proxy.h
diff --git a/base/file_util_proxy.h b/base/file_util_proxy.h
index 30f051b52987eaf57b7dc88b3d53ba57a7273eb3..4daa3db020ac7e2d773006c0ebaec0b0f64f83de 100644
--- a/base/file_util_proxy.h
+++ b/base/file_util_proxy.h
@@ -8,9 +8,10 @@
 #include <vector>
 
 #include "base/base_export.h"
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
 #include "base/tracked_objects.h"
@@ -20,6 +21,27 @@ namespace base {
 class MessageLoopProxy;
 class Time;
 
+namespace internal {
+template <typename R, typename R1>
+struct ReturnValueAdaptor {
+  static R1 Value(const R& value);
+};
+
+template <typename R>
+struct ReturnValueAdaptor<R, R> {
+  static PlatformFileError Value(const R& value) { return value; }
+};
+
+template <>
+struct ReturnValueAdaptor<bool, PlatformFileError> {
+  static PlatformFileError Value(const bool& value) {
+    if (value)
+      return PLATFORM_FILE_OK;
+    return PLATFORM_FILE_ERROR_FAILED;
+  }
+};
+}  // namespace internal
+
 // This class provides asynchronous access to common file routines.
 class BASE_EXPORT FileUtilProxy {
  public:
@@ -31,31 +53,80 @@ class BASE_EXPORT FileUtilProxy {
     base::Time last_modified_time;
   };
 
-  // This callback is used by methods that report only an error code.  It is
-  // valid to pass NULL as the callback parameter to any function that takes a
-  // StatusCallback, in which case the operation will complete silently.
-  // The ownership of |callback| is taken by the function and will always be
-  // deleted by the function even on failure.
-  typedef Callback1<PlatformFileError /* error code */>::Type StatusCallback;
-
-  typedef Callback3<PlatformFileError /* error code */,
-                    PassPlatformFile,
-                    bool /* created */>::Type CreateOrOpenCallback;
-  typedef Callback3<PlatformFileError /* error code */,
-                    PassPlatformFile,
-                    FilePath>::Type CreateTemporaryCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    bool /* created */>::Type EnsureFileExistsCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    const PlatformFileInfo& /* file_info */
-                    >::Type GetFileInfoCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    const std::vector<Entry>&>::Type ReadDirectoryCallback;
-  typedef Callback3<PlatformFileError /* error code */,
-                    const char* /* data */,
-                    int /* bytes read/written */>::Type ReadCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    int /* bytes written */>::Type WriteCallback;
+  // This callback is used by methods that report only an error code.
+  typedef Callback<void(PlatformFileError)> StatusCallback;
+
+  typedef Callback<void(PlatformFileError,
+                        PassPlatformFile,
+                        bool /* created */)> CreateOrOpenCallback;
+  typedef Callback<void(PlatformFileError,
+                        PassPlatformFile,
+                        FilePath)> CreateTemporaryCallback;
+  typedef Callback<void(PlatformFileError,
+                        const PlatformFileInfo&)> GetFileInfoCallback;
+  typedef Callback<void(PlatformFileError,
+                        const std::vector<Entry>&)> ReadDirectoryCallback;
+  typedef Callback<void(PlatformFileError,
+                        const char* /* data */,
+                        int /* bytes read/written */)> ReadCallback;
+  typedef Callback<void(PlatformFileError,
+                        int /* bytes written */)> WriteCallback;
+
+  class MessageLoopRelay : public RefCountedThreadSafe<MessageLoopRelay> {

[awong, 2011/10/12 08:09:27]

Is it possible to not have this class at All?
It looks like what it's essentially doing is allowing one to return a value via
a return type, and then pass that in as the parameter to the next callback.

We had considered that when making MessageLoopProsy::PostTaskAndreply(), and had
decided to try instead for sharing a data structure between two closures via
currying.  So instead of

R DoWork()
void DoReply(R)

We do

void DoWork(R*)
void DoReply(R*);

R* r = new R();
ml_->PostTaskAndReply(FROM_HERE, Bind(&DoWork, r), Bind(&DoReply, r));

[kinuko, 2011/10/12 11:23:38]

Thanks for your early comments!
Hmm... I see.  The issue was almost all of the file related functions return
bool or PlatformFileError to report return status.

What if I do like this using two helper templates?

template <typename R> static void ReplyWithReturnAdapter(
    const Callback<R(void)>& func, R* result) {
  *result = func.Run();
}


// the R* pointer will be unretained (or do something smarter)
template <typename R>
static Closure ReplyWithReturn(const Callback<R(void)>& func, R* result) {
  return base::Bind(&ReplyWithReturnAdapter<R>, func,
                    base::Unretained(result));
}

Then we can call a function with return value like:

R DoWork();
void DoReply(*R);

ml_->PostTaskAndReply(FROM_HERE,           
   FUP::ReplyWithReturn(Bind(&DoWork), &result),
   Bind(&DoReply));

[awong, 2011/10/15 00:17:12]

I think that'd work pretty well.  About the memory management, I think using
Owned() in the reply will take care of deleting |result| correctly. 
Specifically:


R* result = new R();
ml_->PostTaskAndReply(FROM_HERE,
  ReplyWithReturnAdapter(Bind(&DoWork, a, b, c), result),
  Bind(&DoReply, Owned(result));


Also, in ReplyWithReturn, you don't need base::Unretained(result) if R is not a
refcounted type.

Lastly, I think these templates can go completely inside an anonymous namespace
the .cc file right?

-Albert



On 2011/10/12 11:23:38, kinuko wrote:

+   public:
+    MessageLoopRelay() {}
+    bool Start(scoped_refptr<MessageLoopProxy> message_loop_proxy,
+               const tracked_objects::Location& from_here);
+   protected:
+    friend class RefCountedThreadSafe<MessageLoopRelay>;
+    virtual ~MessageLoopRelay() {}
+    virtual void RunWork() = 0;
+    virtual void RunCallback() = 0;
+  };
+
+  template <typename R, typename R1 = R>
+  class MessageLoopRelayWithReturn : public MessageLoopRelay {
+   public:
+    MessageLoopRelayWithReturn(const Callback<R(void)>& closure,
+                        const Callback<void(R1)>& callback,
+                        R initial_value)
+        : closure_(closure), callback_(callback),
+          result_(initial_value) {}
+
+   protected:
+    virtual ~MessageLoopRelayWithReturn() {}
+
+    virtual void RunWork() OVERRIDE {
+      result_ = closure_.Run();
+    }
+
+    virtual void RunCallback() OVERRIDE {
+      if (!callback_.is_null()) {
+        callback_.Run(internal::ReturnValueAdaptor<R, R1>::Value(result_));
+      }
+    }
+
+   private:
+    Callback<R(void)> closure_;
+    Callback<void(R1)> callback_;
+    R result_;
+  };
+
+  // A helper function that runs the given |file_function| that returns R.
+  // It is valid to pass Callback<>() as the callback parameter,
+  // in which case the operation will complete silently (like you do
+  // with normal PostTask with IgnoreReturn).
+  template <typename R, typename A>
+  static bool PostFileTaskAndReplyStatus(
+      scoped_refptr<MessageLoopProxy> message_loop_proxy,
+      const tracked_objects::Location& from_here,
+      const Callback<R(void)>& file_function,
+      const Callback<void(A)>& callback) {
+    typedef MessageLoopRelayWithReturn<R, A> RelayType;
+    return make_scoped_refptr(
+        new RelayType(file_function, callback, PLATFORM_FILE_OK))->Start(
+            message_loop_proxy, from_here);
+  }
 
   // Creates or opens a file with the given flags.  It is invalid to pass NULL
   // for the callback.
@@ -66,7 +137,7 @@ class BASE_EXPORT FileUtilProxy {
   static bool CreateOrOpen(scoped_refptr<MessageLoopProxy> message_loop_proxy,
                            const FilePath& file_path,
                            int file_flags,
-                           CreateOrOpenCallback* callback);
+                           const CreateOrOpenCallback& callback);
 
   // Creates a temporary file for writing.  The path and an open file handle
   // are returned.  It is invalid to pass NULL for the callback.  The additional
@@ -79,85 +150,19 @@ class BASE_EXPORT FileUtilProxy {
   static bool CreateTemporary(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       int additional_file_flags,
-      CreateTemporaryCallback* callback);
-
-  // Close the given file handle.
-  static bool Close(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                    PlatformFile,
-                    StatusCallback* callback);
-
-  // Ensures that the given |file_path| exist.  This creates a empty new file
-  // at |file_path| if the |file_path| does not exist.
-  // If a new file han not existed and is created at the |file_path|,
-  // |created| of the callback argument is set true and |error code|
-  // is set PLATFORM_FILE_OK.
-  // If the file already exists, |created| is set false and |error code|
-  // is set PLATFORM_FILE_OK.
-  // If the file hasn't existed but it couldn't be created for some other
-  // reasons, |created| is set false and |error code| indicates the error.
-  static bool EnsureFileExists(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      EnsureFileExistsCallback* callback);
+      const CreateTemporaryCallback& callback);
 
   // Retrieves the information about a file. It is invalid to pass NULL for the
   // callback.
   static bool GetFileInfo(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
-      GetFileInfoCallback* callback);
+      const GetFileInfoCallback& callback);
 
   static bool GetFileInfoFromPlatformFile(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       PlatformFile file,
-      GetFileInfoCallback* callback);
-
-  static bool ReadDirectory(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                            const FilePath& file_path,
-                            ReadDirectoryCallback* callback);
-
-  // Creates directory at given path. It's an error to create
-  // if |exclusive| is true and dir already exists.
-  static bool CreateDirectory(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      bool exclusive,
-      bool recursive,
-      StatusCallback* callback);
-
-  // Copies a file or a directory from |src_file_path| to |dest_file_path|
-  // Error cases:
-  // If destination file doesn't exist or destination's parent
-  // doesn't exists.
-  // If source dir exists but destination path is an existing file.
-  // If source file exists but destination path is an existing directory.
-  // If source is a parent of destination.
-  // If source doesn't exists.
-  static bool Copy(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                   const FilePath& src_file_path,
-                   const FilePath& dest_file_path,
-                   StatusCallback* callback);
-
-  // Moves a file or a directory from src_file_path to dest_file_path.
-  // Error cases are similar to Copy method's error cases.
-  static bool Move(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& src_file_path,
-      const FilePath& dest_file_path,
-      StatusCallback* callback);
-
-  // Deletes a file or a directory.
-  // It is an error to delete a non-empty directory with recursive=false.
-  static bool Delete(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                     const FilePath& file_path,
-                     bool recursive,
-                     StatusCallback* callback);
-
-  // Deletes a directory and all of its contents.
-  static bool RecursiveDelete(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      StatusCallback* callback);
+      const GetFileInfoCallback& callback);
 
   // Reads from a file. On success, the file pointer is moved to position
   // |offset + bytes_to_read| in the file. The callback can be NULL.
@@ -166,7 +171,7 @@ class BASE_EXPORT FileUtilProxy {
       PlatformFile file,
       int64 offset,
       int bytes_to_read,
-      ReadCallback* callback);
+      const ReadCallback& callback);
 
   // Writes to a file. If |offset| is greater than the length of the file,
   // |false| is returned. On success, the file pointer is moved to position
@@ -178,47 +183,7 @@ class BASE_EXPORT FileUtilProxy {
       int64 offset,
       const char* buffer,
       int bytes_to_write,
-      WriteCallback* callback);
-
-  // Touches a file. The callback can be NULL.
-  static bool Touch(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      StatusCallback* callback);
-
-  // Touches a file. The callback can be NULL.
-  static bool Touch(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      StatusCallback* callback);
-
-  // Truncates a file to the given length. If |length| is greater than the
-  // current length of the file, the file will be extended with zeroes.
-  // The callback can be NULL.
-  static bool Truncate(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      int64 length,
-      StatusCallback* callback);
-
-  // Truncates a file to the given length. If |length| is greater than the
-  // current length of the file, the file will be extended with zeroes.
-  // The callback can be NULL.
-  static bool Truncate(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& path,
-      int64 length,
-      StatusCallback* callback);
-
-  // Flushes a file. The callback can be NULL.
-  static bool Flush(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      StatusCallback* callback);
+      const WriteCallback& callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileUtilProxy);