Skip to content

Commit b5b0c50

Browse files
authored
[ICRDMA] Move iterconnect_address in to separate lib EXT-1068 (#27695)
The NInterconnect::TAddress code is used inside RDMA code. We need to move it in to separate library to prevent cycle dependence interconnect -> rdma -> interconnect
1 parent 529a7d7 commit b5b0c50

File tree

13 files changed

+42
-35
lines changed

13 files changed

+42
-35
lines changed

ydb/core/mind/dynamic_nameserver_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ydb/library/actors/core/actor_bootstrapped.h>
77
#include <ydb/library/actors/interconnect/events_local.h>
88
#include <ydb/library/actors/interconnect/interconnect_impl.h>
9-
#include <ydb/library/actors/interconnect/interconnect_address.h>
9+
#include <ydb/library/actors/interconnect/address/interconnect_address.h>
1010
#include <ydb/core/base/tablet_pipe.h>
1111
#include <ydb/core/cms/console/configs_dispatcher.h>
1212
#include <ydb/core/cms/console/console.h>

ydb/library/actors/interconnect/interconnect_address.cpp renamed to ydb/library/actors/interconnect/address/interconnect_address.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
#endif
2020

2121
namespace NInterconnect {
22-
TAddress::TAddress() {
22+
TAddress::TAddress() noexcept {
2323
memset(&Addr, 0, sizeof(Addr));
2424
}
2525

26-
TAddress::TAddress(NAddr::IRemoteAddr& addr) {
26+
TAddress::TAddress(NAddr::IRemoteAddr& addr) noexcept {
2727
socklen_t len = addr.Len();
2828
Y_ABORT_UNLESS(len <= sizeof(Addr));
2929
memcpy(&Addr.Generic, addr.Addr(), len);
3030
}
3131

32-
int TAddress::GetFamily() const {
32+
int TAddress::GetFamily() const noexcept {
3333
return Addr.Generic.sa_family;
3434
}
3535

36-
socklen_t TAddress::Size() const {
36+
socklen_t TAddress::Size() const noexcept {
3737
switch (Addr.Generic.sa_family) {
3838
case AF_INET6:
3939
return sizeof(sockaddr_in6);
@@ -44,15 +44,15 @@ namespace NInterconnect {
4444
}
4545
}
4646

47-
sockaddr* TAddress::SockAddr() {
47+
sockaddr* TAddress::SockAddr() noexcept {
4848
return &Addr.Generic;
4949
}
5050

51-
const sockaddr* TAddress::SockAddr() const {
51+
const sockaddr* TAddress::SockAddr() const noexcept {
5252
return &Addr.Generic;
5353
}
5454

55-
ui16 TAddress::GetPort() const {
55+
ui16 TAddress::GetPort() const noexcept {
5656
switch (Addr.Generic.sa_family) {
5757
case AF_INET6:
5858
return ntohs(Addr.Ipv6.sin6_port);
@@ -67,7 +67,7 @@ namespace NInterconnect {
6767
return GetAddress() + ":" + ::ToString(GetPort());
6868
}
6969

70-
TAddress::TAddress(const char* addr, ui16 port) {
70+
TAddress::TAddress(const char* addr, ui16 port) noexcept {
7171
memset(&Addr, 0, sizeof(Addr));
7272
if (inet_pton(Addr.Ipv6.sin6_family = AF_INET6, addr, &Addr.Ipv6.sin6_addr) > 0) {
7373
Addr.Ipv6.sin6_port = htons(port);
@@ -76,17 +76,17 @@ namespace NInterconnect {
7676
}
7777
}
7878

79-
TAddress::TAddress(const TString& addr, ui16 port)
79+
TAddress::TAddress(const TString& addr, ui16 port) noexcept
8080
: TAddress(addr.data(), port)
8181
{}
8282

83-
TAddress::TAddress(in_addr addr, ui16 port) {
83+
TAddress::TAddress(in_addr addr, ui16 port) noexcept {
8484
Addr.Ipv4.sin_family = AF_INET;
8585
Addr.Ipv4.sin_port = htons(port);
8686
Addr.Ipv4.sin_addr = addr;
8787
}
8888

89-
TAddress::TAddress(in6_addr addr, ui16 port) {
89+
TAddress::TAddress(in6_addr addr, ui16 port) noexcept {
9090
Addr.Ipv6.sin6_family = AF_INET6;
9191
Addr.Ipv6.sin6_port = htons(port);
9292
Addr.Ipv6.sin6_addr = addr;

ydb/library/actors/interconnect/interconnect_address.h renamed to ydb/library/actors/interconnect/address/interconnect_address.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ namespace NInterconnect {
1515
} Addr;
1616

1717
using TV6Addr = in6_addr;
18-
TAddress();
19-
TAddress(const char* addr, ui16 port);
20-
TAddress(const TString& addr, ui16 port);
21-
TAddress(in_addr addr, ui16 port);
22-
TAddress(in6_addr addr, ui16 port);
23-
TAddress(NAddr::IRemoteAddr& addr);
24-
int GetFamily() const;
25-
socklen_t Size() const;
26-
::sockaddr* SockAddr();
27-
const ::sockaddr* SockAddr() const;
28-
ui16 GetPort() const;
18+
TAddress() noexcept;
19+
TAddress(const char* addr, ui16 port) noexcept;
20+
TAddress(const TString& addr, ui16 port) noexcept;
21+
TAddress(in_addr addr, ui16 port) noexcept;
22+
TAddress(in6_addr addr, ui16 port) noexcept;
23+
TAddress(NAddr::IRemoteAddr& addr) noexcept;
24+
int GetFamily() const noexcept;
25+
socklen_t Size() const noexcept;
26+
::sockaddr* SockAddr() noexcept;
27+
const ::sockaddr* SockAddr() const noexcept;
28+
ui16 GetPort() const noexcept;
2929
TString GetAddress() const;
3030
TString ToString() const;
3131

32-
static TAddress AnyIPv4(ui16 port) {
32+
static TAddress AnyIPv4(ui16 port) noexcept {
3333
TAddress res;
3434
res.Addr.Ipv4.sin_family = AF_INET;
3535
res.Addr.Ipv4.sin_port = htons(port);
3636
res.Addr.Ipv4.sin_addr.s_addr = htonl(INADDR_ANY);
3737
return res;
3838
}
3939

40-
static TAddress AnyIPv6(ui16 port) {
40+
static TAddress AnyIPv6(ui16 port) noexcept {
4141
TAddress res;
4242
res.Addr.Ipv6.sin6_family = AF_INET6;
4343
res.Addr.Ipv6.sin6_port = htons(port);
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
LIBRARY()
2+
3+
SRCS(
4+
interconnect_address.cpp
5+
interconnect_address.h
6+
)
7+
8+
PEERDIR(
9+
contrib/libs/libc_compat
10+
)
11+
12+
END()

ydb/library/actors/interconnect/interconnect_nameserver_base.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "interconnect.h"
22
#include "interconnect_impl.h"
3-
#include "interconnect_address.h"
43
#include "events_local.h"
54

65
#include <ydb/library/actors/core/hfunc.h>

ydb/library/actors/interconnect/interconnect_nameserver_dynamic.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "interconnect.h"
22
#include "interconnect_impl.h"
3-
#include "interconnect_address.h"
43
#include "interconnect_nameserver_base.h"
54
#include "events_local.h"
65

ydb/library/actors/interconnect/interconnect_nameserver_table.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "interconnect.h"
22
#include "interconnect_impl.h"
3-
#include "interconnect_address.h"
43
#include "interconnect_nameserver_base.h"
54
#include "interconnect_stream.h"
65
#include "events_local.h"

ydb/library/actors/interconnect/interconnect_resolve.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "interconnect.h"
2-
#include "interconnect_address.h"
32
#include "events_local.h"
43

54
#include <ydb/library/actors/interconnect/logging/logging.h>

ydb/library/actors/interconnect/interconnect_stream.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
#include <util/network/init.h>
77
#include <util/system/defaults.h>
88

9+
#include <ydb/library/actors/interconnect/address/interconnect_address.h>
910
#include <ydb/library/actors/interconnect/poller/poller.h>
1011

11-
#include "interconnect_address.h"
12-
1312
#include <memory>
1413

1514
#include <sys/uio.h>

ydb/library/actors/interconnect/rdma/ut/rdma_low_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ydb/library/actors/interconnect/rdma/events.h>
77
#include <ydb/library/actors/interconnect/rdma/rdma.h>
88
#include <ydb/library/actors/interconnect/rdma/mem_pool.h>
9-
#include <ydb/library/actors/interconnect/interconnect_address.h>
9+
#include <ydb/library/actors/interconnect/address/interconnect_address.h>
1010
#include <ydb/library/actors/interconnect/poller/poller_actor.h>
1111

1212
#include <library/cpp/testing/gtest/gtest.h>

0 commit comments

Comments
 (0)