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

Fix chip-tool storage ifdefs to make more sense. #29388

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Fix chip-tool storage ifdefs to make more sense. #29388

merged 1 commit into from
Sep 22, 2023

Conversation

bzbarsky-apple
Copy link
Contributor

A few fixes here:

  1. CONFIG_USE_LOCAL_STORAGE was being defined to 0 when config_use_local_storage
    was false, but the tests for it use #ifdef, so setting
    config_use_local_storage to false did not work right.
  2. Commands.cpp was using config options from CHIPDeviceConfig.h without
    explicitly including it. It happened to be pulled in by
    KeyValueStoreManager.h, but better to not depend on it.
  3. The UseStorageDirectory bits dependency on CHIP_DISABLE_PLATFORM_KVS was set
    up such that if it was true we ended up with an unused
    PersistedStorage::KeyValueStoreMgrImpl() return value. This got optimized
    out in optimized builds, so things worked, but in debug builds we would get
    link errors.
  4. Several Darwin CI jobs that were trying to build the Debug configuraion
    actually built the Release one, because they did not specify a configuration
    and that defaults to Release.
  5. Remove the unnecessary CHIP_DISABLE_PLATFORM_KVS bits from the Xcode project.

@bzbarsky-apple
Fix chip-tool storage ifdefs to make more sense.
d38491f 
A few fixes here:

1) CONFIG_USE_LOCAL_STORAGE was being defined to 0 when config_use_local_storage
   was false, but the tests for it use #ifdef, so setting
   config_use_local_storage to false did not work right.
2) Commands.cpp was using config options from CHIPDeviceConfig.h without
   explicitly including it.  It happened to be pulled in by
   KeyValueStoreManager.h, but better to not depend on it.
3) The UseStorageDirectory bits dependency on CHIP_DISABLE_PLATFORM_KVS was set
   up such that if it was true we ended up with an unused
   PersistedStorage::KeyValueStoreMgrImpl() return value.  This got optimized
   out in optimized builds, so things worked, but in debug builds we would get
   link errors.
4) Several Darwin CI jobs that were trying to build the Debug configuraion
   actually built the Release one, because they did not specify a configuration
   and that defaults to Release.
5) Remove the unnecessary CHIP_DISABLE_PLATFORM_KVS bits from the Xcode project.
@github-actions
Copy link

github-actions bot commented Sep 21, 2023 •
edited
Loading

PR #29388: Size comparison from 02b8027 to d38491f

