Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move identical parts of SubscriptionCallback into a shared base class. #22340

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Move identical parts of SubscriptionCallback into a shared base class. #22340

merged 1 commit into from
Sep 1, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

Fixes #22322

Problem

Two near-identical classes that require some work to be done twice.

Change overview

Create a shared base class.

Testing

No behavior changes; pure refactoring.

@github-actions
Copy link

github-actions bot commented Sep 1, 2022 •
edited
Loading

PR #22340: Size comparison from f16c2a5 to 9c99d1a

Increases (7 builds for bl602, psoc6, qpg, telink)
platform target config section f16c2a5 9c99d1a change % change
bl602 lighting-app bl602 .text 1052328 1052332 4 0.0
bl602+rpc .text 1084088 1084092 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26708617 26708619 2 0.0
lock cy8ckit_062s2_43012 .debug_info 22287269 22287271 2 0.0
qpg lock-app qpg6105+debug (read/write) 1100088 1100096 8 0.0
.text 547188 547196 8 0.0
telink light-switch-app tlsr9518adk80d text 571354 571356 2 0.0
lighting-app tlsr9518adk80d text 589478 589480 2 0.0
Decreases (4 builds for esp32, psoc6, qpg)
platform target config section f16c2a5 9c99d1a change % change
esp32 all-clusters-app c3devkit (read only) 1033786 1033782 -4 -0.0
.flash.text 1033786 1033782 -4 -0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26445241 26445240 -1 -0.0
light cy8ckit_062s2_43012 .debug_info 21907523 21907522 -1 -0.0
qpg lighting-app qpg6105+debug (read/write) 1129092 1129084 -8 -0.0
.text 576188 576180 -8 -0.0
Full report (45 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section f16c2a5 9c99d1a change % change
bl602 lighting-app bl602 (read/write) 1385950 1385950 0 0.0
.bss 120298 120298 0 0.0
.data 4488 4488 0 0.0
.text 1052328 1052332 4 0.0
bl602+rpc (read/write) 1431598 1431598 0 0.0
.bss 127730 127730 0 0.0
.data 4600 4600 0 0.0
.text 1084088 1084092 4 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 675287 675287 0 0.0
(read/write) 176120 176120 0 0.0
.bss 74300 74300 0 0.0
.data 3380 3380 0 0.0
.rodata 89231 89231 0 0.0
.text 585744 585744 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 639991 639991 0 0.0
(read/write) 157868 157868 0 0.0
.bss 73572 73572 0 0.0
.data 3380 3380 0 0.0
.rodata 78375 78375 0 0.0
.text 561296 561296 0 0.0
lock-ftd LP_CC2652R7 (read only) 676339 676339 0 0.0
(read/write) 165380 165380 0 0.0
.bss 71500 71500 0 0.0
.data 3304 3304 0 0.0
.rodata 77075 77075 0 0.0
.text 598784 598784 0 0.0
lock-mtd LP_CC2652R7 (read only) 659307 659307 0 0.0
(read/write) 178100 178100 0 0.0
.bss 67188 67188 0 0.0
.data 3304 3304 0 0.0
.rodata 102339 102339 0 0.0
.text 556488 556488 0 0.0
pump-app LP_CC2652R7 (read only) 684991 684991 0 0.0
(read/write) 157432 157432 0 0.0
.bss 71436 71436 0 0.0
.data 3296 3296 0 0.0
.rodata 89951 89951 0 0.0
.text 594556 594556 0 0.0
pump-controller-app LP_CC2652R7 (read only) 669491 669491 0 0.0
(read/write) 173044 173044 0 0.0
.bss 71548 71548 0 0.0
.data 3292 3292 0 0.0
.rodata 85507 85507 0 0.0
.text 583504 583504 0 0.0
shell LP_CC2652R7 (read only) 665930 665930 0 0.0
(read/write) 180996 180996 0 0.0
.bss 76620 76620 0 0.0
.data 3376 3376 0 0.0
.rodata 85786 85786 0 0.0
.text 579828 579828 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586794 586794 0 0.0
.app_xip_area 463452 463452 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592546 592546 0 0.0
.app_xip_area 464420 464420 0 0.0
.bss 70560 70560 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599578 599578 0 0.0
.app_xip_area 476956 476956 0 0.0
.bss 65088 65088 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1108032 1108032 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 969608 969608 0 0.0
BRD4161A+rpc (read/write) 971908 971908 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 818792 818792 0 0.0
BRD4161A+rs911x (read/write) 1001724 1001724 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 830472 830472 0 0.0
lock-app BRD4161A+wf200 (read/write) 1150024 1150024 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 995684 995684 0 0.0
window-app BRD4161A (read/write) 1099288 1099288 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 959400 959400 0 0.0
esp32 all-clusters-app c3devkit (read only) 1033786 1033782 -4 -0.0
(read/write) 1493518 1493518 0 0.0
.dram0.bss 71120 71120 0 0.0
.dram0.data 13696 13696 0 0.0
.flash.rodata 218032 218032 0 0.0
.flash.text 1033786 1033782 -4 -0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1086103 1086103 0 0.0
(read/write) 490804 490804 0 0.0
.dram0.bss 76640 76640 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 247344 247344 0 0.0
.flash.text 1080719 1080719 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 648124 648124 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 572616 572616 0 0.0
lock k32w0+release (read/write) 705128 705128 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 629164 629164 0 0.0
linux all-clusters-app debug (read only) 3044009 3044009 0 0.0
(read/write) 156032 156032 0 0.0
.bss 61792 61792 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 85768 85768 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1176 1176 0 0.0
.rodata 275307 275307 0 0.0
.text 2589266 2589266 0 0.0
all-clusters-minimal-app debug (read only) 2879809 2879809 0 0.0
(read/write) 147632 147632 0 0.0
.bss 61024 61024 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 78264 78264 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 275467 275467 0 0.0
.text 2427682 2427682 0 0.0
bridge-app debug+rpc (read only) 2378089 2378089 0 0.0
(read/write) 127752 127752 0 0.0
.bss 50656 50656 0 0.0
.data 3600 3600 0 0.0
.data.rel.ro 67640 67640 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 832 832 0 0.0
.rodata 204168 204168 0 0.0
.text 2011010 2011010 0 0.0
chip-tool debug (read only) 10909833 10909833 0 0.0
(read/write) 657320 657320 0 0.0
.bss 25240 25240 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 622288 622288 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 564245 564245 0 0.0
.text 8824772 8824772 0 0.0
chip-tool-ipv6only arm64 (read only) 10290436 10290436 0 0.0
(read/write) 705169 705169 0 0.0
.bss 33297 33297 0 0.0
.data 3280 3280 0 0.0
.data.rel.ro 649784 649784 0 0.0
.dynamic 560 560 0 0.0
.got 13840 13840 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 494708 494708 0 0.0
.text 8143316 8143316 0 0.0
lighting-app debug+rpc (read only) 2603001 2603001 0 0.0
(read/write) 130536 130536 0 0.0
.bss 49792 49792 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72680 72680 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 221008 221008 0 0.0
.text 2210802 2210802 0 0.0
lock-app debug (read only) 2585969 2585969 0 0.0
(read/write) 125712 125712 0 0.0
.bss 48288 48288 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69688 69688 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 238000 238000 0 0.0
.text 2181026 2181026 0 0.0
ota-provider-app debug (read only) 2363225 2363225 0 0.0
(read/write) 119144 119144 0 0.0
.bss 47808 47808 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63512 63512 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 209976 209976 0 0.0
.text 1989490 1989490 0 0.0
ota-requestor-app debug (read only) 2528473 2528473 0 0.0
(read/write) 127552 127552 0 0.0
.bss 50368 50368 0 0.0
.data 2304 2304 0 0.0
.data.rel.ro 68920 68920 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 856 856 0 0.0
.rodata 216704 216704 0 0.0
.text 2138866 2138866 0 0.0
shell debug (read only) 2612313 2612313 0 0.0
(read/write) 142184 142184 0 0.0
.bss 57704 57704 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77376 77376 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 235410 235410 0 0.0
.text 2218194 2218194 0 0.0
thermostat-no-ble arm64 (read only) 2361988 2361988 0 0.0
(read/write) 141857 141857 0 0.0
.bss 55233 55233 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 76112 76112 0 0.0
.dynamic 560 560 0 0.0
.got 5056 5056 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141276 141276 0 0.0
.text 1982672 1982672 0 0.0
tv-app debug (read only) 3190425 3190425 0 0.0
(read/write) 258040 258040 0 0.0
.bss 167352 167352 0 0.0
.data 4752 4752 0 0.0
.data.rel.ro 79368 79368 0 0.0
.dynamic 608 608 0 0.0
.got 4856 4856 0 0.0
.init 27 27 0 0.0
.init_array 1080 1080 0 0.0
.rodata 259976 259976 0 0.0
.text 2740418 2740418 0 0.0
tv-casting-app debug (read only) 5508865 5508865 0 0.0
(read/write) 160536 160536 0 0.0
.bss 51352 51352 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 100304 100304 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 344913 344913 0 0.0
.text 4892050 4892050 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2454936 2454936 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417580 1417580 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1180851 1180851 0 0.0
bss 143641 143641 0 0.0
rodata 143380 143380 0 0.0
text 814884 814884 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160031 1160031 0 0.0
bss 142868 142868 0 0.0
rodata 134968 134968 0 0.0
text 803276 803276 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841960 841960 0 0.0
(read/write) 1742252 1742252 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188720 188720 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1221450 1221450 0 0.0
.debug_aranges 111712 111712 0 0.0
.debug_frame 372900 372900 0 0.0
.debug_info 26708617 26708619 2 0.0
.debug_line 3655730 3655730 0 0.0
.debug_loc 3569749 3569749 0 0.0
.debug_ranges 337616 337616 0 0.0
.debug_str 3426920 3426920 0 0.0
.heap 841960 841960 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 570576 570576 0 0.0
.symtab 421488 421488 0 0.0
.text 1542480 1542480 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842696 842696 0 0.0
(read/write) 1685452 1685452 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187984 187984 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1213289 1213289 0 0.0
.debug_aranges 111184 111184 0 0.0
.debug_frame 375980 375980 0 0.0
.debug_info 26445241 26445240 -1 -0.0
.debug_line 3676246 3676246 0 0.0
.debug_loc 3557386 3557386 0 0.0
.debug_ranges 336232 336232 0 0.0
.debug_str 3415925 3415925 0 0.0
.heap 842696 842696 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 535050 535050 0 0.0
.symtab 408080 408080 0 0.0
.text 1486416 1486416 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850928 850928 0 0.0
(read/write) 1602716 1602716 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179960 179960 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1048108 1048108 0 0.0
.debug_aranges 103360 103360 0 0.0
.debug_frame 346248 346248 0 0.0
.debug_info 21907523 21907522 -1 -0.0
.debug_line 3246711 3246711 0 0.0
.debug_loc 3255729 3255729 0 0.0
.debug_ranges 301704 301704 0 0.0
.debug_str 3221145 3221145 0 0.0
.heap 850928 850928 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 468349 468349 0 0.0
.symtab 375168 375168 0 0.0
.text 1411912 1411912 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1640412 1640412 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1055543 1055543 0 0.0
.debug_aranges 104032 104032 0 0.0
.debug_frame 349076 349076 0 0.0
.debug_info 22287269 22287271 2 0.0
.debug_line 3255532 3255532 0 0.0
.debug_loc 3295582 3295582 0 0.0
.debug_ranges 305048 305048 0 0.0
.debug_str 3248566 3248566 0 0.0
.heap 845896 845896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474564 474564 0 0.0
.symtab 378352 378352 0 0.0
.text 1444576 1444576 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1129092 1129084 -8 -0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 576188 576180 -8 -0.0
lock-app qpg6105+debug (read/write) 1100088 1100096 8 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 547188 547196 8 0.0
telink light-switch-app tlsr9518adk80d (read/write) 808752 808752 0 0.0
bss 71344 71344 0 0.0
noinit 43488 43488 0 0.0
text 571354 571356 2 0.0
lighting-app tlsr9518adk80d (read/write) 830668 830668 0 0.0
bss 72200 72200 0 0.0
noinit 43488 43488 0 0.0
text 589478 589480 2 0.0

@bzbarsky-apple bzbarsky-apple merged commit b628eef into project-chip:master Sep 1, 2022
@bzbarsky-apple bzbarsky-apple deleted the darwin-subscription-callback branch September 1, 2022 19:15
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
@bzbarsky-apple @isiu-apple
Move identical parts of SubscriptionCallback into a shared base class. (
e6da934 
project-chip#22340)

Fixes project-chip#22322
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtung-apple jtung-apple jtung-apple approved these changes

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
darwin review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Combine the nearly identical SubscriptionCallback implementations on Darwin
3 participants
@bzbarsky-apple @andy31415 @jtung-apple