Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: sync/engine/syncer.h

Issue 11342008: Revert 164565 - sync: make scheduling logic and job ownership more obvious. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1311/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/engine/sync_session_job_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SYNC_ENGINE_SYNCER_H_ 5 #ifndef SYNC_ENGINE_SYNCER_H_
6 #define SYNC_ENGINE_SYNCER_H_ 6 #define SYNC_ENGINE_SYNCER_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 Syncer(); 51 Syncer();
52 virtual ~Syncer(); 52 virtual ~Syncer();
53 53
54 // Called by other threads to tell the syncer to stop what it's doing 54 // Called by other threads to tell the syncer to stop what it's doing
55 // and return early from SyncShare, if possible. 55 // and return early from SyncShare, if possible.
56 bool ExitRequested(); 56 bool ExitRequested();
57 void RequestEarlyExit(); 57 void RequestEarlyExit();
58 58
59 // Runs a sync cycle from |first_step| to |last_step|. 59 // Runs a sync cycle from |first_step| to |last_step|.
60 // Returns true if the cycle completed with |last_step|, and false 60 virtual void SyncShare(sessions::SyncSession* session,
61 // if it terminated early due to error / exit requested.
62 virtual bool SyncShare(sessions::SyncSession* session,
63 SyncerStep first_step, 61 SyncerStep first_step,
64 SyncerStep last_step); 62 SyncerStep last_step);
65 63
66 private: 64 private:
67 bool early_exit_requested_; 65 bool early_exit_requested_;
68 base::Lock early_exit_requested_lock_; 66 base::Lock early_exit_requested_lock_;
69 67
70 ConflictResolver resolver_; 68 ConflictResolver resolver_;
71 69
72 friend class SyncerTest; 70 friend class SyncerTest;
(...skipping 22 matching lines...) Expand all
95 }; 93 };
96 94
97 // Utility function declarations. 95 // Utility function declarations.
98 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); 96 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
99 void ClearServerData(syncable::MutableEntry* entry); 97 void ClearServerData(syncable::MutableEntry* entry);
100 const char* SyncerStepToString(const SyncerStep); 98 const char* SyncerStepToString(const SyncerStep);
101 99
102 } // namespace syncer 100 } // namespace syncer
103 101
104 #endif // SYNC_ENGINE_SYNCER_H_ 102 #endif // SYNC_ENGINE_SYNCER_H_
OLDNEW
« no previous file with comments | « sync/engine/sync_session_job_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698