Decreases (1 build for esp32)
platform target config section 02b8027 d38491f change % change
esp32 all-clusters-app c3devkit (read only) 1176616 1176614 -2 -0.0
.flash.text 1176616 1176614 -2 -0.0
Full report (49 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg)
platform target config section 02b8027 d38491f change % change
bl602 lighting-app bl602 (read/write) 1367882 1367882 0 0.0
.bss 73070 73070 0 0.0
.data 9360 9360 0 0.0
.text 1062218 1062218 0 0.0
bl602+rpc (read/write) 1414814 1414814 0 0.0
.bss 81094 81094 0 0.0
.data 9720 9720 0 0.0
.text 1093720 1093720 0 0.0
bl702 lighting-app bl702 (read only) 3358 3358 0 0.0
(read/write) 1171371 1171371 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 328 328 0 0.0
.bss 26633 26633 0 0.0
.bss_psram 57552 57552 0 0.0
.comment 48 48 0 0.0
.data 3568 3568 0 0.0
.debug_abbrev 1542029 1542029 0 0.0
.debug_aranges 138368 138368 0 0.0
.debug_frame 507864 507864 0 0.0
.debug_info 41881836 41881836 0 0.0
.debug_line 5419757 5419757 0 0.0
.debug_loc 3515228 3515228 0 0.0
.debug_ranges 369528 369528 0 0.0
.debug_str 3963205 3963205 0 0.0
.hbn 544 544 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 106640 106640 0 0.0
.rsvd 4 4 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 596383 596383 0 0.0
.symtab 177040 177040 0 0.0
.tcm_data 28 28 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
959270 959270 0 0.0
bl702+rpc (read only) 3358 3358 0 0.0
(read/write) 1269667 1269667 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 328 328 0 0.0
.bss 35101 35101 0 0.0
.bss_psram 57536 57536 0 0.0
.comment 48 48 0 0.0
.data 4080 4080 0 0.0
.debug_abbrev 1722943 1722943 0 0.0
.debug_aranges 147088 147088 0 0.0
.debug_frame 537212 537212 0 0.0
.debug_info 47031063 47031063 0 0.0
.debug_line 5837018 5837018 0 0.0
.debug_loc 3720826 3720826 0 0.0
.debug_ranges 396248 396248 0 0.0
.debug_str 4391274 4391274 0 0.0
.hbn 544 544 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 121712 121712 0 0.0
.rsvd 4 4 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 661124 661124 0 0.0
.symtab 196368 196368 0 0.0
.tcm_data 28 28 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
1033002 1033002 0 0.0
bl706-eth (read/write) 1020848 1020848 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 328 328 0 0.0
.bss 25554 25554 0 0.0
.bss_psram 94423 94423 0 0.0
.comment 48 48 0 0.0
.data 3232 3232 0 0.0
.debug_abbrev 1075537 1075537 0 0.0
.debug_aranges 115272 115272 0 0.0
.debug_frame 426872 426872 0 0.0
.debug_info 22631705 22631705 0 0.0
.debug_line 4346410 4346410 0 0.0
.debug_loc 3024259 3024259 0 0.0
.debug_ranges 305432 305432 0 0.0
.debug_str 3542609 3542609 0 0.0
.hbn 184 184 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 152 152 0 0.0
.psram 9 9 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 96288 96288 0 0.0
.rsvd 4 4 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 465150 465150 0 0.0
.symtab 139712 139712 0 0.0
.tcm_data 28 28 0 0.0
.tcmcode 3338 3338 0 0.0
.text 0 0 0 0.0
781016 781016 0 0.0
bl706-wifi (read only) 3870 3870 0 0.0
(read/write) 1183619 1183619 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 328 328 0 0.0
.bss 9949 9949 0 0.0
.bss_psram 95191 95191 0 0.0
.comment 48 48 0 0.0
.data 3552 3552 0 0.0
.debug_abbrev 1169000 1169000 0 0.0
.debug_aranges 119472 119472 0 0.0
.debug_frame 619376 619376 0 0.0
.debug_info 23804241 23804241 0 0.0
.debug_line 4592226 4592226 0 0.0
.debug_loc 3125105 3125105 0 0.0
.debug_ranges 315328 315328 0 0.0
.debug_str 3615020 3615020 0 0.0
.hbn 468 468 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 156 156 0 0.0
.psram 9 9 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 109468 109468 0 0.0
.rsvd 4 4 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 505961 505961 0 0.0
.symtab 152624 152624 0 0.0
.tcm_data 28 28 0 0.0
.tcmcode 3870 3870 0 0.0
.text 0 0 0 0.0
947312 947312 0 0.0
bl702l lighting-app bl702l (read only) 278 278 0 0.0
(read/write) 1150968 1150968 0 0.0
.boot2 292 292 0 0.0
.bss 15956 15956 0 0.0
.bss_psram 77216 77216 0 0.0
.comment 48 48 0 0.0
.data 4512 4512 0 0.0
.debug_abbrev 1536591 1536591 0 0.0
.debug_aranges 133232 133232 0 0.0
.debug_frame 488508 488508 0 0.0
.debug_info 41349305 41349305 0 0.0
.debug_line 5323251 5323251 0 0.0
.debug_loc 3459448 3459448 0 0.0
.debug_ranges 376008 376008 0 0.0
.debug_str 3987915 3987915 0 0.0
.hbn 3244 3244 0 0.0
.hbn_noinit 308 308 0 0.0
.init 408 408 0 0.0
.init_array 144 144 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 100628 100628 0 0.0
.romdata 3224 3224 0 0.0
.rsvd 4 4 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 286 286 0 0.0
.stack 2048 2048 0 0.0
.strtab 598060 598060 0 0.0
.symtab 176512 176512 0 0.0
.tcm_data 692 692 0 0.0
.tcmcode 278 278 0 0.0
.text 0 0 0 0.0
942112 942112 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 737363 737363 0 0.0
(read/write) 166444 166444 0 0.0
.bss 88860 88860 0 0.0
.data 3420 3420 0 0.0
.rodata 84367 84367 0 0.0
.text 652604 652604 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 757499 757499 0 0.0
(read/write) 176700 176700 0 0.0
.bss 99084 99084 0 0.0
.data 3436 3436 0 0.0
.rodata 80023 80023 0 0.0
.text 677088 677088 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 745059 745059 0 0.0
(read/write) 171172 171172 0 0.0
.bss 93556 93556 0 0.0
.data 3436 3436 0 0.0
.rodata 106047 106047 0 0.0
.text 638624 638624 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 695499 695499 0 0.0
(read/write) 165536 165536 0 0.0
.bss 87728 87728 0 0.0
.data 3408 3408 0 0.0
.rodata 80207 80207 0 0.0
.text 614900 614900 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 681091 681091 0 0.0
(read/write) 165676 165676 0 0.0
.bss 87872 87872 0 0.0
.data 3404 3404 0 0.0
.rodata 76039 76039 0 0.0
.text 604660 604660 0 0.0
cc32xx lock CC3235SF_LAUNCHXL (blank) 0 0 0 0.0
(read only) 618794 618794 0 0.0
(read/write) 206900 206900 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 200344 200344 0 0.0
.comment 206 206 0 0.0
.data 1436 1436 0 0.0
.debug_abbrev 929170 929170 0 0.0
.debug_aranges 107384 107384 0 0.0
.debug_frame 363000 363000 0 0.0
.debug_info 20859449 20859449 0 0.0
.debug_line 2771344 2771344 0 0.0
.debug_line_str 513 513 0 0.0
.debug_loc 33340 33340 0 0.0
.debug_loclists 1577920 1577920 0 0.0
.debug_ranges 4984 4984 0 0.0
.debug_rnglists 99372 99372 0 0.0
.debug_str 3384644 3384644 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 106218 106218 0 0.0
.shstrtab 265 265 0 0.0
.stack 2048 2048 0 0.0
.strtab 510977 510977 0 0.0
.symtab 296784 296784 0 0.0
.text 510456 510456 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 554671 554671 0 0.0
.app_xip_area 445865 445865 0 0.0
.bss 63776 63776 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 539463 539463 0 0.0
.app_xip_area 425865 425865 0 0.0
.bss 68544 68544 0 0.0
.data 688 688 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 574639 574639 0 0.0
.app_xip_area 467169 467169 0 0.0
.bss 62512 62512 0 0.0
.data 588 588 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 558447 558447 0 0.0
.app_xip_area 447881 447881 0 0.0
.bss 65512 65512 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 1007924 1007924 0 0.0
.bss 170804 170804 0 0.0
.data 2668 2668 0 0.0
.text 834428 834428 0 0.0
BRD4187C (read/write) 1090148 1090148 0 0.0
.bss 194912 194912 0 0.0
.data 3256 3256 0 0.0
.text 891960 891960 0 0.0
lock-app BRD4161A+wf200 (read/write) 1103528 1103528 0 0.0
.bss 185484 185484 0 0.0
.data 2680 2680 0 0.0
.text 915344 915344 0 0.0
window-app BRD4187C (read/write) 1123480 1123480 0 0.0
.bss 167352 167352 0 0.0
.data 3128 3128 0 0.0
.text 952980 952980 0 0.0
esp32 all-clusters-app c3devkit (read only) 1176616 1176614 -2 -0.0
(read/write) 1702292 1702292 0 0.0
.dram0.bss 77616 77616 0 0.0
.dram0.data 13084 13084 0 0.0
.flash.rodata 268680 268680 0 0.0
.flash.text 1176616 1176614 -2 -0.0
.iram0.text 75244 75244 0 0.0
m5stack (read only) 1217347 1217347 0 0.0
(read/write) 551994 551994 0 0.0
.dram0.bss 84264 84264 0 0.0
.dram0.data 34036 34036 0 0.0
.flash.rodata 300076 300076 0 0.0
.flash.text 1211963 1211963 0 0.0
.iram0.text 123287 123287 0 0.0
k32w contact k32w0+release (read only) 589836 589836 0 0.0
(read/write) 87508 87508 0 0.0
.bss 70760 70760 0 0.0
.data 2124 2124 0 0.0
.text 589300 589300 0 0.0
light k32w0+release (read only) 589644 589644 0 0.0
(read/write) 87184 87184 0 0.0
.bss 70448 70448 0 0.0
.data 2112 2112 0 0.0
.text 589108 589108 0 0.0
lock k32w0+release (read only) 561004 561004 0 0.0
(read/write) 85016 85016 0 0.0
.bss 68336 68336 0 0.0
.data 2056 2056 0 0.0
.text 560468 560468 0 0.0
linux all-clusters-app debug (read only) 5649985 5649985 0 0.0
(read/write) 421016 421016 0 0.0
.bss 130416 130416 0 0.0
.data 3904 3904 0 0.0
.data.rel.ro 279328 279328 0 0.0
.dynamic 624 624 0 0.0
.got 5384 5384 0 0.0
.init 27 27 0 0.0
.init_array 1344 1344 0 0.0
.rodata 332036 332036 0 0.0
.text 4935811 4935811 0 0.0
all-clusters-minimal-app debug (read only) 4924145 4924145 0 0.0
(read/write) 232624 232624 0 0.0
.bss 126480 126480 0 0.0
.data 3744 3744 0 0.0
.data.rel.ro 95280 95280 0 0.0
.dynamic 624 624 0 0.0
.got 5344 5344 0 0.0
.init 27 27 0 0.0
.init_array 1144 1144 0 0.0
.rodata 266392 266392 0 0.0
.text 4426643 4426643 0 0.0
bridge-app debug (read only) 2768913 2768913 0 0.0
(read/write) 133200 133200 0 0.0
.bss 51736 51736 0 0.0
.data 3696 3696 0 0.0
.data.rel.ro 71648 71648 0 0.0
.dynamic 624 624 0 0.0
.got 4640 4640 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 209816 209816 0 0.0
.text 2381331 2381331 0 0.0
chip-tool debug (read only) 10344929 10344929 0 0.0
(read/write) 443032 443032 0 0.0
.bss 93688 93688 0 0.0
.data 4962 4962 0 0.0
.data.rel.ro 337136 337136 0 0.0
.dynamic 624 624 0 0.0
.got 5808 5808 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 384105 384105 0 0.0
.text 9363779 9363779 0 0.0
chip-tool-ipv6only arm64 (read only) 10207332 10207332 0 0.0
(read/write) 505528 505528 0 0.0
.bss 103048 103048 0 0.0
.data 4288 4288 0 0.0
.data.rel.ro 374376 374376 0 0.0
.dynamic 512 512 0 0.0
.got 18368 18368 0 0.0
.init 24 24 0 0.0
.init_array 248 248 0 0.0
.rodata 315984 315984 0 0.0
.text 9125096 9125096 0 0.0
lighting-app debug+rpc+ui (read only) 5250385 5250385 0 0.0
(read/write) 222792 222792 0 0.0
.bss 118160 118160 0 0.0
.data 4400 4400 0 0.0
.data.rel.ro 92640 92640 0 0.0
.dynamic 672 672 0 0.0
.got 5928 5928 0 0.0
.init 27 27 0 0.0
.init_array 944 944 0 0.0
.rodata 332532 332532 0 0.0
.text 4675059 4675059 0 0.0
lock-app debug (read only) 4475065 4475065 0 0.0
(read/write) 203128 203128 0 0.0
.bss 113424 113424 0 0.0
.data 3632 3632 0 0.0
.data.rel.ro 79288 79288 0 0.0
.dynamic 624 624 0 0.0
.got 5264 5264 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 243512 243512 0 0.0
.text 4021939 4021939 0 0.0
ota-provider-app debug (read only) 4127001 4127001 0 0.0
(read/write) 192032 192032 0 0.0
.bss 113568 113568 0 0.0
.data 3904 3904 0 0.0
.data.rel.ro 68656 68656 0 0.0
.dynamic 624 624 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 196664 196664 0 0.0
.text 3739779 3739779 0 0.0
ota-requestor-app debug (read only) 4220033 4220033 0 0.0
(read/write) 196280 196280 0 0.0
.bss 114592 114592 0 0.0
.data 4144 4144 0 0.0
.data.rel.ro 71632 71632 0 0.0
.dynamic 624 624 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 199736 199736 0 0.0
.text 3825411 3825411 0 0.0
shell debug (read only) 3051273 3051273 0 0.0
(read/write) 153712 153712 0 0.0
.bss 61000 61000 0 0.0
.data 784 784 0 0.0
.data.rel.ro 86008 86008 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 1184 1184 0 0.0
.rodata 208640 208640 0 0.0
.text 2667970 2667970 0 0.0
thermostat-no-ble arm64 (read only) 4365420 4365420 0 0.0
(read/write) 242008 242008 0 0.0
.bss 122184 122184 0 0.0
.data 2792 2792 0 0.0
.data.rel.ro 100672 100672 0 0.0
.dynamic 512 512 0 0.0
.got 11896 11896 0 0.0
.init 24 24 0 0.0
.init_array 424 424 0 0.0
.rodata 160924 160924 0 0.0
.text 3869720 3869720 0 0.0
tv-app debug (read only) 5315497 5315497 0 0.0
(read/write) 350696 350696 0 0.0
.bss 241888 241888 0 0.0
.data 5008 5008 0 0.0
.data.rel.ro 96384 96384 0 0.0
.dynamic 624 624 0 0.0
.got 5608 5608 0 0.0
.init 27 27 0 0.0
.init_array 1152 1152 0 0.0
.rodata 265960 265960 0 0.0
.text 4805459 4805459 0 0.0
tv-casting-app debug (read only) 8291257 8291257 0 0.0
(read/write) 211744 211744 0 0.0
.bss 54784 54784 0 0.0
.data 2448 2448 0 0.0
.data.rel.ro 147696 147696 0 0.0
.dynamic 624 624 0 0.0
.got 5080 5080 0 0.0
.init 27 27 0 0.0
.init_array 1080 1080 0 0.0
.rodata 333292 333292 0 0.0
.text 7556499 7556499 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2523080 2523080 0 0.0
.bss 219064 219064 0 0.0
.data 5128 5128 0 0.0
.text 1485764 1485764 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1242068 1242068 0 0.0
bss 155110 155110 0 0.0
rodata 142976 142976 0 0.0
text 865000 865000 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1360672 1360672 0 0.0
bss 140520 140520 0 0.0
rodata 136956 136956 0 0.0
text 792484 792484 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1164496 1164496 0 0.0
bss 154564 154564 0 0.0
rodata 113700 113700 0 0.0
text 817268 817268 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 837512 837512 0 0.0
(read/write) 1797428 1797428 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 193276 193276 0 0.0
.comment 212 212 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 2552 2552 0 0.0
.debug_abbrev 1384953 1384953 0 0.0
.debug_aranges 146096 146096 0 0.0
.debug_frame 485880 485880 0 0.0
.debug_info 33089398 33089398 0 0.0
.debug_line 4204895 4204895 0 0.0
.debug_line_str 957 957 0 0.0
.debug_loclists 2319110 2319110 0 0.0
.debug_rnglists 145113 145113 0 0.0
.debug_str 4554699 4554699 0 0.0
.heap 837512 837512 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 864107 864107 0 0.0
.symtab 519072 519072 0 0.0
.text 0 0 0 0.0
1593212 1593212 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 840168 840168 0 0.0
(read/write) 1684700 1684700 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 190708 190708 0 0.0
.comment 212 212 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 2464 2464 0 0.0
.debug_abbrev 1253766 1253766 0 0.0
.debug_aranges 135816 135816 0 0.0
.debug_frame 456964 456964 0 0.0
.debug_info 28782234 28782234 0 0.0
.debug_line 3912134 3912134 0 0.0
.debug_line_str 981 981 0 0.0
.debug_loclists 2134372 2134372 0 0.0
.debug_rnglists 134570 134570 0 0.0
.debug_str 3940014 3940014 0 0.0
.heap 840168 840168 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 734197 734197 0 0.0
.symtab 472368 472368 0 0.0
.text 1483140 1483140 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 846496 846496 0 0.0
(read/write) 1610396 1610396 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184492 184492 0 0.0
.comment 212 212 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 2352 2352 0 0.0
.debug_abbrev 1094975 1094975 0 0.0
.debug_aranges 125912 125912 0 0.0
.debug_frame 420004 420004 0 0.0
.debug_info 23906923 23906923 0 0.0
.debug_line 3487292 3487292 0 0.0
.debug_line_str 942 942 0 0.0
.debug_loclists 1971131 1971131 0 0.0
.debug_rnglists 124266 124266 0 0.0
.debug_str 3747025 3747025 0 0.0
.heap 846496 846496 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 649547 649547 0 0.0
.symtab 434656 434656 0 0.0
.text 1415164 1415164 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 819232 819232 0 0.0
(read/write) 1641796 1641796 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 211740 211740 0 0.0
.comment 212 212 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 2368 2368 0 0.0
.debug_abbrev 1087115 1087115 0 0.0
.debug_aranges 124568 124568 0 0.0
.debug_frame 415100 415100 0 0.0
.debug_info 23709932 23709932 0 0.0
.debug_line 3437977 3437977 0 0.0
.debug_line_str 933 933 0 0.0
.debug_loclists 1946418 1946418 0 0.0
.debug_rnglists 122222 122222 0 0.0
.debug_str 3709103 3709103 0 0.0
.heap 819232 819232 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 622672 622672 0 0.0
.symtab 425872 425872 0 0.0
.text 1419300 1419300 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1177672 1177672 0 0.0
.bss 100616 100616 0 0.0
.data 740 740 0 0.0
.text 624512 624512 0 0.0
lock-app qpg6105+debug (read/write) 1133896 1133896 0 0.0
.bss 95320 95320 0 0.0
.data 744 744 0 0.0
.text 580740 580740 0 0.0

