Skip to content

Commit b4bd13d

Browse files
huoyaoyuanhuoyaoyuan
authored
Fix build break for paltests (#115877)
* Use minipal_lowres_ticks for paltests * Delete unused GetHighPrecisionTimeStamp
1 parent 16fd8fb commit b4bd13d

File tree

10 files changed

+32
-86
lines changed

10 files changed

+32
-86
lines changed

‎src/coreclr/pal/tests/palsuite/common/palsuite.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ char* convertC(const WCHAR * wString)
5252
return MultiBuffer;
5353
}
5454

55-
UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency)
56-
{
57-
return (UINT64)minipal_hires_ticks();
58-
}
59-
6055
static const char* rgchPathDelim = "/";
6156

6257

‎src/coreclr/pal/tests/palsuite/common/palsuite.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ inline ULONG VAL32(ULONG x)
163163

164164
WCHAR* convert(const char * aString);
165165
char* convertC(const WCHAR * wString);
166-
UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency);
167166

168167
extern const char* szTextFile;
169168

‎src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltes
3232
/* Milliseconds of error which are acceptable Function execution time, etc. */
3333
DWORD AcceptableTimeError = 150;
3434

35-
UINT64 OldTimeStamp;
36-
UINT64 NewTimeStamp;
35+
int64_t OldTimeStamp;
36+
int64_t NewTimeStamp;
3737
DWORD MaxDelta;
3838
DWORD TimeDelta;
3939
DWORD i;
@@ -43,17 +43,11 @@ PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltes
4343
return ( FAIL );
4444
}
4545

46-
LARGE_INTEGER performanceFrequency;
47-
if (!QueryPerformanceFrequency(&performanceFrequency))
48-
{
49-
return FAIL;
50-
}
51-
5246
for( i = 0; i < sizeof(SleepTimes) / sizeof(DWORD); i++)
5347
{
54-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
48+
OldTimeStamp = minipal_lowres_ticks();
5549
Sleep(SleepTimes[i]);
56-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
50+
NewTimeStamp = minipal_lowres_ticks();
5751

5852
TimeDelta = NewTimeStamp - OldTimeStamp;
5953

‎src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltes
3131
/* Milliseconds of error which are acceptable Function execution time, etc. */
3232
DWORD AcceptableTimeError = 150;
3333

34-
UINT64 OldTimeStamp;
35-
UINT64 NewTimeStamp;
34+
int64_t OldTimeStamp;
35+
int64_t NewTimeStamp;
3636
DWORD MaxDelta;
3737
DWORD TimeDelta;
3838
DWORD i;
@@ -42,17 +42,11 @@ PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltes
4242
return ( FAIL );
4343
}
4444

45-
LARGE_INTEGER performanceFrequency;
46-
if (!QueryPerformanceFrequency(&performanceFrequency))
47-
{
48-
return FAIL;
49-
}
50-
5145
for( i = 0; i < sizeof(SleepTimes) / sizeof(DWORD); i++)
5246
{
53-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
47+
OldTimeStamp = minipal_lowres_ticks();
5448
Sleep(SleepTimes[i]);
55-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
49+
NewTimeStamp = minipal_lowres_ticks();
5650

5751
TimeDelta = NewTimeStamp - OldTimeStamp;
5852

‎src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/
3939
{2000, TRUE},
4040
};
4141

42-
UINT64 OldTimeStamp;
43-
UINT64 NewTimeStamp;
42+
int64_t OldTimeStamp;
43+
int64_t NewTimeStamp;
4444
DWORD MaxDelta;
4545
DWORD TimeDelta;
4646
DWORD i;
@@ -50,19 +50,13 @@ PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/
5050
return FAIL;
5151
}
5252

