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

Side by Side Diff: mojo/public/cpp/utility/lib/thread.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "mojo/public/cpp/utility/thread.h" 5 #include "mojo/public/cpp/utility/thread.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 8
9 namespace mojo { 9 namespace mojo {
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 rv = pthread_attr_destroy(&attr); 42 rv = pthread_attr_destroy(&attr);
43 assert(rv == 0); 43 assert(rv == 0);
44 } 44 }
45 45
46 void Thread::Join() { 46 void Thread::Join() {
47 // Must have been started but not yet joined. 47 // Must have been started but not yet joined.
48 assert(started_); 48 assert(started_);
49 assert(!joined_); 49 assert(!joined_);
50 50
51 joined_ = true; 51 joined_ = true;
52 int rv = pthread_join(thread_, NULL); 52 int rv = pthread_join(thread_, nullptr);
53 MOJO_ALLOW_UNUSED_LOCAL(rv); 53 MOJO_ALLOW_UNUSED_LOCAL(rv);
54 assert(rv == 0); 54 assert(rv == 0);
55 } 55 }
56 56
57 // static 57 // static
58 void* Thread::ThreadRunTrampoline(void* arg) { 58 void* Thread::ThreadRunTrampoline(void* arg) {
59 Thread* self = static_cast<Thread*>(arg); 59 Thread* self = static_cast<Thread*>(arg);
60 self->Run(); 60 self->Run();
61 return NULL; 61 return nullptr;
62 } 62 }
63 63
64 } // namespace mojo 64 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698