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.

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

Replace "Id" with "ID" in Darwin APIs. #22558

Merged

Conversation

bzbarsky-apple
Copy link
Contributor

Fixes #22528

Addresses part of #22420

Issue Being Resolved

Change overview

Renames selectors to have "ID" instead of "Id".

@github-actions
Copy link

github-actions bot commented Sep 12, 2022

PR #22558: Size comparison from 43d7fd2 to f092b1c

Increases (4 builds for bl602, bl702, cc13x2_26x2, esp32)
platform target config section 43d7fd2 f092b1c change % change
bl602 lighting-app bl602 (read/write) 1411822 1411830 8 0.0
.text 1067064 1067066 2 0.0
bl702 lighting-app bl702+rpc (read/write) 1282923 1282939 16 0.0
.debug_info 41718971 41718972 1 0.0
.text 1030032 1030034 2 0.0
cc13x2_26x2 shell LP_CC2652R7 (read only) 667918 667926 8 0.0
.text 581484 581492 8 0.0
esp32 all-clusters-app c3devkit (read/write) 1787654 1787662 8 0.0
.flash.rodata 257208 257216 8 0.0
Decreases (13 builds for bl602, cc13x2_26x2, esp32, nrfconnect, psoc6, qpg, telink)
platform target config section 43d7fd2 f092b1c change % change
bl602 lighting-app bl602+rpc .text 1098670 1098668 -2 -0.0
cc13x2_26x2 shell LP_CC2652R7 (read/write) 179016 179008 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1223522 1223518 -4 -0.0
.flash.text 1223522 1223518 -4 -0.0
m5stack (read/write) 563604 563596 -8 -0.0
.flash.rodata 314328 314320 -8 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 815708 815704 -4 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26738990 26738989 -1 -0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26475613 26475612 -1 -0.0
light cy8ckit_062s2_43012 .debug_info 21937784 21937783 -1 -0.0
lock cy8ckit_062s2_43012 .debug_info 22317568 22317567 -1 -0.0
qpg lighting-app qpg6105+debug (read/write) 1130012 1130004 -8 -0.0
.text 577108 577100 -8 -0.0
telink light-switch-app tlsr9518adk80d text 574348 574346 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 834872 834864 -8 -0.0
text 592478 592476 -2 -0.0
ota-requestor-app tlsr9518adk80d text 598740 598738 -2 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 43d7fd2 f092b1c change % change
bl602 lighting-app bl602 (read/write) 1411822 1411830 8 0.0
.bss 121585 121585 0 0.0
.data 9816 9816 0 0.0
.text 1067064 1067066 2 0.0
bl602+rpc (read/write) 1457282 1457282 0 0.0
.bss 129017 129017 0 0.0
.data 10200 10200 0 0.0
.text 1098670 1098668 -2 -0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1187155 1187155 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 66958 66958 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4272 4272 0 0.0
.debug_abbrev 1499760 1499760 0 0.0
.debug_aranges 133048 133048 0 0.0
.debug_frame 486288 486288 0 0.0
.debug_info 37815371 37815371 0 0.0
.debug_line 5245919 5245919 0 0.0
.debug_loc 3362384 3362384 0 0.0
.debug_ranges 360176 360176 0 0.0
.debug_str 3444963 3444963 0 0.0
.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 115944 115944 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 564298 564298 0 0.0
.symtab 171520 171520 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
956470 956470 0 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1282923 1282939 16 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75006 75006 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4792 4792 0 0.0
.debug_abbrev 1637329 1637329 0 0.0
.debug_aranges 140552 140552 0 0.0
.debug_frame 511664 511664 0 0.0
.debug_info 41718971 41718972 1 0.0
.debug_line 5620333 5620333 0 0.0
.debug_loc 3555115 3555115 0 0.0
.debug_ranges 382632 382632 0 0.0
.debug_str 3840930 3840930 0 0.0
.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 129336 129336 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 623471 623471 0 0.0
.symtab 189328 189328 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030032 1030034 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676883 676883 0 0.0
(read/write) 174540 174540 0 0.0
.bss 74316 74316 0 0.0
.data 3380 3380 0 0.0
.rodata 89395 89395 0 0.0
.text 587176 587176 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641603 641603 0 0.0
(read/write) 157884 157884 0 0.0
.bss 73588 73588 0 0.0
.data 3380 3380 0 0.0
.rodata 78547 78547 0 0.0
.text 562736 562736 0 0.0
lock-ftd LP_CC2652R7 (read only) 678015 678015 0 0.0
(read/write) 163720 163720 0 0.0
.bss 71516 71516 0 0.0
.data 3304 3304 0 0.0
.rodata 77247 77247 0 0.0
.text 600288 600288 0 0.0
lock-mtd LP_CC2652R7 (read only) 660999 660999 0 0.0
(read/write) 176424 176424 0 0.0
.bss 67204 67204 0 0.0
.data 3304 3304 0 0.0
.rodata 102527 102527 0 0.0
.text 557992 557992 0 0.0
pump-app LP_CC2652R7 (read only) 686851 686851 0 0.0
(read/write) 155588 155588 0 0.0
.bss 71452 71452 0 0.0
.data 3296 3296 0 0.0
.rodata 90275 90275 0 0.0
.text 596092 596092 0 0.0
pump-controller-app LP_CC2652R7 (read only) 671343 671343 0 0.0
(read/write) 171208 171208 0 0.0
.bss 71564 71564 0 0.0
.data 3292 3292 0 0.0
.rodata 85831 85831 0 0.0
.text 585032 585032 0 0.0
shell LP_CC2652R7 (read only) 667918 667926 8 0.0
(read/write) 179016 179008 -8 -0.0
.bss 76628 76628 0 0.0
.data 3376 3376 0 0.0
.rodata 86118 86118 0 0.0
.text 581484 581492 8 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587410 587410 0 0.0
.app_xip_area 464068 464068 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) 593162 593162 0 0.0
.app_xip_area 465036 465036 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) 543730 543730 0 0.0
.app_xip_area 425412 425412 0 0.0
.bss 60784 60784 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) 1109992 1109992 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 971568 971568 0 0.0
BRD4161A+rpc (read/write) 973052 973052 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 819936 819936 0 0.0
BRD4161A+rs911x (read/write) 1003432 1003432 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 832180 832180 0 0.0
lock-app BRD4161A+wf200 (read/write) 1150916 1150916 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 996576 996576 0 0.0
window-app BRD4161A (read/write) 1101224 1101224 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 961336 961336 0 0.0
esp32 all-clusters-app c3devkit (read only) 1223522 1223518 -4 -0.0
(read/write) 1787654 1787662 8 0.0
.dram0.bss 76952 76952 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257208 257216 8 0.0
.flash.text 1223522 1223518 -4 -0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1233347 1233347 0 0.0
(read/write) 563604 563596 -8 -0.0
.dram0.bss 82312 82312 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314328 314320 -8 -0.0
.flash.text 1227963 1227963 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 648860 648860 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 573352 573352 0 0.0
lock k32w0+release (read/write) 706048 706048 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 630084 630084 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10333148 10333148 0 0.0
(read/write) 705649 705649 0 0.0
.bss 33937 33937 0 0.0
.data 2856 2856 0 0.0
.data.rel.ro 650024 650024 0 0.0
.dynamic 560 560 0 0.0
.got 13864 13864 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 501420 501420 0 0.0
.text 8178660 8178660 0 0.0
thermostat-no-ble arm64 (read only) 2365844 2365844 0 0.0
(read/write) 141905 141905 0 0.0
.bss 55233 55233 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 76160 76160 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 141452 141452 0 0.0
.text 1986304 1986304 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455224 2455224 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417868 1417868 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182027 1182027 0 0.0
bss 143641 143641 0 0.0
rodata 143740 143740 0 0.0
text 815708 815704 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1161227 1161227 0 0.0
bss 142868 142868 0 0.0
rodata 135332 135332 0 0.0
text 804100 804100 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841960 841960 0 0.0
(read/write) 1744108 1744108 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 1221909 1221909 0 0.0
.debug_aranges 111776 111776 0 0.0
.debug_frame 373172 373172 0 0.0
.debug_info 26738990 26738989 -1 -0.0
.debug_line 3662776 3662776 0 0.0
.debug_loc 3581084 3581084 0 0.0
.debug_ranges 340544 340544 0 0.0
.debug_str 3428755 3428755 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 571099 571099 0 0.0
.symtab 421776 421776 0 0.0
.text 0 0 0 0.0
1544336 1544336 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842696 842696 0 0.0
(read/write) 1687316 1687316 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 1213748 1213748 0 0.0
.debug_aranges 111248 111248 0 0.0
.debug_frame 376252 376252 0 0.0
.debug_info 26475613 26475612 -1 -0.0
.debug_line 3683316 3683316 0 0.0
.debug_loc 3568721 3568721 0 0.0
.debug_ranges 339160 339160 0 0.0
.debug_str 3417760 3417760 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 535573 535573 0 0.0
.symtab 408368 408368 0 0.0
.text 1488280 1488280 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) 1604548 1604548 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 1048567 1048567 0 0.0
.debug_aranges 103424 103424 0 0.0
.debug_frame 346520 346520 0 0.0
.debug_info 21937784 21937783 -1 -0.0
.debug_line 3253745 3253745 0 0.0
.debug_loc 3267015 3267015 0 0.0
.debug_ranges 304632 304632 0 0.0
.debug_str 3223026 3223026 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 468872 468872 0 0.0
.symtab 375456 375456 0 0.0
.text 1413744 1413744 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) 1642236 1642236 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 1056002 1056002 0 0.0
.debug_aranges 104096 104096 0 0.0
.debug_frame 349348 349348 0 0.0
.debug_info 22317568 22317567 -1 -0.0
.debug_line 3262554 3262554 0 0.0
.debug_loc 3306883 3306883 0 0.0
.debug_ranges 307976 307976 0 0.0
.debug_str 3250447 3250447 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 475075 475075 0 0.0
.symtab 378640 378640 0 0.0
.text 1446400 1446400 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1130012 1130004 -8 -0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 577108 577100 -8 -0.0
lock-app qpg6105+debug (read/write) 1101008 1101008 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 548108 548108 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 812960 812960 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 574348 574346 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 834872 834864 -8 -0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 592478 592476 -2 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 843116 843116 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 598740 598738 -2 -0.0

