@@ -284,7 +284,7 @@ void TTaskQueue::UpdateRealResourceUsage(TInstant now)
284
284
285
285
// Find dominant resource consumption and update usage
286
286
auto dom = GetDominantResourceComponentNormalized (QueueLimit.Used );
287
- auto usage = RealResourceUsage + dom * duration.MilliSeconds () / Max ( 1u , Weight);
287
+ auto usage = RealResourceUsage + dom * duration.MilliSeconds () / Max<ui32>( 1 , Weight);
288
288
RealResourceUsage = usage;
289
289
290
290
UsageTimestamp = now;
@@ -305,21 +305,21 @@ void TTaskQueue::UpdatePlannedResourceUsage(TTaskPtr task,
305
305
306
306
auto dom = GetDominantResourceComponentNormalized (task->RequiredResources );
307
307
if (decrease) {
308
- PlannedResourceUsage -= dom * duration.MilliSeconds () / Max ( 1u , Weight);
308
+ PlannedResourceUsage -= dom * duration.MilliSeconds () / Max<ui32>( 1 , Weight);
309
309
PlannedResourceUsage = Max (PlannedResourceUsage, RealResourceUsage);
310
310
} else {
311
311
PlannedResourceUsage = Max (PlannedResourceUsage, RealResourceUsage);
312
- PlannedResourceUsage += dom * duration.MilliSeconds () / Max ( 1u , Weight);
312
+ PlannedResourceUsage += dom * duration.MilliSeconds () / Max<ui32>( 1 , Weight);
313
313
}
314
314
}
315
315
316
316
double TTaskQueue::GetDominantResourceComponentNormalized (const TResourceValues &values)
317
317
{
318
318
std::array<double , RESOURCE_COUNT> norm;
319
319
for (size_t i = 0 ; i < norm.size (); ++i)
320
- norm[i] = (double )QueueLimit.Used [i] / ( double ) Max (1lu , TotalLimit->Limit [i]);
320
+ norm[i] = (double )QueueLimit.Used [i] / Max< double >( 1 , TotalLimit->Limit [i]);
321
321
size_t i = MaxElement (norm.begin (), norm.end ()) - norm.begin ();
322
- return (double )values[i] / ( double ) Max (1lu , TotalLimit->Limit [i]);
322
+ return (double )values[i] / Max< double >( 1 , TotalLimit->Limit [i]);
323
323
}
324
324
325
325
void TTaskQueue::OutputState (IOutputStream &os, const TString &prefix) const
0 commit comments