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

Side by Side Diff: src/utils/SkThreadUtils_win.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/utils/SkThreadUtils_pthread.cpp ('k') | src/utils/android/SkAndroidSDKCanvas.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkTypes.h" 8 #include "SkTypes.h"
9 9
10 #include "SkThreadUtils.h" 10 #include "SkThreadUtils.h"
11 #include "SkThreadUtils_win.h" 11 #include "SkThreadUtils_win.h"
12 12
13 SkThread_WinData::SkThread_WinData(SkThread::entryPointProc entryPoint, void* da ta) 13 SkThread_WinData::SkThread_WinData(SkThread::entryPointProc entryPoint, void* da ta)
14 : fHandle(NULL) 14 : fHandle(nullptr)
15 , fParam(data) 15 , fParam(data)
16 , fThreadId(0) 16 , fThreadId(0)
17 , fEntryPoint(entryPoint) 17 , fEntryPoint(entryPoint)
18 , fStarted(false) 18 , fStarted(false)
19 { 19 {
20 fCancelEvent = CreateEvent( 20 fCancelEvent = CreateEvent(
21 NULL, // default security attributes 21 nullptr, // default security attributes
22 false, //auto reset 22 false, //auto reset
23 false, //not signaled 23 false, //not signaled
24 NULL); //no name 24 nullptr); //no name
25 } 25 }
26 26
27 SkThread_WinData::~SkThread_WinData() { 27 SkThread_WinData::~SkThread_WinData() {
28 CloseHandle(fCancelEvent); 28 CloseHandle(fCancelEvent);
29 } 29 }
30 30
31 static DWORD WINAPI thread_start(LPVOID data) { 31 static DWORD WINAPI thread_start(LPVOID data) {
32 SkThread_WinData* winData = static_cast<SkThread_WinData*>(data); 32 SkThread_WinData* winData = static_cast<SkThread_WinData*>(data);
33 33
34 //See if this thread was canceled before starting. 34 //See if this thread was canceled before starting.
35 if (WaitForSingleObject(winData->fCancelEvent, 0) == WAIT_OBJECT_0) { 35 if (WaitForSingleObject(winData->fCancelEvent, 0) == WAIT_OBJECT_0) {
36 return 0; 36 return 0;
37 } 37 }
38 38
39 winData->fEntryPoint(winData->fParam); 39 winData->fEntryPoint(winData->fParam);
40 return 0; 40 return 0;
41 } 41 }
42 42
43 SkThread::SkThread(entryPointProc entryPoint, void* data) { 43 SkThread::SkThread(entryPointProc entryPoint, void* data) {
44 SkThread_WinData* winData = new SkThread_WinData(entryPoint, data); 44 SkThread_WinData* winData = new SkThread_WinData(entryPoint, data);
45 fData = winData; 45 fData = winData;
46 46
47 if (NULL == winData->fCancelEvent) { 47 if (nullptr == winData->fCancelEvent) {
48 return; 48 return;
49 } 49 }
50 50
51 winData->fHandle = CreateThread( 51 winData->fHandle = CreateThread(
52 NULL, // default security attributes 52 nullptr, // default security attributes
53 0, // use default stack size 53 0, // use default stack size
54 thread_start, // thread function name (proxy) 54 thread_start, // thread function name (proxy)
55 winData, // argument to thread function (proxy args) 55 winData, // argument to thread function (proxy args)
56 CREATE_SUSPENDED, // create suspended so affinity can be set 56 CREATE_SUSPENDED, // create suspended so affinity can be set
57 &winData->fThreadId); // returns the thread identifier 57 &winData->fThreadId); // returns the thread identifier
58 } 58 }
59 59
60 SkThread::~SkThread() { 60 SkThread::~SkThread() {
61 if (fData != NULL) { 61 if (fData != nullptr) {
62 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData); 62 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
63 // If created thread but start was never called, kill the thread. 63 // If created thread but start was never called, kill the thread.
64 if (winData->fHandle != NULL && !winData->fStarted) { 64 if (winData->fHandle != nullptr && !winData->fStarted) {
65 if (SetEvent(winData->fCancelEvent) != 0) { 65 if (SetEvent(winData->fCancelEvent) != 0) {
66 if (this->start()) { 66 if (this->start()) {
67 this->join(); 67 this->join();
68 } 68 }
69 } else { 69 } else {
70 //kill with prejudice 70 //kill with prejudice
71 TerminateThread(winData->fHandle, -1); 71 TerminateThread(winData->fHandle, -1);
72 } 72 }
73 } 73 }
74 delete winData; 74 delete winData;
75 } 75 }
76 } 76 }
77 77
78 bool SkThread::start() { 78 bool SkThread::start() {
79 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData); 79 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
80 if (NULL == winData->fHandle) { 80 if (nullptr == winData->fHandle) {
81 return false; 81 return false;
82 } 82 }
83 83
84 if (winData->fStarted) { 84 if (winData->fStarted) {
85 return false; 85 return false;
86 } 86 }
87 winData->fStarted = -1 != ResumeThread(winData->fHandle); 87 winData->fStarted = -1 != ResumeThread(winData->fHandle);
88 return winData->fStarted; 88 return winData->fStarted;
89 } 89 }
90 90
91 void SkThread::join() { 91 void SkThread::join() {
92 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData); 92 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
93 if (NULL == winData->fHandle || !winData->fStarted) { 93 if (nullptr == winData->fHandle || !winData->fStarted) {
94 return; 94 return;
95 } 95 }
96 96
97 WaitForSingleObject(winData->fHandle, INFINITE); 97 WaitForSingleObject(winData->fHandle, INFINITE);
98 } 98 }
99 99
100 static unsigned int num_bits_set(DWORD_PTR mask) { 100 static unsigned int num_bits_set(DWORD_PTR mask) {
101 unsigned int count; 101 unsigned int count;
102 for (count = 0; mask; ++count) { 102 for (count = 0; mask; ++count) {
103 mask &= mask - 1; 103 mask &= mask - 1;
104 } 104 }
105 return count; 105 return count;
106 } 106 }
107 107
108 static unsigned int nth_set_bit(unsigned int n, DWORD_PTR mask) { 108 static unsigned int nth_set_bit(unsigned int n, DWORD_PTR mask) {
109 n %= num_bits_set(mask); 109 n %= num_bits_set(mask);
110 for (unsigned int setBitsSeen = 0, currentBit = 0; true; ++currentBit) { 110 for (unsigned int setBitsSeen = 0, currentBit = 0; true; ++currentBit) {
111 if (mask & (static_cast<DWORD_PTR>(1) << currentBit)) { 111 if (mask & (static_cast<DWORD_PTR>(1) << currentBit)) {
112 ++setBitsSeen; 112 ++setBitsSeen;
113 if (setBitsSeen > n) { 113 if (setBitsSeen > n) {
114 return currentBit; 114 return currentBit;
115 } 115 }
116 } 116 }
117 } 117 }
118 } 118 }
119 119
120 bool SkThread::setProcessorAffinity(unsigned int processor) { 120 bool SkThread::setProcessorAffinity(unsigned int processor) {
121 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData); 121 SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
122 if (NULL == winData->fHandle) { 122 if (nullptr == winData->fHandle) {
123 return false; 123 return false;
124 } 124 }
125 125
126 DWORD_PTR processAffinityMask; 126 DWORD_PTR processAffinityMask;
127 DWORD_PTR systemAffinityMask; 127 DWORD_PTR systemAffinityMask;
128 if (0 == GetProcessAffinityMask(GetCurrentProcess(), 128 if (0 == GetProcessAffinityMask(GetCurrentProcess(),
129 &processAffinityMask, 129 &processAffinityMask,
130 &systemAffinityMask)) { 130 &systemAffinityMask)) {
131 return false; 131 return false;
132 } 132 }
133 133
134 DWORD_PTR threadAffinityMask = 1 << nth_set_bit(processor, processAffinityMa sk); 134 DWORD_PTR threadAffinityMask = 1 << nth_set_bit(processor, processAffinityMa sk);
135 return 0 != SetThreadAffinityMask(winData->fHandle, threadAffinityMask); 135 return 0 != SetThreadAffinityMask(winData->fHandle, threadAffinityMask);
136 } 136 }
OLDNEW
« no previous file with comments | « src/utils/SkThreadUtils_pthread.cpp ('k') | src/utils/android/SkAndroidSDKCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698