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

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

Issue 1022203002: Followup to https://codereview.chromium.org/1001673002/ (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: fix Thread::Join in win Created 5 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
« no previous file with comments | « util/file/file_io_posix.cc ('k') | no next file » | 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,
(...skipping 10 matching lines...) Expand all
21 namespace test { 21 namespace test {
22 22
23 void Thread::Start() { 23 void Thread::Start() {
24 ASSERT_FALSE(platform_thread_); 24 ASSERT_FALSE(platform_thread_);
25 platform_thread_ = 25 platform_thread_ =
26 CreateThread(nullptr, 0, ThreadEntryThunk, this, 0, nullptr); 26 CreateThread(nullptr, 0, ThreadEntryThunk, this, 0, nullptr);
27 ASSERT_TRUE(platform_thread_) << ErrorMessage("CreateThread"); 27 ASSERT_TRUE(platform_thread_) << ErrorMessage("CreateThread");
28 } 28 }
29 29
30 void Thread::Join() { 30 void Thread::Join() {
31 ASSERT_FALSE(platform_thread_); 31 ASSERT_TRUE(platform_thread_);
32 DWORD result = WaitForSingleObject(platform_thread_, INFINITE); 32 DWORD result = WaitForSingleObject(platform_thread_, INFINITE);
33 EXPECT_EQ(WAIT_OBJECT_0, result) << ErrorMessage("WaitForSingleObject"); 33 EXPECT_EQ(WAIT_OBJECT_0, result) << ErrorMessage("WaitForSingleObject");
34 platform_thread_ = 0; 34 platform_thread_ = 0;
35 } 35 }
36 36
37 // static 37 // static
38 DWORD WINAPI Thread::ThreadEntryThunk(void* argument) { 38 DWORD WINAPI Thread::ThreadEntryThunk(void* argument) {
39 Thread* self = reinterpret_cast<Thread*>(argument); 39 Thread* self = reinterpret_cast<Thread*>(argument);
40 self->ThreadMain(); 40 self->ThreadMain();
41 return 0; 41 return 0;
42 } 42 }
43 43
44 } // namespace test 44 } // namespace test
45 } // namespace crashpad 45 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/file/file_io_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698