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

Side by Side Diff: chrome/browser/file_path_watcher/file_path_watcher_inotify.cc

Issue 6697020: Fixed shutdown concurrency issues in FilePathWatcher. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 9 months 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/file_path_watcher/file_path_watcher.h" 5 #include "chrome/browser/file_path_watcher/file_path_watcher.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <string.h> 8 #include <string.h>
9 #include <sys/inotify.h> 9 #include <sys/inotify.h>
10 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
11 #include <sys/select.h> 11 #include <sys/select.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <set> 15 #include <set>
16 #include <utility> 16 #include <utility>
17 #include <vector> 17 #include <vector>
18 18
19 #include "base/eintr_wrapper.h" 19 #include "base/eintr_wrapper.h"
20 #include "base/file_path.h" 20 #include "base/file_path.h"
21 #include "base/file_util.h" 21 #include "base/file_util.h"
22 #include "base/hash_tables.h" 22 #include "base/hash_tables.h"
23 #include "base/lazy_instance.h" 23 #include "base/lazy_instance.h"
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/message_loop.h" 25 #include "base/message_loop.h"
26 #include "base/scoped_ptr.h" 26 #include "base/scoped_ptr.h"
27 #include "base/synchronization/lock.h" 27 #include "base/synchronization/lock.h"
28 #include "base/task.h" 28 #include "base/task.h"
29 #include "base/threading/thread.h" 29 #include "base/threading/thread.h"
30 #include "content/browser/browser_thread.h"
30 31
31 namespace { 32 namespace {
32 33
33 class FilePathWatcherImpl; 34 class FilePathWatcherImpl;
34 35
35 // Singleton to manage all inotify watches. 36 // Singleton to manage all inotify watches.
36 // TODO(tony): It would be nice if this wasn't a singleton. 37 // TODO(tony): It would be nice if this wasn't a singleton.
37 // http://crbug.com/38174 38 // http://crbug.com/38174
38 class InotifyReader { 39 class InotifyReader {
39 public: 40 public:
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 405 }
405 406
406 return true; 407 return true;
407 } 408 }
408 409
409 } // namespace 410 } // namespace
410 411
411 FilePathWatcher::FilePathWatcher() { 412 FilePathWatcher::FilePathWatcher() {
412 impl_ = new FilePathWatcherImpl(); 413 impl_ = new FilePathWatcherImpl();
413 } 414 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698