Use queue label as id in SequencedTaskChecker when not running on TaskQueue

webrtc/base/sequenced_task_checker_impl.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/sequenced_task_checker_impl.h"
 
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/base/task_queue.h"
 
 namespace rtc {
 
 SequencedTaskCheckerImpl::SequencedTaskCheckerImpl()
     : attached_(true), valid_queue_(TaskQueue::Current()) {}
 
 SequencedTaskCheckerImpl::~SequencedTaskCheckerImpl() {}
 
 bool SequencedTaskCheckerImpl::CalledSequentially() const {
-  TaskQueue* current_queue = TaskQueue::Current();
+  QueueId current_queue = TaskQueue::Current();
+#if defined(WEBRTC_MAC)
+  if (current_queue == nullptr)
+    // If we're not running on a TaskQueue, use the system dispatch queue

[magjed_webrtc, 2016/11/02 12:04:41]

nit: I would like the comments above the if-statement instead.

[tommi, 2016/11/02 16:32:50]

agree.
style comment: as is, this should use {} since the body of the conditional,
including comments, is more than one line.

[kthelgason, 2016/11/02 16:53:55]

Done.

+    // label as an identifier.
+    current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL);

[magjed_webrtc, 2016/11/02 12:04:41]

We don't need any include for this magical dispatch_queue_get_label?

[tommi, 2016/11/02 16:32:50]

good point.  We need #include <dispatch/dispatch.h> which is transitively
included right now via task_queue.h.

[kthelgason, 2016/11/02 16:53:55]

Done.

+#endif
   CritScope scoped_lock(&lock_);
   if (!attached_) {  // true if previously detached.
     valid_queue_ = current_queue;
     attached_ = true;
   }
   if (!valid_queue_)
     return thread_checker_.CalledOnValidThread();
   return valid_queue_ == current_queue;
 }
 
 void SequencedTaskCheckerImpl::Detach() {
   CritScope scoped_lock(&lock_);
   attached_ = false;
   valid_queue_ = nullptr;
   thread_checker_.DetachFromThread();
 }
 
 namespace internal {
 
 SequencedTaskCheckerScope::SequencedTaskCheckerScope(
     const SequencedTaskChecker* checker) {
   RTC_DCHECK(checker->CalledSequentially());
 }
 
 SequencedTaskCheckerScope::~SequencedTaskCheckerScope() {}
 
 }  // namespace internal
 }  // namespace rtc