| OLD | NEW |
| 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 #include "chrome/browser/sync/glue/browser_thread_model_worker.h" | 5 #include "chrome/browser/sync/glue/browser_thread_model_worker.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/synchronization/waitable_event.h" | 8 #include "base/synchronization/waitable_event.h" |
| 9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
| 10 | 10 |
| 11 using base::WaitableEvent; | 11 using base::WaitableEvent; |
| 12 using content::BrowserThread; | 12 using content::BrowserThread; |
| 13 | 13 |
| 14 namespace browser_sync { | 14 namespace browser_sync { |
| 15 | 15 |
| 16 BrowserThreadModelWorker::BrowserThreadModelWorker( | 16 BrowserThreadModelWorker::BrowserThreadModelWorker( |
| 17 BrowserThread::ID thread, csync::ModelSafeGroup group) | 17 BrowserThread::ID thread, syncer::ModelSafeGroup group) |
| 18 : thread_(thread), group_(group) { | 18 : thread_(thread), group_(group) { |
| 19 } | 19 } |
| 20 | 20 |
| 21 csync::SyncerError BrowserThreadModelWorker::DoWorkAndWaitUntilDone( | 21 syncer::SyncerError BrowserThreadModelWorker::DoWorkAndWaitUntilDone( |
| 22 const csync::WorkCallback& work) { | 22 const syncer::WorkCallback& work) { |
| 23 csync::SyncerError error = csync::UNSET; | 23 syncer::SyncerError error = syncer::UNSET; |
| 24 if (BrowserThread::CurrentlyOn(thread_)) { | 24 if (BrowserThread::CurrentlyOn(thread_)) { |
| 25 DLOG(WARNING) << "Already on thread " << thread_; | 25 DLOG(WARNING) << "Already on thread " << thread_; |
| 26 return work.Run(); | 26 return work.Run(); |
| 27 } | 27 } |
| 28 WaitableEvent done(false, false); | 28 WaitableEvent done(false, false); |
| 29 if (!BrowserThread::PostTask( | 29 if (!BrowserThread::PostTask( |
| 30 thread_, | 30 thread_, |
| 31 FROM_HERE, | 31 FROM_HERE, |
| 32 base::Bind(&BrowserThreadModelWorker::CallDoWorkAndSignalTask, this, | 32 base::Bind(&BrowserThreadModelWorker::CallDoWorkAndSignalTask, this, |
| 33 work, &done, &error))) { | 33 work, &done, &error))) { |
| 34 NOTREACHED() << "Failed to post task to thread " << thread_; | 34 NOTREACHED() << "Failed to post task to thread " << thread_; |
| 35 return error; | 35 return error; |
| 36 } | 36 } |
| 37 done.Wait(); | 37 done.Wait(); |
| 38 return error; | 38 return error; |
| 39 } | 39 } |
| 40 | 40 |
| 41 csync::ModelSafeGroup BrowserThreadModelWorker::GetModelSafeGroup() { | 41 syncer::ModelSafeGroup BrowserThreadModelWorker::GetModelSafeGroup() { |
| 42 return group_; | 42 return group_; |
| 43 } | 43 } |
| 44 | 44 |
| 45 BrowserThreadModelWorker::~BrowserThreadModelWorker() {} | 45 BrowserThreadModelWorker::~BrowserThreadModelWorker() {} |
| 46 | 46 |
| 47 void BrowserThreadModelWorker::CallDoWorkAndSignalTask( | 47 void BrowserThreadModelWorker::CallDoWorkAndSignalTask( |
| 48 const csync::WorkCallback& work, | 48 const syncer::WorkCallback& work, |
| 49 WaitableEvent* done, | 49 WaitableEvent* done, |
| 50 csync::SyncerError* error) { | 50 syncer::SyncerError* error) { |
| 51 DCHECK(BrowserThread::CurrentlyOn(thread_)); | 51 DCHECK(BrowserThread::CurrentlyOn(thread_)); |
| 52 *error = work.Run(); | 52 *error = work.Run(); |
| 53 done->Signal(); | 53 done->Signal(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 DatabaseModelWorker::DatabaseModelWorker() | 56 DatabaseModelWorker::DatabaseModelWorker() |
| 57 : BrowserThreadModelWorker(BrowserThread::DB, csync::GROUP_DB) { | 57 : BrowserThreadModelWorker(BrowserThread::DB, syncer::GROUP_DB) { |
| 58 } | 58 } |
| 59 | 59 |
| 60 void DatabaseModelWorker::CallDoWorkAndSignalTask( | 60 void DatabaseModelWorker::CallDoWorkAndSignalTask( |
| 61 const csync::WorkCallback& work, | 61 const syncer::WorkCallback& work, |
| 62 WaitableEvent* done, | 62 WaitableEvent* done, |
| 63 csync::SyncerError* error) { | 63 syncer::SyncerError* error) { |
| 64 BrowserThreadModelWorker::CallDoWorkAndSignalTask(work, done, error); | 64 BrowserThreadModelWorker::CallDoWorkAndSignalTask(work, done, error); |
| 65 } | 65 } |
| 66 | 66 |
| 67 DatabaseModelWorker::~DatabaseModelWorker() {} | 67 DatabaseModelWorker::~DatabaseModelWorker() {} |
| 68 | 68 |
| 69 FileModelWorker::FileModelWorker() | 69 FileModelWorker::FileModelWorker() |
| 70 : BrowserThreadModelWorker(BrowserThread::FILE, csync::GROUP_FILE) { | 70 : BrowserThreadModelWorker(BrowserThread::FILE, syncer::GROUP_FILE) { |
| 71 } | 71 } |
| 72 | 72 |
| 73 void FileModelWorker::CallDoWorkAndSignalTask( | 73 void FileModelWorker::CallDoWorkAndSignalTask( |
| 74 const csync::WorkCallback& work, | 74 const syncer::WorkCallback& work, |
| 75 WaitableEvent* done, | 75 WaitableEvent* done, |
| 76 csync::SyncerError* error) { | 76 syncer::SyncerError* error) { |
| 77 BrowserThreadModelWorker::CallDoWorkAndSignalTask(work, done, error); | 77 BrowserThreadModelWorker::CallDoWorkAndSignalTask(work, done, error); |
| 78 } | 78 } |
| 79 | 79 |
| 80 FileModelWorker::~FileModelWorker() {} | 80 FileModelWorker::~FileModelWorker() {} |
| 81 | 81 |
| 82 } // namespace browser_sync | 82 } // namespace browser_sync |
| OLD | NEW |