Skip to content

Commit 970b791

Browse files
ydbotydbot
committed
Merge pull request #30446 from ydb-platform/merge-rightlib-251210-0938
2 parents 606bfdc + 26c9c0b commit 970b791

File tree

6 files changed

+34
-20
lines changed

6 files changed

+34
-20
lines changed

‎build/mapping.conf.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@
492492
"10480268698": "{registry_endpoint}/10480268698",
493493
"10513052933": "{registry_endpoint}/10513052933",
494494
"10525523763": "{registry_endpoint}/10525523763",
495+
"10539780690": "{registry_endpoint}/10539780690",
495496
"5486713852": "{registry_endpoint}/5486713852",
496497
"5514352253": "{registry_endpoint}/5514352253",
497498
"5523579199": "{registry_endpoint}/5523579199",
@@ -2404,6 +2405,7 @@
24042405
"10480268698": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24052406
"10513052933": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24062407
"10525523763": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2408+
"10539780690": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24072409
"5486713852": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24082410
"5514352253": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24092411
"5523579199": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",

‎build/platform/test_tool/host.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525635539)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539863687)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525632516)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539861627)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525641331)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539867634)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525629982)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539859560)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525638641)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539865894)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525518708)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539776964)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525515972)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539774877)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525523763)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539780690)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525513272)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539772432)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10525521195)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10539778783)
1111

1212
ENDIF()

‎contrib/libs/ibdrv/impl.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,16 @@ int ibv_query_gid(struct ibv_context *context, uint8_t port_num, int index, unio
137137
return Call(IBSym()->ibv_query_gid, context, port_num, index, gid);
138138
}
139139

140+
Y_HIDDEN
141+
int _ibv_query_gid_ex(struct ibv_context *context, uint32_t port_num, uint32_t gid_index, struct ibv_gid_entry *entry, uint32_t flags, size_t entry_size) {
142+
return Call(IBSym()->_ibv_query_gid_ex, context, port_num, gid_index, entry, flags, entry_size);
143+
}
144+
145+
Y_HIDDEN
146+
ssize_t _ibv_query_gid_table(struct ibv_context *context, struct ibv_gid_entry *entries, size_t max_entries, uint32_t flags, size_t entry_size) {
147+
return Call(IBSym()->_ibv_query_gid_table, context, entries, max_entries, flags, entry_size);
148+
}
149+
140150
Y_HIDDEN
141151
int ibv_query_port(struct ibv_context *context, uint8_t port_num, struct _compat_ibv_port_attr *port_attr) {
142152
return Call(IBSym()->ibv_query_port, context, port_num, port_attr);

‎contrib/libs/ibdrv/symbols.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ extern "C" {
6868
M(ibv_port_state_str, const char *(enum ibv_port_state port_state)) \
6969
M(ibv_set_ece, int (struct ibv_qp *qp, struct ibv_ece *ece)) \
7070
M(ibv_query_ece, int (struct ibv_qp *qp, struct ibv_ece *ece)) \
71+
M(_ibv_query_gid_ex, int (struct ibv_context *context, uint32_t port_num, uint32_t gid_index, struct ibv_gid_entry *entry, uint32_t flags, size_t entry_size)) \
72+
M(_ibv_query_gid_table, ssize_t (struct ibv_context *context, struct ibv_gid_entry *entries, size_t max_entries, uint32_t flags, size_t entry_size)) \
7173
// DOVERBS
7274

7375
struct TInfinibandSymbols {

‎ya‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
3939
PLATFORM_MAP = {
4040
"data": {
4141
"win32": {
42-
"md5": "00590f019be8a5d2eb79e69b6b2feefc",
42+
"md5": "b8cc390fd5330e392de606e0c7796314",
4343
"urls": [
44-
f"{REGISTRY_ENDPOINT}/10525637857"
44+
f"{REGISTRY_ENDPOINT}/10539833607"
4545
]
4646
},
4747
"darwin": {
48-
"md5": "836121745b3a614b9e9f6d245f46c013",
48+
"md5": "85f42a7f99b47165775eb478ca2cad66",
4949
"urls": [
50-
f"{REGISTRY_ENDPOINT}/10525635283"
50+
f"{REGISTRY_ENDPOINT}/10539831526"
5151
]
5252
},
5353
"darwin-arm64": {
54-
"md5": "d51a1fa6036a9ee5c681fef45ea85b85",
54+
"md5": "632b5342fbca556c7a3032f77d34bc5c",
5555
"urls": [
56-
f"{REGISTRY_ENDPOINT}/10525632860"
56+
f"{REGISTRY_ENDPOINT}/10539829263"
5757
]
5858
},
5959
"linux-aarch64": {
60-
"md5": "2d5860d83876770bae26c3dcf0cbee47",
60+
"md5": "6dbdfa46978141cc986600f009bf3b5b",
6161
"urls": [
62-
f"{REGISTRY_ENDPOINT}/10525630565"
62+
f"{REGISTRY_ENDPOINT}/10539826590"
6363
]
6464
},
6565
"linux": {
66-
"md5": "11e1c4cd8b90329f5a4bce3a2b704b94",
66+
"md5": "01f1664ff583085e36eb8930b6181e05",
6767
"urls": [
68-
f"{REGISTRY_ENDPOINT}/10525640566"
68+
f"{REGISTRY_ENDPOINT}/10539836789"
6969
]
7070
}
7171
}

0 commit comments

Comments
 (0)