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

Unified Diff: runtime/bin/file_system_watcher_macos.cc

Issue 152883003: Remove DEBUG ifdefs. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/file_system_watcher_macos.cc
diff --git a/runtime/bin/file_system_watcher_macos.cc b/runtime/bin/file_system_watcher_macos.cc
index be3e858c2c28c8d5053c2a6ea8c954b043f6d5ae..413fcad62b8bee1dedeaeb72d7243a60e650c1c7 100644
--- a/runtime/bin/file_system_watcher_macos.cc
+++ b/runtime/bin/file_system_watcher_macos.cc
@@ -97,9 +97,7 @@ class FSEventsWatcher {
static void StartCallback(CFRunLoopTimerRef timer, void* info) {
Node* node = reinterpret_cast<Node*>(info);
-#ifdef DEBUG
ASSERT(node->watcher_->threadId_ == Thread::GetCurrentThreadId());
-#endif
FSEventStreamContext context;
memset(&context, 0, sizeof(context));
context.info = reinterpret_cast<void*>(node);
@@ -150,9 +148,7 @@ class FSEventsWatcher {
static void StopCallback(CFRunLoopTimerRef timer, void* info) {
Node* node = reinterpret_cast<Node*>(info);
-#ifdef DEBUG
ASSERT(node->watcher_->threadId_ == Thread::GetCurrentThreadId());
-#endif
FSEventStreamStop(node->ref_);
FSEventStreamInvalidate(node->ref_);
FSEventStreamRelease(node->ref_);
@@ -196,9 +192,8 @@ class FSEventsWatcher {
static void Run(uword arg) {
FSEventsWatcher* watcher = reinterpret_cast<FSEventsWatcher*>(arg);
-#ifdef DEBUG
+ // Only checked in debug mode.
watcher->threadId_ = Thread::GetCurrentThreadId();
-#endif
watcher->run_loop_ = CFRunLoopGetCurrent();
CFRetain(watcher->run_loop_);
@@ -245,9 +240,7 @@ class FSEventsWatcher {
static void StopCallback(CFRunLoopTimerRef timer, void* info) {
FSEventsWatcher* watcher = reinterpret_cast<FSEventsWatcher*>(info);
-#ifdef DEBUG
ASSERT(watcher->threadId_ == Thread::GetCurrentThreadId());
-#endif
CFRunLoopStop(watcher->run_loop_);
}
@@ -283,9 +276,7 @@ class FSEventsWatcher {
const FSEventStreamEventFlags event_flags[],
const FSEventStreamEventId event_ids[]) {
Node* node = reinterpret_cast<Node*>(client);
-#ifdef DEBUG
ASSERT(node->watcher()->threadId_ == Thread::GetCurrentThreadId());
-#endif
// `ready` is set on same thread as this callback is invoked, so we don't
// need to lock here.
if (!node->ready()) return;
@@ -305,9 +296,7 @@ class FSEventsWatcher {
Monitor monitor_;
CFRunLoopRef run_loop_;
-#ifdef DEBUG
ThreadId threadId_;
-#endif
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698