Skip to content

Commit 52c2a0b

Browse files
stanislav-shchetininstanislav-shchetinin
authored
Issue #72 - Replace TSharedPtr to std::shared_ptr (#260)
1 parent d2f5ae2 commit 52c2a0b

File tree

41 files changed

+163
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+163
-154
lines changed

‎include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class TMetricRegistryConnector: public NYdb::IExtension {
1616
return p.get();
1717
}
1818

19-
static NMonitoring::IMetricRegistry* ToRawPtr(TAtomicSharedPtr<NMonitoring::IMetricRegistry> p) {
20-
return p.Get();
21-
}
2219

2320
public:
2421
using IApi = NYdb::NSdkStats::IStatApi;
@@ -60,12 +57,4 @@ inline void AddMetricRegistry(NYdb::TDriver& driver, std::shared_ptr<NMonitoring
6057
driver.AddExtension<TConnector>(TConnector::TParams(ptr));
6158
}
6259

63-
inline void AddMetricRegistry(NYdb::TDriver& driver, TAtomicSharedPtr<NMonitoring::IMetricRegistry> ptr) {
64-
if (!ptr)
65-
return;
66-
using TConnector = TMetricRegistryConnector<TAtomicSharedPtr<NMonitoring::IMetricRegistry>>;
67-
68-
driver.AddExtension<TConnector>(TConnector::TParams(ptr));
69-
}
70-
7160
} // namespace NSolomonStatExtension

‎include/ydb-cpp-sdk/library/http/server/http.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class THttpServer {
6262
};
6363

6464
typedef THttpServerOptions TOptions;
65-
typedef TSimpleSharedPtr<IThreadPool> TMtpQueueRef;
65+
typedef std::shared_ptr<IThreadPool> TMtpQueueRef;
6666

6767
THttpServer(ICallBack* cb, const TOptions& options = TOptions(), IThreadFactory* pool = nullptr);
6868
THttpServer(ICallBack* cb, TMtpQueueRef mainWorkers, TMtpQueueRef failWorkers, const TOptions& options = TOptions());

