Skip to content

Commit e667baa

Browse files
E1ppE1pp
committed
Fix babenko issues of rXXXXXX
[nodiff:caesar] commit_hash:93eef00a7132e68e727aa1f4028616db6522d03c
1 parent ff08899 commit e667baa

File tree

10 files changed

+23
-21
lines changed

10 files changed

+23
-21
lines changed

‎library/cpp/yt/threading/atomic_object-inl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "atomic_object.h"
55
#endif
66

7-
namespace NYT {
7+
namespace NYT::NThreading {
88

99
////////////////////////////////////////////////////////////////////////////////
1010

@@ -94,4 +94,4 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
9494

9595
////////////////////////////////////////////////////////////////////////////////
9696

97-
} // namespace NYT
97+
} // namespace NYT::NThreading

‎library/cpp/yt/threading/atomic_object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <concepts>
66

7-
namespace NYT {
7+
namespace NYT::NThreading {
88

99
////////////////////////////////////////////////////////////////////////////////
1010

@@ -56,7 +56,7 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
5656

5757
////////////////////////////////////////////////////////////////////////////////
5858

59-
} // namespace NYT
59+
} // namespace NYT::NThreading
6060

6161
#define ATOMIC_OBJECT_INL_H_
6262
#include "atomic_object-inl.h"

‎yt/yt/client/api/rpc_proxy/connection_impl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
#include <yt/yt/core/rpc/public.h>
1010

1111
// TODO(prime@): Create HTTP endpoint for discovery that works without authentication.
12-
#include <library/cpp/yt/threading/atomic_object.h>
13-
1412
#include <yt/yt/core/service_discovery/public.h>
1513

1614
#include <yt/yt/core/logging/log.h>
1715