@bzbarsky-apple bzbarsky-apple marked this pull request as draft September 12, 2022 18:29
@bzbarsky-apple bzbarsky-apple marked this pull request as ready for review September 12, 2022 19:23
@bzbarsky-apple bzbarsky-apple merged commit 6a45e43 into project-chip:master Sep 12, 2022
@bzbarsky-apple bzbarsky-apple deleted the darwin-fix-id-naming branch September 12, 2022 20:02
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
bzbarsky-apple added a commit to bzbarsky-apple/connectedhomeip that referenced this pull request Oct 28, 2022
This is a re-landing of PR project-chip#22558 but modified to preserve the old APIs.

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* MTRAttributeCacheContainer+XPC.h is not public API.
* MTRAttributeCacheContainer_Internal.h is not public API.
* MTRDeviceOverXPC.h is not public API.
* MTRDeviceControllerXPCConnection.h is not public API.
* MTRDeviceControllerOverXPC.h is not public API.
* MTRDeviceControllerOverXPC_Internal.h is not public API.
bzbarsky-apple added a commit that referenced this pull request Oct 29, 2022
This is a re-landing of PR #22558 but modified to preserve the old APIs.

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* MTRAttributeCacheContainer+XPC.h is not public API.
* MTRAttributeCacheContainer_Internal.h is not public API.
* MTRDeviceOverXPC.h is not public API.
* MTRDeviceControllerXPCConnection.h is not public API.
* MTRDeviceControllerOverXPC.h is not public API.
* MTRDeviceControllerOverXPC_Internal.h is not public API.
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
This is a re-landing of PR project-chip#22558 but modified to preserve the old APIs.

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* MTRAttributeCacheContainer+XPC.h is not public API.
* MTRAttributeCacheContainer_Internal.h is not public API.
* MTRDeviceOverXPC.h is not public API.
* MTRDeviceControllerXPCConnection.h is not public API.
* MTRDeviceControllerOverXPC.h is not public API.
* MTRDeviceControllerOverXPC_Internal.h is not public API.
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
This is a re-landing of PR project-chip#22558 but modified to preserve the old APIs.

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* MTRAttributeCacheContainer+XPC.h is not public API.
* MTRAttributeCacheContainer_Internal.h is not public API.
* MTRDeviceOverXPC.h is not public API.
* MTRDeviceControllerXPCConnection.h is not public API.
* MTRDeviceControllerOverXPC.h is not public API.
* MTRDeviceControllerOverXPC_Internal.h is not public API.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Platform] Darwin APIs should use "ID", not "Id" in names
3 participants