@mergify mergify bot merged commit 55607f4 into project-chip:master Sep 22, 2023
52 checks passed
@bzbarsky-apple bzbarsky-apple deleted the fix-chip-tool-ifdefs branch September 22, 2023 14:58
HunsupJung pushed a commit to HunsupJung/connectedhomeip that referenced this pull request Oct 23, 2023
@bzbarsky-apple @HunsupJung
Fix chip-tool storage ifdefs to make more sense. (project-chip#29388)
55b1325 
A few fixes here:

1) CONFIG_USE_LOCAL_STORAGE was being defined to 0 when config_use_local_storage
   was false, but the tests for it use #ifdef, so setting
   config_use_local_storage to false did not work right.
2) Commands.cpp was using config options from CHIPDeviceConfig.h without
   explicitly including it.  It happened to be pulled in by
   KeyValueStoreManager.h, but better to not depend on it.
3) The UseStorageDirectory bits dependency on CHIP_DISABLE_PLATFORM_KVS was set
   up such that if it was true we ended up with an unused
   PersistedStorage::KeyValueStoreMgrImpl() return value.  This got optimized
   out in optimized builds, so things worked, but in debug builds we would get
   link errors.
4) Several Darwin CI jobs that were trying to build the Debug configuraion
   actually built the Release one, because they did not specify a configuration
   and that defaults to Release.
