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

Side by Side Diff: util/thread/thread_win.cc

Issue 1134943003: Move thread from test/ to util/thread/. (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: PCHECK fix. Created 5 years, 7 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
« no previous file with comments | « util/thread/thread_test.cc ('k') | util/util.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "test/thread.h" 15 #include "util/thread/thread.h"
16 16
17 #include "gtest/gtest.h" 17 #include "base/logging.h"
18 #include "test/errors.h"
19 18
20 namespace crashpad { 19 namespace crashpad {
21 namespace test {
22 20
23 void Thread::Start() { 21 void Thread::Start() {
24 ASSERT_FALSE(platform_thread_); 22 DCHECK(!platform_thread_);
25 platform_thread_ = 23 platform_thread_ =
26 CreateThread(nullptr, 0, ThreadEntryThunk, this, 0, nullptr); 24 CreateThread(nullptr, 0, ThreadEntryThunk, this, 0, nullptr);
27 ASSERT_TRUE(platform_thread_) << ErrorMessage("CreateThread"); 25 PCHECK(platform_thread_);
28 } 26 }
29 27
30 void Thread::Join() { 28 void Thread::Join() {
31 ASSERT_TRUE(platform_thread_); 29 DCHECK(platform_thread_);
32 DWORD result = WaitForSingleObject(platform_thread_, INFINITE); 30 DWORD result = WaitForSingleObject(platform_thread_, INFINITE);
33 EXPECT_EQ(WAIT_OBJECT_0, result) << ErrorMessage("WaitForSingleObject"); 31 PCHECK(WAIT_OBJECT_0 == result);
34 platform_thread_ = 0; 32 platform_thread_ = 0;
35 } 33 }
36 34
37 // static 35 // static
38 DWORD WINAPI Thread::ThreadEntryThunk(void* argument) { 36 DWORD WINAPI Thread::ThreadEntryThunk(void* argument) {
39 Thread* self = reinterpret_cast<Thread*>(argument); 37 Thread* self = reinterpret_cast<Thread*>(argument);
40 self->ThreadMain(); 38 self->ThreadMain();
41 return 0; 39 return 0;
42 } 40 }
43 41
44 } // namespace test
45 } // namespace crashpad 42 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/thread/thread_test.cc ('k') | util/util.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698