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

Side by Side Diff: chrome/browser/sync/engine/post_commit_message_command.cc

Issue 9036003: Avoid useless SYNC_CYCLE_CONTINUATION sync cycle (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/sync/engine/post_commit_message_command.h" 5 #include "chrome/browser/sync/engine/post_commit_message_command.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "chrome/browser/sync/engine/syncer_proto_util.h" 10 #include "chrome/browser/sync/engine/syncer_proto_util.h"
11 #include "chrome/browser/sync/engine/syncproto.h" 11 #include "chrome/browser/sync/engine/syncproto.h"
12 #include "chrome/browser/sync/sessions/sync_session.h" 12 #include "chrome/browser/sync/sessions/sync_session.h"
13 #include "chrome/browser/sync/syncable/directory_manager.h" 13 #include "chrome/browser/sync/syncable/directory_manager.h"
14 14
15 using std::vector; 15 using std::vector;
16 16
17 namespace browser_sync { 17 namespace browser_sync {
18 18
19 PostCommitMessageCommand::PostCommitMessageCommand() {} 19 PostCommitMessageCommand::PostCommitMessageCommand() {}
20 PostCommitMessageCommand::~PostCommitMessageCommand() {} 20 PostCommitMessageCommand::~PostCommitMessageCommand() {}
21 21
22 void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) { 22 SyncerError PostCommitMessageCommand::ExecuteImpl(
23 sessions::SyncSession* session) {
23 if (session->status_controller().commit_ids().empty()) 24 if (session->status_controller().commit_ids().empty())
24 return; // Nothing to commit. 25 return NO_ERROR; // Nothing to commit.
25 ClientToServerResponse response; 26 ClientToServerResponse response;
26 syncable::ScopedDirLookup dir(session->context()->directory_manager(), 27 syncable::ScopedDirLookup dir(session->context()->directory_manager(),
27 session->context()->account_name()); 28 session->context()->account_name());
28 if (!dir.good()) 29 if (!dir.good())
29 return; 30 return DIRECTORY_LOOKUP_FAILED;
30 sessions::StatusController* status = session->mutable_status_controller(); 31 sessions::StatusController* status = session->mutable_status_controller();
31 if (!SyncerProtoUtil::PostClientToServerMessage(status->commit_message(), 32 SyncerError result = SyncerProtoUtil::PostClientToServerMessage(
32 &response, session)) { 33 status->commit_message(), &response, session);
34 if (result != NO_ERROR) {
33 // None of our changes got through. Clear the SYNCING bit which was 35 // None of our changes got through. Clear the SYNCING bit which was
34 // set to true during BuildCommitCommand, and which may still be true. 36 // set to true during BuildCommitCommand, and which may still be true.
35 // Not to be confused with IS_UNSYNCED, this bit is used to detect local 37 // Not to be confused with IS_UNSYNCED, this bit is used to detect local
36 // changes to items that happen during the server Commit operation. 38 // changes to items that happen during the server Commit operation.
37 status->increment_num_consecutive_errors(); 39 status->increment_num_consecutive_errors();
38 syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir); 40 syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
39 const vector<syncable::Id>& commit_ids = status->commit_ids(); 41 const vector<syncable::Id>& commit_ids = status->commit_ids();
40 for (size_t i = 0; i < commit_ids.size(); i++) { 42 for (size_t i = 0; i < commit_ids.size(); i++) {
41 syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]); 43 syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]);
42 entry.Put(syncable::SYNCING, false); 44 entry.Put(syncable::SYNCING, false);
43 } 45 }
44 return; 46 return result;
45 } else {
46 status->set_items_committed();
47 } 47 }
48
49 status->set_items_committed();
48 status->mutable_commit_response()->CopyFrom(response); 50 status->mutable_commit_response()->CopyFrom(response);
51 return NO_ERROR;
49 } 52 }
50 53
51 } // namespace browser_sync 54 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/post_commit_message_command.h ('k') | chrome/browser/sync/engine/process_commit_response_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698