5) Remove the unnecessary CHIP_DISABLE_PLATFORM_KVS bits from the Xcode project.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woody-apple woody-apple woody-apple approved these changes

@krypton36 krypton36 krypton36 approved these changes

@andy31415 andy31415 andy31415 approved these changes

@andyg-apple andyg-apple Awaiting requested review from andyg-apple

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

@arkq arkq Awaiting requested review from arkq

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

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@cliffamzn cliffamzn Awaiting requested review from cliffamzn

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

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@gjc13 gjc13 Awaiting requested review from gjc13

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

@hawk248 hawk248 Awaiting requested review from hawk248

@hicklin hicklin Awaiting requested review from hicklin

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

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

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@joonhaengHeo joonhaengHeo Awaiting requested review from joonhaengHeo

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

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mhazley mhazley Awaiting requested review from mhazley

@mkardous-silabs mkardous-silabs Awaiting requested review from mkardous-silabs

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

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@mspang mspang Awaiting requested review from mspang

@nivi-apple nivi-apple Awaiting requested review from nivi-apple

@p0fi p0fi Awaiting requested review from p0fi

@plauric plauric Awaiting requested review from plauric

@rcasallas-silabs rcasallas-silabs Awaiting requested review from rcasallas-silabs

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@sharadb-amazon sharadb-amazon Awaiting requested review from sharadb-amazon

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tima-q tima-q Awaiting requested review from tima-q

@tobiasgraf tobiasgraf Awaiting requested review from tobiasgraf

@turon turon Awaiting requested review from turon

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

@younghak-hwang younghak-hwang Awaiting requested review from younghak-hwang

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
review - approved
Projects
[Platform] Darwin
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bzbarsky-apple @andy31415 @krypton36 @woody-apple