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

Remove PluginCallbacks.h header, remove ClientInit callbacks (weak linkage) #23299

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Remove PluginCallbacks.h header, remove ClientInit callbacks (weak linkage) #23299

merged 2 commits into from
Oct 21, 2022

Conversation

andy31415
Copy link
Contributor

  • PluginCallbacks.h header is only included by PluginApplicationCallbacks, so no need as a separate headers
  • All *PluginClientInit callbacks were never used and are remnants from ember logic where client and server clusters are treated differently. For matter we only need the server init.

PR removes the PluginCallbacks template and generation, places the forward declaration of the plugin callbacks in the header defining the init call. It also completely removes the PluginClientInit() calls and __weak__ implementations.

@andy31415
Remove PluginCallbacks generated file.
73881c1 
This file is not really needed by anything except advance
declaration by PluginApplicationCallbachs.h. We can codegen the
callbacks in that file.
@andy31415
Remove ClientInitCallback
f187515
@github-actions
Copy link

github-actions bot commented Oct 21, 2022 •
edited
Loading

PR #23299: Size comparison from 559c7d5 to f187515

Increases (1 build for cyw30739)
platform target config section 559c7d5 f187515 change % change
cyw30739 lock cyw930739m2evb_01 (read/write) 592170 592178 8 0.0
.app_xip_area 463460 463468 8 0.0
Decreases (19 builds for bl602, bl702, cyw30739, k32w, linux, nrfconnect, psoc6, qpg, telink)
platform target config section 559c7d5 f187515 change % change
bl602 lighting-app bl602 .text 1069636 1069634 -2 -0.0
bl602+rpc .text 1100984 1100978 -6 -0.0
bl702 lighting-app bl702 .debug_abbrev 1506980 1506953 -27 -0.0
.debug_aranges 133168 132032 -1136 -0.9
.debug_frame 486752 484480 -2272 -0.5
.debug_info 37909064 37905925 -3139 -0.0
.debug_line 5257986 5253560 -4426 -0.1
.debug_ranges 359568 358432 -1136 -0.3
.debug_str 3458100 3451129 -6971 -0.2
.strtab 565314 565253 -61 -0.0
.symtab 171728 171712 -16 -0.0
bl702+rpc .debug_abbrev 1644525 1644498 -27 -0.0
.debug_aranges 140672 139536 -1136 -0.8
.debug_frame 512124 509852 -2272 -0.4
.debug_info 41815678 41812538 -3140 -0.0
.debug_line 5632517 5628091 -4426 -0.1
.debug_ranges 382024 380888 -1136 -0.3
.debug_str 3854070 3847099 -6971 -0.2
.strtab 624487 624426 -61 -0.0
.symtab 189536 189520 -16 -0.0
.text 1031024 1031022 -2 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588138 588130 -8 -0.0
.app_xip_area 464724 464716 -8 -0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543998 543990 -8 -0.0
.app_xip_area 425664 425656 -8 -0.0
k32w light k32w0+release (read/write) 671528 671512 -16 -0.0
.text 591900 591884 -16 -0.0
linux chip-tool-ipv6only arm64 (read only) 10429700 10429172 -528 -0.0
.text 8255988 8255460 -528 -0.0
thermostat-no-ble arm64 (read only) 2390796 2390780 -16 -0.0
.text 2003408 2003392 -16 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 815888 815884 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1162343 1162327 -16 -0.0
text 803784 803776 -8 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_abbrev 1229489 1229462 -27 -0.0
.debug_aranges 111904 110768 -1136 -1.0
.debug_frame 373628 371356 -2272 -0.6
.debug_info 26837502 2683436 -3139 -0.0
.debug_line 3673331 3669780 -3551 -0.1
.debug_ranges 339704 338568 -1136 -0.3
.debug_str 3441503 3434532 -6971 -0.2
.strtab 569882 569821 -61 -0.0
.symtab 421328 421296 -32 -0.0
all-clusters-minimal cy8ckit_062s2_43012 (read/write) 1688244 1688228 -16 -0.0
.debug_abbrev 1221288 1221261 -27 -0.0
.debug_aranges 111376 110240 -1136 -1.0
.debug_frame 376708 374436 -2272 -0.6
.debug_info 26574284 26571145 -3139 -0.0
.debug_line 3694048 3690489 -3559 -0.1
.debug_ranges 338320 337184 -1136 -0.3
.debug_str 3430516 3423545 -6971 -0.2
.strtab 533971 533910 -61 -0.0
.symtab 407760 407728 -32 -0.0
.text 1489200 1489184 -16 -0.0
light cy8ckit_062s2_43012 .debug_abbrev 1055399 1055372 -27 -0.0
.debug_aranges 103584 102448 -1136 -1.1
.debug_frame 347040 344768 -2272 -0.7
.debug_info 22038008 22034867 -3141 -0.0
.debug_line 3263972 3260421 -3551 -0.1
.debug_ranges 303624 302488 -1136 -0.4
.debug_str 3236048 3229077 -6971 -0.2
.strtab 470348 470287 -61 -0.0
.symtab 376208 376176 -32 -0.0
lock cy8ckit_062s2_43012 (read/write) 1640492 1640476 -16 -0.0
.debug_abbrev 1057338 1057311 -27 -0.0
.debug_aranges 103976 102840 -1136 -1.1
.debug_frame 348896 346624 -2272 -0.7
.debug_info 22271297 22268159 -3138 -0.0
.debug_line 3260937 3257386 -3551 -0.1
.debug_ranges 305560 304424 -1136 -0.4
.debug_str 3255446 3248475 -6971 -0.2
.strtab 472699 472638 -61 -0.0
.symtab 377824 377792 -32 -0.0
.text 1444640 1444624 -16 -0.0
qpg lighting-app qpg6105+debug (read/write) 1148824 1148816 -8 -0.0
.text 595924 595916 -8 -0.0
telink light-switch-app tlsr9518adk80d (read/write) 790300 790268 -32 -0.0
text 553858 553826 -32 -0.0
lighting-app tlsr9518adk80d text 565992 565990 -2 -0.0
ota-requestor-app tlsr9518adk80d text 564864 564858 -6 -0.0
Full report (24 builds for bl602, bl702, cyw30739, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 559c7d5 f187515 change % change
bl602 lighting-app bl602 (read/write) 1390246 1390246 0 0.0
.bss 90745 90745 0 0.0
.data 9928 9928 0 0.0
.text 1069636 1069634 -2 -0.0
bl602+rpc (read/write) 1435462 1435462 0 0.0
.bss 98177 98177 0 0.0
.data 10312 10312 0 0.0
.text 1100984 1100978 -6 -0.0
bl702 lighting-app bl702 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1189219 1189219 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67118 67118 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4272 4272 0 0.0
.debug_abbrev 1506980 1506953 -27 -0.0
.debug_aranges 133168 132032 -1136 -0.9
.debug_frame 486752 484480 -2272 -0.5
.debug_info 37909064 37905925 -3139 -0.0
.debug_line 5257986 5253560 -4426 -0.1
.debug_loc 3367729 3367729 0 0.0
.debug_ranges 359568 358432 -1136 -0.3
.debug_str 3458100 3451129 -6971 -0.2
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116744 116744 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565314 565253 -61 -0.0
.symtab 171728 171712 -16 -0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 957578 957578 0 0.0
bl702+rpc 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1284883 1284883 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75166 75166 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644525 1644498 -27 -0.0
.debug_aranges 140672 139536 -1136 -0.8
.debug_frame 512124 509852 -2272 -0.4
.debug_info 41815678 41812538 -3140 -0.0
.debug_line 5632517 5628091 -4426 -0.1
.debug_loc 3560376 3560376 0 0.0
.debug_ranges 382024 380888 -1136 -0.3
.debug_str 3854070 3847099 -6971 -0.2
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 130136 130136 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624487 624426 -61 -0.0
.symtab 189536 189520 -16 -0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 1031024 1031022 -2 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588138 588130 -8 -0.0
.app_xip_area 464724 464716 -8 -0.0
.bss 65832 65832 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592170 592178 8 0.0
.app_xip_area 463460 463468 8 0.0
.bss 71120 71120 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543998 543990 -8 -0.0
.app_xip_area 425664 425656 -8 -0.0
.bss 60800 60800 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w contact k32w0+release (read/write) 661268 661268 0 0.0
.bss 77040 77040 0 0.0
.data 2104 2104 0 0.0
.text 563012 563012 0 0.0
light k32w0+release (read/write) 671528 671512 -16 -0.0
.bss 74840 74840 0 0.0
.data 2060 2060 0 0.0
.text 591900 591884 -16 -0.0
lock k32w0+release (read/write) 633076 633076 0 0.0
.bss 75600 75600 0 0.0
.data 2080 2080 0 0.0
.text 552668 552668 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10429700 10429172 -528 -0.0
(read/write) 706353 706353 0 0.0
.bss 33953 33953 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650632 650632 0 0.0
.dynamic 560 560 0 0.0
.got 13896 13896 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 518148 518148 0 0.0
.text 8255988 8255460 -528 -0.0
thermostat-no-ble arm64 (read only) 2390796 2390780 -16 -0.0
(read/write) 143633 143633 0 0.0
.bss 55377 55377 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77256 77256 0 0.0
.dynamic 560 560 0 0.0
.got 5176 5176 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144484 144484 0 0.0
.text 2003408 2003392 -16 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2452200 2452200 0 0.0
.bss 215028 215028 0 0.0
.data 5872 5872 0 0.0
.text 1414844 1414844 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1183659 1183659 0 0.0
bss 144457 144457 0 0.0
rodata 144428 144428 0 0.0
text 815888 815884 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1162343 1162327 -16 -0.0
bss 143684 143684 0 0.0
rodata 136000 136000 0 0.0
text 803784 803776 -8 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841952 841952 0 0.0
(read/write) 1745644 1745644 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188728 188728 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 1229489 1229462 -27 -0.0
.debug_aranges 111904 110768 -1136 -1.0
.debug_frame 373628 371356 -2272 -0.6
.debug_info 26837502 2683436 -3139 -0.0
.debug_line 3673331 3669780 -3551 -0.1
.debug_loc 3590250 3590250 0 0.0
.debug_ranges 339704 338568 -1136 -0.3
.debug_str 3441503 3434532 -6971 -0.2
.heap 841952 841952 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 569882 569821 -61 -0.0
.symtab 421328 421296 -32 -0.0
.text 1545864 1545864 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 0 0 0 0.0
(read only) 842688 842688 0 0.0
(read/write) 1688244 1688228 -16 -0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187992 187992 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 1221288 1221261 -27 -0.0
.debug_aranges 111376 110240 -1136 -1.0
.debug_frame 376708 374436 -2272 -0.6
.debug_info 26574284 26571145 -3139 -0.0
.debug_line 3694048 3690489 -3559 -0.1
.debug_loc 3577887 3577887 0 0.0
.debug_ranges 338320 337184 -1136 -0.3
.debug_str 3430516 3423545 -6971 -0.2
.heap 842688 842688 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 533971 533910 -61 -0.0
.symtab 407760 407728 -32 -0.0
.text 1489200 1489184 -16 -0.0
.zero.table 8 8 0 0.0
light cy8ckit_062s2_43012 0 0 0 0.0
(read only) 850872 850872 0 0.0
(read/write) 1606788 1606788 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180016 180016 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 1055399 1055372 -27 -0.0
.debug_aranges 103584 102448 -1136 -1.1
.debug_frame 347040 344768 -2272 -0.7
.debug_info 22038008 22034867 -3141 -0.0
.debug_line 3263972 3260421 -3551 -0.1
.debug_loc 3275848 3275848 0 0.0
.debug_ranges 303624 302488 -1136 -0.4
.debug_str 3236048 3229077 -6971 -0.2
.heap 850872 850872 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 470348 470287 -61 -0.0
.symtab 376208 376176 -32 -0.0
.text 1415928 1415928 0 0.0
.zero.table 8 8 0 0.0
lock cy8ckit_062s2_43012 0 0 0 0.0
(read only) 845880 845880 0 0.0
(read/write) 1640492 1640476 -16 -0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184992 184992 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 1057338 1057311 -27 -0.0
.debug_aranges 103976 102840 -1136 -1.1
.debug_frame 348896 346624 -2272 -0.7
.debug_info 22271297 22268159 -3138 -0.0
.debug_line 3260937 3257386 -3551 -0.1
.debug_loc 3303430 3303430 0 0.0
.debug_ranges 305560 304424 -1136 -0.4
.debug_str 3255446 3248475 -6971 -0.2
.heap 845880 845880 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 472699 472638 -61 -0.0
.symtab 377824 377792 -32 -0.0
.text 1444640 1444624 -16 -0.0
.zero.table 8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1148824 1148816 -8 -0.0
.bss 110580 110580 0 0.0
.data 832 832 0 0.0
.text 595924 595916 -8 -0.0
lock-app qpg6105+debug (read/write) 1113712 1113712 0 0.0
.bss 106372 106372 0 0.0
.data 836 836 0 0.0
.text 560808 560808 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 790300 790268 -32 -0.0
bss 72480 72480 0 0.0
noinit 43520 43520 0 0.0
text 553858 553826 -32 -0.0
lighting-app tlsr9518adk80d (read/write) 805532 805532 0 0.0
bss 73240 73240 0 0.0
noinit 43520 43520 0 0.0
text 565992 565990 -2 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 804416 804416 0 0.0
bss 74052 74052 0 0.0
noinit 43520 43520 0 0.0
text 564864 564858 -6 -0.0

@andy31415 andy31415 merged commit 3c11013 into project-chip:master Oct 21, 2022
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
@andy31415 @adbridge
Remove PluginCallbacks.h header, remove ClientInit callbacks (weak li…
d37e9c0 
…nkage) (project-chip#23299)

* Remove `PluginCallbacks` generated file.

This file is not really needed by anything except advance
declaration by PluginApplicationCallbachs.h. We can codegen the
callbacks in that file.

* Remove ClientInitCallback
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
@andy31415 @adbridge
Remove PluginCallbacks.h header, remove ClientInit callbacks (weak li…
138ec4b 
…nkage) (project-chip#23299)

* Remove `PluginCallbacks` generated file.

This file is not really needed by anything except advance
declaration by PluginApplicationCallbachs.h. We can codegen the
callbacks in that file.

* Remove ClientInitCallback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@selissia selissia selissia 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

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@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

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@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

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@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
review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andy31415 @selissia @bzbarsky-apple