16+
#include <library/cpp/yt/threading/atomic_object.h>
17+
1818
namespace NYT::NApi::NRpcProxy {
1919

2020
////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ class TConnection
7676
NConcurrency::TPeriodicExecutorPtr UpdateProxyListExecutor_;
7777

7878
// TODO(prime@): Create HTTP endpoint for discovery that works without authentication.
79-
TAtomicObject<TString> DiscoveryToken_;
79+
NThreading::TAtomicObject<TString> DiscoveryToken_;
8080

8181
NServiceDiscovery::IServiceDiscoveryPtr ServiceDiscovery_;
8282

‎yt/yt/client/logging/dynamic_table_log_writer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
#include <yt/yt/core/logging/formatter.h>
2525
#include <yt/yt/core/logging/system_log_event_provider.h>
2626

27-
#include <library/cpp/yt/threading/atomic_object.h>
2827
#include <yt/yt/core/misc/proc.h>
2928

3029
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
3130

31+
#include <library/cpp/yt/threading/atomic_object.h>
32+
3233
#include <util/stream/length.h>
3334

3435
namespace NYT::NLogging {

‎yt/yt/core/bus/tcp/connection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include <yt/yt/core/net/address.h>
1717

18-
#include <library/cpp/yt/threading/atomic_object.h>
1918
#include <yt/yt/core/misc/blob.h>
2019
#include <yt/yt/core/misc/mpsc_stack.h>
2120
#include <yt/yt/core/misc/ring_queue.h>
@@ -26,6 +25,7 @@
2625

2726
#include <yt/yt/core/concurrency/pollable_detail.h>
2827

28+
#include <library/cpp/yt/threading/atomic_object.h>
2929
#include <library/cpp/yt/threading/spin_lock.h>
3030

3131
#include <util/network/init.h>
@@ -227,7 +227,7 @@ class TTcpConnection
227227

228228
EMultiplexingBand ActualMultiplexingBand_ = EMultiplexingBand::Default;
229229

230-
TAtomicObject<TError> Error_;
230+
NThreading::TAtomicObject<TError> Error_;
231231

232232
NNet::IAsyncDialerSessionPtr DialerSession_;
233233

‎yt/yt/core/rpc/bus/channel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include <yt/yt/core/concurrency/thread_affinity.h>
2020

2121
#include <yt/yt/core/misc/finally.h>
22-
#include <library/cpp/yt/threading/atomic_object.h>
2322

2423
#include <yt/yt/core/tracing/public.h>
2524

2625
#include <yt/yt_proto/yt/core/rpc/proto/rpc.pb.h>
2726

27+
#include <library/cpp/yt/threading/atomic_object.h>
2828
#include <library/cpp/yt/threading/rw_spin_lock.h>
2929
#include <library/cpp/yt/threading/spin_lock.h>
3030

@@ -178,7 +178,7 @@ class TBusChannel
178178
TEnumIndexedArray<EMultiplexingBand, TBandBucket> Buckets_;
179179

180180
std::atomic<bool> TerminationFlag_ = false;
181-
TAtomicObject<TError> TerminationError_;
181+
NThreading::TAtomicObject<TError> TerminationError_;
182182

183183
TSessionPtr GetOrCreateSession(const TSendOptions& options)
184184
{
@@ -687,7 +687,7 @@ class TBusChannel
687687
std::array<TBucket, BucketCount> RequestBuckets_;
688688

689689
std::atomic<bool> TerminationFlag_ = false;
690-
TAtomicObject<TError> TerminationError_;
690+
NThreading::TAtomicObject<TError> TerminationError_;
691691

692692

693693
TFuture<void> GetBusReadyFuture()

‎yt/yt/core/rpc/per_key_request_queue_provider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TPerKeyRequestQueueProvider
4747

4848
NConcurrency::TSyncMap<TKey, TRequestQueuePtr> RequestQueues_;
4949

50-
TAtomicObject<TRequestQueueThrottlerConfigs> DefaultConfigs_;
50+
NThreading::TAtomicObject<TRequestQueueThrottlerConfigs> DefaultConfigs_;
5151

5252
TKeyFromRequestHeaderCallback KeyFromRequestHeader_;
5353
TReconfigurationCallback ReconfigurationCallback_;

‎yt/yt/core/test_framework/test_proxy_service.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
#include <yt/yt/core/logging/log.h>
1212

13-
#include <library/cpp/yt/threading/atomic_object.h>
14-
1513
#include <yt/yt/core/ytree/attributes.h>
1614

15+
#include <library/cpp/yt/threading/atomic_object.h>
16+
1717
#include <library/cpp/testing/common/network.h>
1818

1919
namespace NYT::NRpc {
@@ -127,7 +127,7 @@ class TTestChannel
127127
TSingleShotCallbackList<void(const TError&)> Terminated_;
128128

129129
std::atomic<bool> TerminationFlag_ = false;
130-
TAtomicObject<TError> TerminationError_;
130+
NThreading::TAtomicObject<TError> TerminationError_;
131131

132132
THashMap<std::pair<TString, TGuid>, TTestBusPtr> RequestToBus_;
133133

‎yt/yt/core/ytree/ypath_service.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
#include <yt/yt/core/concurrency/periodic_executor.h>
2323

2424
#include <yt/yt/core/misc/checksum.h>
25-
#include <library/cpp/yt/threading/atomic_object.h>
2625

2726
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
2827

28+
#include <library/cpp/yt/threading/atomic_object.h>
29+
2930
namespace NYT::NYTree {
3031

3132
////////////////////////////////////////////////////////////////////////////////
@@ -523,7 +524,7 @@ class TYPathServiceToProducerHandler
523524
const IInvokerPtr WorkerInvoker_;
524525
const TDuration UpdatePeriod_;
525526

526-
TAtomicObject<TYsonString> CachedString_ = {BuildYsonStringFluently().Entity()};
527+
NThreading::TAtomicObject<TYsonString> CachedString_ = {BuildYsonStringFluently().Entity()};
527528

528529
void Produce(IYsonConsumer* consumer)
529530
{

‎yt/yt/library/tracing/jaeger/tracer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#include <yt/yt/library/tvm/service/public.h>
1111

1212
#include <yt/yt/core/misc/mpsc_stack.h>
13-
#include <library/cpp/yt/threading/atomic_object.h>
1413

1514
#include <yt/yt/core/rpc/grpc/config.h>
1615

1716
#include <yt/yt/core/ytree/yson_struct.h>
1817

18+
#include <library/cpp/yt/threading/atomic_object.h>
1919
#include <library/cpp/yt/threading/spin_lock.h>
2020

2121
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
@@ -188,7 +188,7 @@ class TJaegerTracer
188188
i64 TotalMemory_ = 0;
189189
i64 TotalSize_ = 0;
190190

191-
TAtomicObject<TPromise<void>> QueueEmptyPromise_ = NewPromise<void>();
191+
NThreading::TAtomicObject<TPromise<void>> QueueEmptyPromise_ = NewPromise<void>();
192192

193193
THashMap<TString, TJaegerChannelManagerPtr> CollectorChannels_;
194194
NRpc::NGrpc::TChannelConfigPtr OpenChannelConfig_;

0 commit comments

Comments
 (0)