Skip to content

Commit a3f8f09

Browse files
authored
Return smart pointer in MakeHarmonizer (#14749)
1 parent b37adad commit a3f8f09

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

ydb/library/actors/core/cpu_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ namespace NActors {
8686
}
8787

8888
ui64 ts = GetCycleCountFast();
89-
Harmonizer.reset(MakeHarmonizer(ts));
89+
Harmonizer = MakeHarmonizer(ts);
9090
Harmonizer->SetSharedPool(Shared.get());
9191

9292
Executors.Reset(new TAutoPtr<IExecutorPool>[ExecutorPoolCount]);

ydb/library/actors/core/harmonizer/harmonizer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ void THarmonizer::Enable(bool enable) {
398398
IsDisabled = enable;
399399
}
400400

401-
IHarmonizer* MakeHarmonizer(ui64 ts) {
402-
return new THarmonizer(ts);
401+
std::unique_ptr<IHarmonizer> MakeHarmonizer(ui64 ts) {
402+
return std::make_unique<THarmonizer>(ts);
403403
}
404404

405405
TPoolHarmonizerStats THarmonizer::GetPoolStats(i16 poolId) const {

ydb/library/actors/core/harmonizer/harmonizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ namespace NActors {
6464
virtual void SetSharedPool(ISharedPool* pool) = 0;
6565
};
6666

67-
IHarmonizer* MakeHarmonizer(ui64 ts);
67+
std::unique_ptr<IHarmonizer> MakeHarmonizer(ui64 ts);
6868
}

ydb/library/actors/core/ut/actor_ut.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,9 @@ Y_UNIT_TEST_SUITE(TestDecorator) {
494494
setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]);
495495

496496
ui64 ts = GetCycleCountFast();
497-
THolder<IHarmonizer> harmonizer(MakeHarmonizer(ts));
497+
std::unique_ptr<IHarmonizer> harmonizer = MakeHarmonizer(ts);
498498
for (ui32 i = 0; i < setup->ExecutorsCount; ++i) {
499-
setup->Executors[i] = new TBasicExecutorPool(i, 1, 10, "basic", harmonizer.Get());
499+
setup->Executors[i] = new TBasicExecutorPool(i, 1, 10, "basic", harmonizer.get());
500500
harmonizer->AddPool(setup->Executors[i].Get());
501501
}
502502
setup->Scheduler = new TBasicSchedulerThread;
@@ -626,9 +626,9 @@ Y_UNIT_TEST_SUITE(TestAliases) {
626626
setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]);
627627

628628
ui64 ts = GetCycleCountFast();
629-
THolder<IHarmonizer> harmonizer(MakeHarmonizer(ts));
629+
std::unique_ptr<IHarmonizer> harmonizer = MakeHarmonizer(ts);
630630
for (ui32 i = 0; i < setup->ExecutorsCount; ++i) {
631-
setup->Executors[i] = new TBasicExecutorPool(i, 1, 10, "basic", harmonizer.Get());
631+
setup->Executors[i] = new TBasicExecutorPool(i, 1, 10, "basic", harmonizer.get());
632632
harmonizer->AddPool(setup->Executors[i].Get());
633633
}
634634
setup->Scheduler = new TBasicSchedulerThread;

ydb/library/actors/testlib/test_runtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ namespace NActors {
17311731

17321732
IHarmonizer* harmonizer = nullptr;
17331733
if (node) {
1734-
node->Harmonizer.reset(MakeHarmonizer(GetCycleCountFast()));
1734+
node->Harmonizer = MakeHarmonizer(GetCycleCountFast());
17351735
harmonizer = node->Harmonizer.get();
17361736
}
17371737

0 commit comments

Comments
 (0)