‎include/ydb-cpp-sdk/library/monlib/service/monservice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace NMonitoring {
4242
explicit TMonService2(ui16 port, ui32 threads, const std::string& title = GetProgramName(), THolder<IAuthProvider> auth = nullptr);
4343
explicit TMonService2(ui16 port, const std::string& host, ui32 threads, const std::string& title = GetProgramName(), THolder<IAuthProvider> auth = nullptr);
4444
explicit TMonService2(const THttpServerOptions& options, const std::string& title = GetProgramName(), THolder<IAuthProvider> auth = nullptr);
45-
explicit TMonService2(const THttpServerOptions& options, TSimpleSharedPtr<IThreadPool> pool, const std::string& title = GetProgramName(), THolder<IAuthProvider> auth = nullptr);
45+
explicit TMonService2(const THttpServerOptions& options, std::shared_ptr<IThreadPool> pool, const std::string& title = GetProgramName(), THolder<IAuthProvider> auth = nullptr);
4646

4747
~TMonService2() override {
4848
}

‎include/ydb-cpp-sdk/library/monlib/service/service.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace NMonitoring {
5858
class TMtHttpServer: public THttpServer, private THttpServer::ICallBack {
5959
public:
6060
TMtHttpServer(const TOptions& options, THandler handler, IThreadFactory* pool = nullptr);
61-
TMtHttpServer(const TOptions& options, THandler handler, TSimpleSharedPtr<IThreadPool> pool);
61+
TMtHttpServer(const TOptions& options, THandler handler, std::shared_ptr<IThreadPool> pool);
6262

6363
~TMtHttpServer() override {
6464
Stop();

‎include/ydb-cpp-sdk/util/network/address.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
#include <ydb-cpp-sdk/util/generic/ptr.h>
88

9+
#include <memory>
10+
911
namespace NAddr {
1012
class IRemoteAddr {
1113
public:
@@ -15,8 +17,8 @@ namespace NAddr {
1517
virtual socklen_t Len() const = 0;
1618
};
1719

18-
using IRemoteAddrPtr = THolder<IRemoteAddr>;
19-
using IRemoteAddrRef = TAtomicSharedPtr<NAddr::IRemoteAddr>;
20+
using IRemoteAddrPtr = std::unique_ptr<IRemoteAddr>;
21+
using IRemoteAddrRef = std::shared_ptr<NAddr::IRemoteAddr>;
2022

2123
IRemoteAddrPtr GetSockAddr(SOCKET s);
2224
IRemoteAddrPtr GetPeerAddr(SOCKET s);

‎src/library/cache/thread_safe_cache.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace NPrivate {
1616
template <class Key, class Value, template <class, class> class List, EGettersPromotionPolicy GettersPromotionPolicy, class... TArgs>
1717
class TThreadSafeCache {
1818
public:
19-
using TPtr = TAtomicSharedPtr<Value>;
19+
using TPtr = std::shared_ptr<Value>;
2020

2121
class ICallbacks {
2222
public:
@@ -128,8 +128,8 @@ namespace NPrivate {
128128
if (i != Cache.End()) {
129129
return i.Value();
130130
}
131-
TPtr value = Callbacks.CreateObject(args...);
132-
if (value || AllowNullValues) {
131+
TPtr value = std::shared_ptr<Value>(Callbacks.CreateObject(args...));
132+
if (value || AllowNullValues) {
133133
Cache.Insert(key, value);
134134
}
135135
return value;

‎src/library/containers/paged_vector/paged_vector.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ namespace NPagedVector {
151151
using TPagedVectorBase = std::vector<T, TReboundAllocator<A, T>>;
152152

153153
template <class T, ui32 PageSize, class A>
154-
class TPagedVector: private TPagedVectorBase<TSimpleSharedPtr<TPagedVectorBase<T, A>>, A> {
154+
class TPagedVector: private TPagedVectorBase<std::shared_ptr<TPagedVectorBase<T, A>>, A> {
155155
static_assert(PageSize, "expect PageSize");
156156

157157
using TPage = TPagedVectorBase<T, A>;
158-
using TPages = TPagedVectorBase<TSimpleSharedPtr<TPage>, A>;
158+
using TPages = TPagedVectorBase<std::shared_ptr<TPage>, A>;
159159
using TSelf = TPagedVector<T, PageSize, A>;
160160

161161
public:
@@ -240,7 +240,7 @@ namespace NPagedVector {
240240
}
241241

242242
void AllocateNewPage() {
243-
TPages::push_back(MakeSimpleShared<TPage>());
243+
TPages::push_back(std::make_shared<TPage>());
244244
CurrentPage().reserve(PageSize);
245245
}
246246

‎src/library/coroutine/engine/sockpool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class TSocketPool {
143143
friend class TPooledSocket::TImpl;
144144

145145
public:
146-
typedef TAtomicSharedPtr<NAddr::IRemoteAddr> TAddrRef;
146+
typedef std::shared_ptr<NAddr::IRemoteAddr> TAddrRef;
147147

148148
TSocketPool(int ip, int port)
149149
: Addr_(new NAddr::TIPv4Addr(TIpAddress((ui32)ip, (ui16)port)))

‎src/library/coroutine/listener/listen.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class TContListener::TImpl {
112112
}
113113

114114
inline const IRemoteAddr* Addr() const noexcept {
115-
return Addr_.Get();
115+
return Addr_.get();
116116
}
117117

118118
inline void Stop() noexcept {
@@ -234,23 +234,23 @@ class TContListener::TImpl {
234234

235235
switch (sa.Sa->sa_family) {
236236
case AF_INET:
237-
L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(*sa.In)));
237+
L_.PushBack(new TOneSocketListener(this, std::make_unique<TIPv4Addr>(*sa.In)));
238238
break;
239239
case AF_INET6:
240-
L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv6Addr>(*sa.In6)));
240+
L_.PushBack(new TOneSocketListener(this, std::make_unique<TIPv6Addr>(*sa.In6)));
241241
break;
242242
default:
243243
ythrow yexception() << std::string_view("unknown protocol");
244244
}
245245
}
246246

247247
inline void Bind(const TIpAddress& addr) {
248-
L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(addr)));
248+
L_.PushBack(new TOneSocketListener(this, std::make_unique<TIPv4Addr>(addr)));
249249
}
250250

251251
inline void Bind(const TNetworkAddress& addr) {
252252
for (TNetworkAddress::TIterator it = addr.Begin(); it != addr.End(); ++it) {
253-
L_.PushBack(new TOneSocketListener(this, MakeHolder<TStoredAddrInfo>(&*it, addr)));
253+
L_.PushBack(new TOneSocketListener(this, std::make_unique<TStoredAddrInfo>(&*it, addr)));
254254
}
255255
}
256256

‎src/library/dbg_output/dumpers.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <unordered_map>
1515
#include <unordered_set>
1616

17+
#include <memory>
18+
1719
//smart pointers
1820
template <class T, class D>
1921
struct TDumper<std::unique_ptr<T, D>> {
@@ -39,11 +41,11 @@ struct TDumper<TIntrusivePtr<T, Ops>> {
3941
}
4042
};
4143

42-
template <class T, class C, class D>
43-
struct TDumper<TSharedPtr<T, C, D>> {
44+
template <class T>
45+
struct TDumper<std::shared_ptr<T>> {
4446
template <class S>
45-
static inline void Dump(S& s, const TSharedPtr<T, C, D>& v) {
46-
s << DumpRaw("TSharedPtr(") << v.Get() << DumpRaw(")");
47+
static inline void Dump(S& s, const std::shared_ptr<T>& v) {
48+
s << DumpRaw("std::shared_ptr(") << v.get() << DumpRaw(")");
4749
}
4850
};
4951

‎src/library/getopt/small/completer.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace NLastGetopt::NComp {
100100
};
101101

102102
ICompleterPtr Alternative(std::vector<TAlternative> alternatives) {
103-
return MakeSimpleShared<TAlternativeCompleter>(std::move(alternatives));
103+
return std::make_shared<TAlternativeCompleter>(std::move(alternatives));
104104
}
105105

106106
class TSimpleCompleter: public ICompleter {
@@ -149,73 +149,73 @@ namespace NLastGetopt::NComp {
149149
}}
150150
}
151151
action << "))";
152-
return MakeSimpleShared<TSimpleCompleter>(bash, action);
152+
return std::make_shared<TSimpleCompleter>(bash, action);
153153
}
154154

155155
std::string Compgen(std::string_view flags) {
156156
return TStringBuilder() << "COMPREPLY+=( $(compgen " << flags << " -- ${cur}) )";
157157
}
158158

159159
ICompleterPtr Default() {
160-
return MakeSimpleShared<TSimpleCompleter>("", "_default");
160+
return std::make_shared<TSimpleCompleter>("", "_default");
161161
}
162162

163163
ICompleterPtr File(std::string pattern) {
164164
if (!pattern.empty()) {
165165
pattern = " -g " + SS(pattern);
166166
}
167-
return MakeSimpleShared<TSimpleCompleter>("", "_files" + pattern);
167+
return std::make_shared<TSimpleCompleter>("", "_files" + pattern);
168168
}
169169

170170
ICompleterPtr Directory() {
171-
return MakeSimpleShared<TSimpleCompleter>("", "_files -/");
171+
return std::make_shared<TSimpleCompleter>("", "_files -/");
172172
}
173173

174174
ICompleterPtr Host() {
175-
return MakeSimpleShared<TSimpleCompleter>(Compgen("-A hostname"), "_hosts");
175+
return std::make_shared<TSimpleCompleter>(Compgen("-A hostname"), "_hosts");
176176
}
177177

178178
ICompleterPtr Pid() {
179-
return MakeSimpleShared<TSimpleCompleter>("", "_pids");
179+
return std::make_shared<TSimpleCompleter>("", "_pids");
180180
}
181181

182182
ICompleterPtr User() {
183-
return MakeSimpleShared<TSimpleCompleter>(Compgen("-A user"), "_users");
183+
return std::make_shared<TSimpleCompleter>(Compgen("-A user"), "_users");
184184
}
185185

186186
ICompleterPtr Group() {
187187
// For some reason, OSX freezes when trying to perform completion for groups.
188188
// You can try removing this ifdef and debugging it, but be prepared to force-shutdown your machine
189189
// (and possibly reinstall OSX if force-shutdown breaks anything).
190190
#ifdef _darwin_
191-
return MakeSimpleShared<TSimpleCompleter>("", "");
191+
return std::make_shared<TSimpleCompleter>("", "");
192192
#else
193-
return MakeSimpleShared<TSimpleCompleter>(Compgen("-A group"), "_groups");
193+
return std::make_shared<TSimpleCompleter>(Compgen("-A group"), "_groups");
194194
#endif
195195
}
196196

197197
ICompleterPtr Url() {
198-
return MakeSimpleShared<TSimpleCompleter>("", "_urls");
198+
return std::make_shared<TSimpleCompleter>("", "_urls");
199199
}
200200

201201
ICompleterPtr Tty() {
202-
return MakeSimpleShared<TSimpleCompleter>("", "_ttys");
202+
return std::make_shared<TSimpleCompleter>("", "_ttys");
203203
}
204204

205205
ICompleterPtr NetInterface() {
206-
return MakeSimpleShared<TSimpleCompleter>("", "_net_interfaces");
206+
return std::make_shared<TSimpleCompleter>("", "_net_interfaces");
207207
}
208208

209209
ICompleterPtr TimeZone() {
210-
return MakeSimpleShared<TSimpleCompleter>("", "_time_zone");
210+
return std::make_shared<TSimpleCompleter>("", "_time_zone");
211211
}
212212

213213
ICompleterPtr Signal() {
214-
return MakeSimpleShared<TSimpleCompleter>(Compgen("-A signal"), "_signals");
214+
return std::make_shared<TSimpleCompleter>(Compgen("-A signal"), "_signals");
215215
}
216216

217217
ICompleterPtr Domain() {
218-
return MakeSimpleShared<TSimpleCompleter>("", "_domains");
218+
return std::make_shared<TSimpleCompleter>("", "_domains");
219219
}
220220

221221
namespace {
@@ -311,7 +311,7 @@ namespace NLastGetopt::NComp {
311311
};
312312

313313
ICompleterPtr LaunchSelf(TCustomCompleter& completer) {
314-
return MakeSimpleShared<TLaunchSelf>(&completer);
314+
return std::make_shared<TLaunchSelf>(&completer);
315315
}
316316

317317
class TLaunchSelfMultiPart: public ICompleter {
@@ -360,7 +360,7 @@ namespace NLastGetopt::NComp {
360360
};
361361

362362
ICompleterPtr LaunchSelfMultiPart(TCustomCompleter& completer) {
363-
return MakeSimpleShared<TLaunchSelfMultiPart>(&completer);
363+
return std::make_shared<TLaunchSelfMultiPart>(&completer);
364364
}
365365

366366
#undef I

‎src/library/getopt/small/completer.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include <ydb-cpp-sdk/util/generic/ptr.h>
66

7+
#include <memory>
8+
79
namespace NLastGetopt::NComp {
810
class ICompleter;
911

@@ -41,7 +43,7 @@ namespace NLastGetopt::NComp {
4143
virtual void GenerateZsh(TFormattedOutput& out, TCompleterManager& manager) const = 0;
4244
};
4345

44-
using ICompleterPtr = TSimpleSharedPtr<ICompleter>;
46+
using ICompleterPtr = std::shared_ptr<ICompleter>;
4547

4648
/// Generate default completions.
4749
/// Output of this completer depends on shell settings.

‎src/library/getopt/small/last_getopt_opt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace NLastGetopt {
5353

5454
private:
5555
typedef std::optional<std::string> TdOptVal;
56-
typedef std::vector<TSimpleSharedPtr<IOptHandler>> TOptHandlers;
56+
typedef std::vector<std::shared_ptr<IOptHandler>> TOptHandlers;
5757

5858
public:
5959
bool Hidden_ = false; // is visible in help
@@ -574,7 +574,7 @@ namespace NLastGetopt {
574574

575575
private:
576576
TOpt& HandlerImpl(IOptHandler* handler) {
577-
Handlers_.push_back(handler);
577+
Handlers_.push_back(std::shared_ptr<IOptHandler>(handler));
578578
return *this;
579579
}
580580

0 commit comments

Comments
 (0)