Skip to content

Commit 4bdd600

Browse files
dzaristadzarista
authored
Merge branch 'facebook:main' into meru_configs
2 parents fc5abdd + a935744 commit 4bdd600

File tree

129 files changed

+1592
-1110
lines changed

Some content is hidden

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

129 files changed

+1592
-1110
lines changed

‎build/deps/github_hashes/facebook/fb303-rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 96afd687d4d32b2251fe7ebe98a005d87fc44c40
1+
Subproject commit 4d6086c0bfc4ffc4750857a815db98117efacdc2

‎build/deps/github_hashes/facebook/fbthrift-rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 55c17e62970b66fe770defb77a0489e04d7d99a8
1+
Subproject commit efbd79410d98a2a7e98d320dcc306b8be5ceec9e

‎build/deps/github_hashes/facebook/folly-rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 5aad7b326cf90d1b969de356e0a386ef6ab9fff1
1+
Subproject commit 53faba2ed3d4a7896c968f127efaae11543d10ac

‎build/deps/github_hashes/facebook/wangle-rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit c14c12402c5f3c325707bf26292b5e8f177a7a00
1+
Subproject commit 00169caf56fa956a5c8cf809341ae20094be941e

‎build/deps/github_hashes/facebookincubator/fizz-rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 3a30c30ae6d01a7bfdffee9bf922721bb0f62e7c
1+
Subproject commit e0c841127a526324a46d19404e498cfd00cf5a05

‎cmake/AgentHwBenchmarks.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,19 @@ add_library(hw_system_scale_memory_benchmark
447447
)
448448

449449
target_link_libraries(hw_system_scale_memory_benchmark
450+
fsdb_model
450451
system_scale_test_utils
451452
mono_agent_ensemble
452453
Folly::follybenchmark
453454
)
455+
456+
add_library(hw_clear_interface_counters_phy_benchmark
457+
fboss/agent/hw/benchmarks/HwClearInterfacePhyCountersBenchmark.cpp
458+
)
459+
460+
target_link_libraries(hw_clear_interface_counters_phy_benchmark
461+
config_factory
462+
mono_agent_ensemble
463+
mono_agent_benchmarks
464+
Folly::follybenchmark
465+
)

‎cmake/AgentHwSaiHwTest.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ add_library(agent_hw_test_thrift_handler
169169
fboss/agent/hw/sai/hw_test/HwTestTamUtilsThriftHandler.cpp
170170
fboss/agent/hw/sai/hw_test/HwTestCommonUtilsThriftHandler.cpp
171171
fboss/agent/hw/sai/hw_test/HwTestFlowletUtilsThriftHandler.cpp
172+
fboss/agent/hw/sai/hw_test/HwTestPtpTcUtilsThriftHandler.cpp
172173
)
173174

174175
target_link_libraries(agent_hw_test_thrift_handler

‎cmake/AgentPlatformsCommon.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ target_link_libraries(platform_mapping_utils
3737
wedge400_platform_mapping
3838
wedge400c_platform_mapping
3939
morgan_platform_mapping
40-
cloud_ripper_platform_mapping
4140
meru400biu_platform_mapping
4241
meru400bfu_platform_mapping
4342
montblanc_platform_mapping

‎cmake/AgentPlatformsCommonCloudRipper.cmake

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎cmake/AgentPlatformsSai.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ add_library(sai_platform
2424
fboss/agent/platforms/sai/SaiPlatformPort.cpp
2525
fboss/agent/platforms/sai/SaiPlatformInit.cpp
2626
fboss/agent/platforms/sai/SaiWedge400CPlatform.cpp
27-
fboss/agent/platforms/sai/SaiCloudRipperPlatform.cpp
28-
fboss/agent/platforms/sai/SaiCloudRipperPlatformPort.cpp
2927
fboss/agent/platforms/sai/SaiWedge400CPlatformPort.cpp
3028
fboss/agent/platforms/sai/SaiTajoPlatform.cpp
3129
fboss/agent/platforms/sai/SaiTajoPlatformPort.cpp
@@ -93,7 +91,6 @@ target_link_libraries(sai_platform
9391
morgan_platform_mapping
9492
wedge_led_utils
9593
bcm_yaml_config
96-
cloud_ripper_platform_mapping
9794
meru400biu_platform_mapping
9895
meru400bia_platform_mapping
9996
meru400bfu_platform_mapping

0 commit comments

Comments
 (0)