53-
LARGE_INTEGER performanceFrequency;
54-
if (!QueryPerformanceFrequency(&performanceFrequency))
55-
{
56-
return FAIL;
57-
}
58-
5953
for (i = 0; i<sizeof(testCases) / sizeof(testCases[0]); i++)
6054
{
61-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
55+
OldTimeStamp = minipal_lowres_ticks();
6256

6357
SleepEx(testCases[i].SleepTime, testCases[i].Alertable);
6458

65-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
59+
NewTimeStamp = minipal_lowres_ticks();
6660

6761
TimeDelta = NewTimeStamp - OldTimeStamp;
6862

‎src/coreclr/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,19 @@ VOID PALAPI APCFunc_SleepEx_test2(ULONG_PTR dwParam)
155155
/* Entry Point for child thread. */
156156
DWORD PALAPI SleeperProc_SleepEx_test2(LPVOID lpParameter)
157157
{
158-
UINT64 OldTimeStamp;
159-
UINT64 NewTimeStamp;
158+
int64_t OldTimeStamp;
159+
int64_t NewTimeStamp;
160160
BOOL Alertable;
161161
DWORD ret;
162162

163163
Alertable = (BOOL)(SIZE_T) lpParameter;
164164

165-
LARGE_INTEGER performanceFrequency;
166-
if (!QueryPerformanceFrequency(&performanceFrequency))
167-
{
168-
return FAIL;
169-
}
170-
171-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
165+
OldTimeStamp = minipal_lowres_ticks();
172166
s_preWaitTimestampRecorded = true;
173167

174168
ret = SleepEx(ChildThreadSleepTime, Alertable);
175169

176-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
170+
NewTimeStamp = minipal_lowres_ticks();
177171

178172
if (Alertable && ret != WAIT_IO_COMPLETION)
179173
{

‎src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ VOID PALAPI APCFunc_WFMO_test2(ULONG_PTR dwParam)
140140
DWORD PALAPI WaiterProc_WFMO_test2(LPVOID lpParameter)
141141
{
142142
HANDLE Semaphore;
143-
UINT64 OldTimeStamp;
144-
UINT64 NewTimeStamp;
143+
int64_t OldTimeStamp;
144+
int64_t NewTimeStamp;
145145
BOOL Alertable;
146146
DWORD ret;
147147

@@ -156,19 +156,13 @@ DWORD PALAPI WaiterProc_WFMO_test2(LPVOID lpParameter)
156156

157157
Alertable = (BOOL)(SIZE_T) lpParameter;
158158

159-
LARGE_INTEGER performanceFrequency;
160-
if (!QueryPerformanceFrequency(&performanceFrequency))
161-
{
162-
Fail("Failed to query performance frequency!");
163-
}
164-
165-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
159+
OldTimeStamp = minipal_lowres_ticks();
166160
s_preWaitTimestampRecorded = true;
167161

168162
ret = WaitForMultipleObjectsEx(1, &Semaphore, FALSE, ChildThreadWaitTime,
169163
Alertable);
170164

171-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
165+
NewTimeStamp = minipal_lowres_ticks();
172166

173167

174168
if (Alertable && ret != WAIT_IO_COMPLETION)

‎src/coreclr/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,27 +177,21 @@ VOID PALAPI APCFunc_WFSOExMutexTest(ULONG_PTR dwParam)
177177
/* Entry Point for child thread. */
178178
DWORD PALAPI WaiterProc_WFSOExMutexTest(LPVOID lpParameter)
179179
{
180-
UINT64 OldTimeStamp;
181-
UINT64 NewTimeStamp;
180+
int64_t OldTimeStamp;
181+
int64_t NewTimeStamp;
182182
BOOL Alertable;
183183
DWORD ret;
184184

185185
Alertable = (BOOL)(SIZE_T) lpParameter;
186186

187-
LARGE_INTEGER performanceFrequency;
188-
if (!QueryPerformanceFrequency(&performanceFrequency))
189-
{
190-
Fail("Failed to query performance frequency!");
191-
}
192-
193-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
187+
OldTimeStamp = minipal_lowres_ticks();
194188
s_preWaitTimestampRecorded = true;
195189

196190
ret = WaitForSingleObjectEx( hMutex_WFSOExMutexTest,
197191
ChildThreadWaitTime,
198192
Alertable);
199193

200-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
194+
NewTimeStamp = minipal_lowres_ticks();
201195

202196
if (Alertable && ret != WAIT_IO_COMPLETION)
203197
{

‎src/coreclr/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,11 @@ VOID PALAPI APCFunc_WFSOExSemaphoreTest(ULONG_PTR dwParam)
133133
DWORD PALAPI WaiterProc_WFSOExSemaphoreTest(LPVOID lpParameter)
134134
{
135135
HANDLE hSemaphore;
136-
UINT64 OldTimeStamp;
137-
UINT64 NewTimeStamp;
136+
int64_t OldTimeStamp;
137+
int64_t NewTimeStamp;
138138
BOOL Alertable;
139139
DWORD ret;
140140

141-
LARGE_INTEGER performanceFrequency;
142-
if (!QueryPerformanceFrequency(&performanceFrequency))
143-
{
144-
Fail("Failed to query performance frequency!");
145-
}
146-
147141
/* Create a semaphore that is not in the signalled state */
148142
hSemaphore = CreateSemaphoreExW(NULL, 0, 1, NULL, 0, 0);
149143

@@ -155,14 +149,14 @@ DWORD PALAPI WaiterProc_WFSOExSemaphoreTest(LPVOID lpParameter)
155149

156150
Alertable = (BOOL)(SIZE_T) lpParameter;
157151

158-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
152+
OldTimeStamp = minipal_lowres_ticks();
159153
s_preWaitTimestampRecorded = true;
160154

161155
ret = WaitForSingleObjectEx( hSemaphore,
162156
ChildThreadWaitTime,
163157
Alertable);
164158

165-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
159+
NewTimeStamp = minipal_lowres_ticks();
166160

167161

168162
if (Alertable && ret != WAIT_IO_COMPLETION)

‎src/coreclr/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ VOID PALAPI APCFunc_WFSOExThreadTest(ULONG_PTR dwParam)
136136
DWORD PALAPI WaiterProc_WFSOExThreadTest(LPVOID lpParameter)
137137
{
138138
HANDLE hWaitThread;
139-
UINT64 OldTimeStamp;
140-
UINT64 NewTimeStamp;
139+
int64_t OldTimeStamp;
140+
int64_t NewTimeStamp;
141141
BOOL Alertable;
142142
DWORD ret;
143143
DWORD dwThreadId = 0;
@@ -163,20 +163,14 @@ satisfying any threads that were waiting on the object.
163163

164164
Alertable = (BOOL)(SIZE_T) lpParameter;
165165

166-
LARGE_INTEGER performanceFrequency;
167-
if (!QueryPerformanceFrequency(&performanceFrequency))
168-
{
169-
Fail("Failed to query performance frequency!");
170-
}
171-
172-
OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
166+
OldTimeStamp = minipal_lowres_ticks();
173167
s_preWaitTimestampRecorded = true;
174168

175169
ret = WaitForSingleObjectEx( hWaitThread,
176170
ChildThreadWaitTime,
177171
Alertable);
178172

179-
NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency);
173+
NewTimeStamp = minipal_lowres_ticks();
180174

181175

182176
if (Alertable && ret != WAIT_IO_COMPLETION)

0 commit comments

Comments
 (0)