Add OnSyncEnabled/OnWriteEnabled notification handling to operation runner

webkit/fileapi/syncable/syncable_file_operation_runner.h

 // 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.
 
 #ifndef WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
 #define WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "webkit/fileapi/file_system_url.h"
+#include "webkit/fileapi/syncable/local_file_sync_status.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
 class FileSystemURL;
-class LocalFileSyncStatus;
 
 // This class must run only on IO thread.
 // Owned by LocalFileSyncContext.
 class WEBKIT_STORAGE_EXPORT SyncableFileOperationRunner
     : public base::NonThreadSafe,
-      public base::SupportsWeakPtr<SyncableFileOperationRunner> {
+      public base::SupportsWeakPtr<SyncableFileOperationRunner>,
+      public LocalFileSyncStatus::Observer {
  public:
   // Represents an operation task (which usually wraps one FileSystemOperation).
   class Task {
    public:
     Task() {}
     virtual ~Task() {}
 
     // Only one of Run() or Cancel() is called.
     virtual void Run() = 0;
     virtual void Cancel() = 0;
 
    protected:
     // This is never called after Run() or Cancel() is called.
     virtual const std::vector<FileSystemURL>& target_paths() const = 0;
 
    private:
     friend class SyncableFileOperationRunner;
     bool IsRunnable(LocalFileSyncStatus* status) const;
     void Start(LocalFileSyncStatus* status);
     static void CancelAndDelete(Task* task);
 
     DISALLOW_COPY_AND_ASSIGN(Task);
   };
 
-  SyncableFileOperationRunner();
-  ~SyncableFileOperationRunner();
+  SyncableFileOperationRunner(size_t max_inflight_tasks,
+                              LocalFileSyncStatus* sync_status);
+  virtual ~SyncableFileOperationRunner();
+
+  // LocalFileSyncStatus::Observer overrides.
+  virtual void OnSyncEnabled(const FileSystemURL& url) OVERRIDE;
+  virtual void OnWriteEnabled(const FileSystemURL& url) OVERRIDE;
 
   // Runs the given |task| if no sync operation is running on any of
-  // its target_paths(). This also runs pending operations that have become
+  // its target_paths(). This also runs pending tasks that have become
   // runnable (before running the given operation).
-  // If there're ongoing sync operations on the target_paths this method
+  // If there're ongoing sync tasks on the target_paths this method
   // just queues up the |task|.
-  // Pending operations are cancelled when this class is destructed.
+  // Pending tasks are cancelled when this class is destructed.
   void PostOperationTask(scoped_ptr<Task> task);
 
   // Runs a next runnable task (if there's any).
   void RunNextRunnableTask();
 
   // Called when an operation is completed. This will make |target_paths|
   // writable and may start a next runnable task.
   void OnOperationCompleted(const std::vector<FileSystemURL>& target_paths);
 
-  // For syncable file systems.
-  LocalFileSyncStatus* sync_status() const { return sync_status_.get(); }
+  LocalFileSyncStatus* sync_status() const { return sync_status_; }
+
+  size_t num_pending_tasks() const { return pending_tasks_.size(); }

[tzik, 2012/10/23 06:08:20]

Could you s/size_t/int64/ and add static_cast?

[kinuko, 2012/10/23 07:54:03]

Done.

+  size_t num_inflight_tasks() const { return num_inflight_tasks_; }
 
  private:
-  // Keeps track of the writing/syncing status.
-  scoped_ptr<LocalFileSyncStatus> sync_status_;
+  // Returns true if we should start more tasks.
+  bool ShouldStartMoreTasks() const;
 
-  std::list<Task*> pending_operations_;
+  // Keeps track of the writing/syncing status. Not owned.
+  LocalFileSyncStatus* sync_status_;
+
+  std::list<Task*> pending_tasks_;
+
+  const size_t max_inflight_tasks_;

[tzik, 2012/10/23 06:08:20]

ditto

[kinuko, 2012/10/23 07:54:03]

Done.

+  size_t num_inflight_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncableFileOperationRunner);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_