Skip to content

Commit 3d1d955

Browse files
committed
Fixed InProcess (no emit) async tests.
1 parent 3664d35 commit 3d1d955

File tree

2 files changed

+32
-40
lines changed

2 files changed

+32
-40
lines changed

src/BenchmarkDotNet/Toolchains/InProcess.NoEmit/BenchmarkActionFactory_Implementations.cs

+16-20
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ public BenchmarkActionTask(object instance, MethodInfo method, int unrollFactor)
134134

135135
private ValueTask InvokeSingleHardcodedOverhead()
136136
{
137-
InvokeNoUnrollHardcodedOverhead(1, null);
137+
callback();
138138
return new ValueTask();
139139
}
140140

141141
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
142142
{
143143
repeatsRemaining = repeatCount;
144144
Task value = default;
145-
startedClock = clock?.Start() ?? default;
145+
startedClock = clock.Start();
146146
try
147147
{
148148
while (--repeatsRemaining >= 0)
@@ -160,15 +160,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
160160

161161
private ValueTask InvokeSingleHardcoded()
162162
{
163-
InvokeNoUnrollHardcoded(1, null);
164-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
163+
return AwaitHelper.ToValueTaskVoid(callback());
165164
}
166165

167166
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
168167
{
169168
repeatsRemaining = repeatCount;
170169
valueTaskSource.Reset();
171-
startedClock = clock?.Start() ?? default;
170+
startedClock = clock.Start();
172171
RunTask();
173172
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
174173
}
@@ -253,15 +252,15 @@ public BenchmarkActionTask(object instance, MethodInfo method, int unrollFactor)
253252

254253
private ValueTask InvokeSingleHardcodedOverhead()
255254
{
256-
InvokeNoUnrollHardcodedOverhead(1, null);
255+
callback();
257256
return new ValueTask();
258257
}
259258

260259
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
261260
{
262261
repeatsRemaining = repeatCount;
263262
Task<T> value = default;
264-
startedClock = clock?.Start() ?? default;
263+
startedClock = clock.Start();
265264
try
266265
{
267266
while (--repeatsRemaining >= 0)
@@ -279,15 +278,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
279278

280279
private ValueTask InvokeSingleHardcoded()
281280
{
282-
InvokeNoUnrollHardcoded(1, null);
283-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
281+
return AwaitHelper.ToValueTaskVoid(callback());
284282
}
285283

286284
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
287285
{
288286
repeatsRemaining = repeatCount;
289287
valueTaskSource.Reset();
290-
startedClock = clock?.Start() ?? default;
288+
startedClock = clock.Start();
291289
RunTask();
292290
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
293291
}
@@ -373,15 +371,15 @@ public BenchmarkActionValueTask(object instance, MethodInfo method, int unrollFa
373371

374372
private ValueTask InvokeSingleHardcodedOverhead()
375373
{
376-
InvokeNoUnrollHardcodedOverhead(1, null);
374+
callback();
377375
return new ValueTask();
378376
}
379377

380378
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
381379
{
382380
repeatsRemaining = repeatCount;
383381
ValueTask value = default;
384-
startedClock = clock?.Start() ?? default;
382+
startedClock = clock.Start();
385383
try
386384
{
387385
while (--repeatsRemaining >= 0)
@@ -399,15 +397,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
399397

400398
private ValueTask InvokeSingleHardcoded()
401399
{
402-
InvokeNoUnrollHardcoded(1, null);
403-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
400+
return AwaitHelper.ToValueTaskVoid(callback());
404401
}
405402

406403
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
407404
{
408405
repeatsRemaining = repeatCount;
409406
valueTaskSource.Reset();
410-
startedClock = clock?.Start() ?? default;
407+
startedClock = clock.Start();
411408
RunTask();
412409
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
413410
}
@@ -492,15 +489,15 @@ public BenchmarkActionValueTask(object instance, MethodInfo method, int unrollFa
492489

493490
private ValueTask InvokeSingleHardcodedOverhead()
494491
{
495-
InvokeNoUnrollHardcodedOverhead(1, null);
492+
callback();
496493
return new ValueTask();
497494
}
498495

499496
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
500497
{
501498
repeatsRemaining = repeatCount;
502499
ValueTask<T> value = default;
503-
startedClock = clock?.Start() ?? default;
500+
startedClock = clock.Start();
504501
try
505502
{
506503
while (--repeatsRemaining >= 0)
@@ -518,15 +515,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
518515

519516
private ValueTask InvokeSingleHardcoded()
520517
{
521-
InvokeNoUnrollHardcoded(1, null);
522-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
518+
return AwaitHelper.ToValueTaskVoid(callback());
523519
}
524520

525521
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
526522
{
527523
repeatsRemaining = repeatCount;
528524
valueTaskSource.Reset();
529-
startedClock = clock?.Start() ?? default;
525+
startedClock = clock.Start();
530526
RunTask();
531527
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
532528
}

src/BenchmarkDotNet/Toolchains/InProcess/BenchmarkActionFactory_Implementations.cs

+16-20
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ public BenchmarkActionTask(object instance, MethodInfo method, BenchmarkActionCo
166166

167167
private ValueTask InvokeSingleHardcodedOverhead()
168168
{
169-
InvokeNoUnrollHardcodedOverhead(1, null);
169+
callback();
170170
return new ValueTask();
171171
}
172172

173173
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
174174
{
175175
repeatsRemaining = repeatCount;
176-
startedClock = clock?.Start() ?? default;
176+
startedClock = clock.Start();
177177
try
178178
{
179179
while (--repeatsRemaining >= 0)
@@ -190,15 +190,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
190190

191191
private ValueTask InvokeSingleHardcoded()
192192
{
193-
InvokeNoUnrollHardcoded(1, null);
194-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
193+
return AwaitHelper.ToValueTaskVoid(callback());
195194
}
196195

197196
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
198197
{
199198
repeatsRemaining = repeatCount;
200199
valueTaskSource.Reset();
201-
startedClock = clock?.Start() ?? default;
200+
startedClock = clock.Start();
202201
RunTask();
203202
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
204203
}
@@ -283,14 +282,14 @@ public BenchmarkActionTask(object instance, MethodInfo method, BenchmarkActionCo
283282

284283
private ValueTask InvokeSingleHardcodedOverhead()
285284
{
286-
InvokeNoUnrollHardcodedOverhead(1, null);
285+
callback();
287286
return new ValueTask();
288287
}
289288

290289
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
291290
{
292291
repeatsRemaining = repeatCount;
293-
startedClock = clock?.Start() ?? default;
292+
startedClock = clock.Start();
294293
try
295294
{
296295
while (--repeatsRemaining >= 0)
@@ -307,15 +306,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
307306

308307
private ValueTask InvokeSingleHardcoded()
309308
{
310-
InvokeNoUnrollHardcoded(1, null);
311-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
309+
return AwaitHelper.ToValueTaskVoid(callback());
312310
}
313311

314312
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
315313
{
316314
repeatsRemaining = repeatCount;
317315
valueTaskSource.Reset();
318-
startedClock = clock?.Start() ?? default;
316+
startedClock = clock.Start();
319317
RunTask();
320318
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
321319
}
@@ -401,14 +399,14 @@ public BenchmarkActionValueTask(object instance, MethodInfo method, BenchmarkAct
401399

402400
private ValueTask InvokeSingleHardcodedOverhead()
403401
{
404-
InvokeNoUnrollHardcodedOverhead(1, null);
402+
callback();
405403
return new ValueTask();
406404
}
407405

408406
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
409407
{
410408
repeatsRemaining = repeatCount;
411-
startedClock = clock?.Start() ?? default;
409+
startedClock = clock.Start();
412410
try
413411
{
414412
while (--repeatsRemaining >= 0)
@@ -425,15 +423,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
425423

426424
private ValueTask InvokeSingleHardcoded()
427425
{
428-
InvokeNoUnrollHardcoded(1, null);
429-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
426+
return AwaitHelper.ToValueTaskVoid(callback());
430427
}
431428

432429
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
433430
{
434431
repeatsRemaining = repeatCount;
435432
valueTaskSource.Reset();
436-
startedClock = clock?.Start() ?? default;
433+
startedClock = clock.Start();
437434
RunTask();
438435
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
439436
}
@@ -518,14 +515,14 @@ public BenchmarkActionValueTask(object instance, MethodInfo method, BenchmarkAct
518515

519516
private ValueTask InvokeSingleHardcodedOverhead()
520517
{
521-
InvokeNoUnrollHardcodedOverhead(1, null);
518+
callback();
522519
return new ValueTask();
523520
}
524521

525522
private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, IClock clock)
526523
{
527524
repeatsRemaining = repeatCount;
528-
startedClock = clock?.Start() ?? default;
525+
startedClock = clock.Start();
529526
try
530527
{
531528
while (--repeatsRemaining >= 0)
@@ -542,15 +539,14 @@ private ValueTask<ClockSpan> InvokeNoUnrollHardcodedOverhead(long repeatCount, I
542539

543540
private ValueTask InvokeSingleHardcoded()
544541
{
545-
InvokeNoUnrollHardcoded(1, null);
546-
return new ValueTask(valueTaskSource, valueTaskSource.Version);
542+
return AwaitHelper.ToValueTaskVoid(callback());
547543
}
548544

549545
private ValueTask<ClockSpan> InvokeNoUnrollHardcoded(long repeatCount, IClock clock)
550546
{
551547
repeatsRemaining = repeatCount;
552548
valueTaskSource.Reset();
553-
startedClock = clock?.Start() ?? default;
549+
startedClock = clock.Start();
554550
RunTask();
555551
return new ValueTask<ClockSpan>(valueTaskSource, valueTaskSource.Version);
556552
}

0 commit comments

Comments
 (0)