Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ydb/core/kqp/common/simple/reattach.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "reattach.h"

#include <ydb/library/actors/core/actor.h>
#include <ydb/core/base/appdata_fwd.h>
#include <library/cpp/random_provider/random_provider.h>

Expand Down
1 change: 1 addition & 0 deletions ydb/library/actors/actor_type/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ enum class EInternalActorType {
DNS_RESOLVER,
INTERCONNECT_PROXY_WRAPPER,
ACTOR_COROUTINE,
INTERCONNECT_RDMA_CQ,
};

enum class EInternalActorSystemActivity {
Expand Down
1 change: 1 addition & 0 deletions ydb/library/actors/core/events.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace NActors {
ES_YF = 10,
ES_HTTP = 11,
ES_PGWIRE = 12,
ES_INTERCONNECT_RDMA = 13,

ES_USERSPACE = 4096,

Expand Down
25 changes: 25 additions & 0 deletions ydb/library/actors/interconnect/interconnect_address.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,29 @@ namespace NInterconnect {
const char *p = inet_ntop(Addr.Generic.sa_family, const_cast<void*>(src), buffer, size);
return p ? TString(p) : TString();
}

TAddress::TV6Addr TAddress::GetV6CompatAddr() const {
switch (GetFamily()) {
case AF_INET: {
TV6Addr addr;
addr.s6_addr16[0] = 0;
addr.s6_addr16[1] = 0;
addr.s6_addr16[2] = 0;
addr.s6_addr16[3] = 0;
addr.s6_addr16[4] = 0;
addr.s6_addr16[5] = Max<ui16>();
addr.s6_addr16[6] = Max<ui16>();
addr.s6_addr32[3] = Addr.Ipv4.sin_addr.s_addr;
return addr;
}
case AF_INET6:
return Addr.Ipv6.sin6_addr;
default: {
TV6Addr addr;
memset(&addr, 0, sizeof(addr));
return addr;
}
break;
}
}
}
3 changes: 3 additions & 0 deletions ydb/library/actors/interconnect/interconnect_address.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace NInterconnect {
} Addr;

public:
using TV6Addr = in6_addr;
TAddress();
TAddress(const char* addr, ui16 port);
TAddress(const TString& addr, ui16 port);
Expand Down Expand Up @@ -43,5 +44,7 @@ namespace NInterconnect {
res.Addr.Ipv6.sin6_addr = in6addr_any;
return res;
}

TV6Addr GetV6CompatAddr() const;
};
}
1 change: 1 addition & 0 deletions ydb/library/actors/interconnect/interconnect_channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <ydb/library/actors/core/actorsystem.h>
#include <ydb/library/actors/core/event_load.h>
#include <ydb/library/actors/util/rope.h>
#include <ydb/library/actors/interconnect/logging/logging.h>
#include <util/generic/deque.h>
#include <util/generic/vector.h>
#include <util/generic/map.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/actors/interconnect/interconnect_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <ydb/library/actors/core/actorid.h>
#include <ydb/library/actors/core/actorsystem.h>
#include <ydb/library/actors/interconnect/logging/logging.h>
#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
#include <ydb/library/actors/util/datetime.h>
#include <library/cpp/monlib/dynamic_counters/counters.h>
Expand All @@ -10,7 +11,6 @@
#include <util/generic/set.h>
#include <util/system/datetime.h>

#include "logging.h"
#include "event_filter.h"

#include <atomic>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
#include "interconnect_address.h"
#include "interconnect_nameserver_base.h"
#include "events_local.h"
#include "logging.h"

#include <ydb/library/actors/core/hfunc.h>
#include <ydb/library/actors/core/log.h>
#include <ydb/library/actors/interconnect/logging/logging.h>

namespace NActors {

Expand Down
2 changes: 1 addition & 1 deletion ydb/library/actors/interconnect/interconnect_resolve.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "interconnect.h"
#include "interconnect_address.h"
#include "events_local.h"
#include "logging.h"

#include <ydb/library/actors/interconnect/logging/logging.h>
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/hfunc.h>
#include <ydb/library/actors/dnsresolver/dnsresolver.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/actors/interconnect/interconnect_stream.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "interconnect_stream.h"
#include "interconnect_common.h"
#include "logging.h"
#include <util/network/socket.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/pem.h>

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

#if defined(_win_)
Expand Down
1 change: 1 addition & 0 deletions ydb/library/actors/interconnect/interconnect_tcp_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <ydb/library/actors/core/hfunc.h>
#include <ydb/library/actors/core/event_pb.h>
#include <ydb/library/actors/core/events.h>
#include <ydb/library/actors/interconnect/logging/logging.h>
#include <ydb/library/actors/interconnect/poller/poller_actor.h>

#include "interconnect_common.h"
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/actors/interconnect/interconnect_tcp_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <ydb/library/actors/core/event_pb.h>
#include <ydb/library/actors/core/events.h>
#include <ydb/library/actors/core/log.h>
#include <ydb/library/actors/interconnect/logging/logging.h>
#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
#include <ydb/library/actors/interconnect/poller/poller_actor.h>
#include <ydb/library/actors/protos/services_common.pb.h>
Expand All @@ -25,7 +26,6 @@
#include "interconnect_impl.h"
#include "interconnect_zc_processor.h"
#include "interconnect_channel.h"
#include "logging.h"
#include "watchdog_timer.h"
#include "event_holder_pool.h"
#include "channel_scheduler.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "interconnect_zc_processor.h"
#include "logging.h"

#include <ydb/library/actors/core/events.h>
#include <ydb/library/actors/core/hfunc.h>
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/interconnect/logging/logging.h>

#include <variant>

Expand Down
1 change: 1 addition & 0 deletions ydb/library/actors/interconnect/mock/ic_mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <ydb/library/actors/core/actor.h>

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

namespace NActors {

Expand Down
2 changes: 2 additions & 0 deletions ydb/library/actors/interconnect/rdma/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ and allows to get ibv context associated with given ip address.

mem_pool.* - Rdma aware momory pool. Allows to allocate the memory region
registered in the RDMA hardware.

rdma.* - Primitives to perform RDMA ops.
Loading
Loading