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

Fix management of mRunScheduled state in reporting engine. #20694

Merged
merged 1 commit into from
Jul 15, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

Without this change, we can schedule a reporting run, then do a sync
Run (due to urgent events), then (unnecessarily) schedule another
reporting run.

Problem

See above.

Change overview

Make sure to unset our "run scheduled" boolean only when we actually call the async callback.

Testing

Verified that this fixes the test from #20692 on the SHA where that test crashes.

Without this change, we can schedule a reporting run, then do a sync
Run (due to urgent events), then (unnecessarily) schedule another
reporting run.
@github-actions
Copy link

github-actions bot commented Jul 13, 2022

PR #20694: Size comparison from aa2f050 to 97c5a96

Increases (7 builds for cc13x2_26x2, efr32, esp32, nrfconnect)
platform target config section aa2f050 97c5a96 change % change
cc13x2_26x2 pump-app LP_CC2652R7 (read only) 678431 678439 8 0.0
.text 589244 589252 8 0.0
pump-controller-app LP_CC2652R7 (read only) 664247 664255 8 0.0
.text 579200 579208 8 0.0
efr32 lock-app BRD4161A+wf200 (read/write) 1129096 1129112 16 0.0
.text 982828 982844 16 0.0
esp32 all-clusters-app c3devkit (read only) 1020154 1020156 2 0.0
.flash.text 1020154 1020156 2 0.0
m5stack (read only) 1074031 1074035 4 0.0
.flash.text 1068647 1068651 4 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 811544 811548 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 text 800988 800992 4 0.0
Decreases (6 builds for bl602, cc13x2_26x2, telink)
platform target config section aa2f050 97c5a96 change % change
bl602 lighting-app bl602 .text 1058640 1058636 -4 -0.0
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 632083 632075 -8 -0.0
.text 554380 554372 -8 -0.0
pump-app LP_CC2652R7 (read/write) 163784 163776 -8 -0.0
pump-controller-app LP_CC2652R7 (read/write) 178088 178080 -8 -0.0
telink light-switch-app tlsr9518adk80d text 565736 565732 -4 -0.0
lighting-app tlsr9518adk80d (read/write) 817372 817364 -8 -0.0
text 582058 582056 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section aa2f050 97c5a96 change % change
bl602 lighting-app bl602 (read/write) 1397634 1397634 0 0.0
.bss 116978 116978 0 0.0
.data 4480 4480 0 0.0
.text 1058640 1058636 -4 -0.0
bl602+rpc (read/write) 1443066 1443066 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1090324 1090324 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 666275 666275 0 0.0
(read/write) 184948 184948 0 0.0
.bss 74116 74116 0 0.0
.data 3356 3356 0 0.0
.rodata 88139 88139 0 0.0
.text 577820 577820 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 632083 632075 -8 -0.0
(read/write) 157684 157684 0 0.0
.bss 73412 73412 0 0.0
.data 3356 3356 0 0.0
.rodata 77379 77379 0 0.0
.text 554380 554372 -8 -0.0
lock-ftd LP_CC2652R7 (read only) 669183 669183 0 0.0
(read/write) 172184 172184 0 0.0
.bss 71148 71148 0 0.0
.data 3280 3280 0 0.0
.rodata 76279 76279 0 0.0
.text 592424 592424 0 0.0
lock-mtd LP_CC2652R7 (read only) 618591 618591 0 0.0
(read/write) 144264 144264 0 0.0
.bss 66868 66868 0 0.0
.data 3280 3280 0 0.0
.rodata 76159 76159 0 0.0
.text 541944 541944 0 0.0
pump-app LP_CC2652R7 (read only) 678431 678439 8 0.0
(read/write) 163784 163776 -8 -0.0
.bss 71228 71228 0 0.0
.data 3280 3280 0 0.0
.rodata 88703 88703 0 0.0
.text 589244 589252 8 0.0
pump-controller-app LP_CC2652R7 (read only) 664247 664255 8 0.0
(read/write) 178088 178080 -8 -0.0
.bss 71348 71348 0 0.0
.data 3276 3276 0 0.0
.rodata 84567 84567 0 0.0
.text 579200 579208 8 0.0
shell LP_CC2652R7 (read only) 658774 658774 0 0.0
(read/write) 187952 187952 0 0.0
.bss 76420 76420 0 0.0
.data 3360 3360 0 0.0
.rodata 84918 84918 0 0.0
.text 573540 573540 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579622 579622 0 0.0
.app_xip_area 458376 458376 0 0.0
.bss 64184 64184 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 585574 585574 0 0.0
.app_xip_area 459600 459600 0 0.0
.bss 68912 68912 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 583018 583018 0 0.0
.app_xip_area 462620 462620 0 0.0
.bss 63392 63392 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1081700 1081700 0 0.0
.bss 132996 132996 0 0.0
.data 2048 2048 0 0.0
.text 946636 946636 0 0.0
BRD4161A+rpc (read/write) 1136012 1136012 0 0.0
.bss 149676 149676 0 0.0
.data 2260 2260 0 0.0
.text 984056 984056 0 0.0
BRD4161A+rs911x (read/write) 948172 948172 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 805336 805336 0 0.0
lock-app BRD4161A+wf200 (read/write) 1129096 1129112 16 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 982828 982844 16 0.0
window-app BRD4161A (read/write) 1075508 1075508 0 0.0
.bss 134468 134468 0 0.0
.data 2076 2076 0 0.0
.text 938940 938940 0 0.0
esp32 all-clusters-app c3devkit (read only) 1020154 1020156 2 0.0
(read/write) 1485842 1485842 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215728 215728 0 0.0
.flash.text 1020154 1020156 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1074031 1074035 4 0.0
(read/write) 487904 487904 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246164 246164 0 0.0
.flash.text 1068647 1068651 4 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658832 658832 0 0.0
.bss 69516 69516 0 0.0
.data 1992 1992 0 0.0
.text 581524 581524 0 0.0
lock k32w061+release (read/write) 685684 685684 0 0.0
.bss 69980 69980 0 0.0
.data 2004 2004 0 0.0
.text 607900 607900 0 0.0
linux all-clusters-app debug (read only) 2961225 2961225 0 0.0
(read/write) 154752 154752 0 0.0
.bss 61536 61536 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84968 84968 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 263805 263805 0 0.0
.text 2520210 2520210 0 0.0
all-clusters-minimal-app debug (read only) 2813801 2813801 0 0.0
(read/write) 146688 146688 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 265533 265533 0 0.0
.text 2373234 2373234 0 0.0
bridge-app debug+rpc (read only) 2315849 2315849 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198208 198208 0 0.0
.text 1955906 1955906 0 0.0
chip-tool debug (read only) 10350145 10350145 0 0.0
(read/write) 621728 621728 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 587360 587360 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 516597 516597 0 0.0
.text 8403156 8403156 0 0.0
chip-tool-ipv6only arm64 (read only) 10068812 10068812 0 0.0
(read/write) 686913 686913 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 622984 622984 0 0.0
.dynamic 528 528 0 0.0
.got 13736 13736 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 479628 479628 0 0.0
.text 8026596 8026596 0 0.0
lighting-app debug+rpc (read only) 2551577 2551577 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 213896 213896 0 0.0
.text 2167714 2167714 0 0.0
lock-app debug (read only) 2516313 2516313 0 0.0
(read/write) 124512 124512 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 228936 228936 0 0.0
.text 2122210 2122210 0 0.0
ota-provider-app debug (read only) 2322689 2322689 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203704 203704 0 0.0
.text 1956210 1956210 0 0.0
ota-requestor-app debug (read only) 2439761 2439761 0 0.0
(read/write) 125216 125216 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67288 67288 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207488 207488 0 0.0
.text 2061122 2061122 0 0.0
shell debug (read only) 2551569 2551569 0 0.0
(read/write) 141104 141104 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 227954 227954 0 0.0
.text 2166514 2166514 0 0.0
thermostat-no-ble arm64 (read only) 2595668 2595668 0 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165668 165668 0 0.0
.text 2190224 2190224 0 0.0
tv-app debug (read only) 3102609 3102609 0 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249216 249216 0 0.0
.text 2665490 2665490 0 0.0
tv-casting-app debug (read only) 5563561 5563561 0 0.0
(read/write) 161456 161456 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 102536 102536 0 0.0
.dynamic 608 608 0 0.0
.got 4744 4744 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 342825 342825 0 0.0
.text 4944082 4944082 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448312 2448312 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1410956 1410956 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1175411 1175411 0 0.0
bss 142900 142900 0 0.0
rodata 142076 142076 0 0.0
text 811544 811548 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1155607 1155607 0 0.0
bss 142136 142136 0 0.0
rodata 133608 133608 0 0.0
text 800988 800992 4 0.0
p6 all-clusters-app default (read/write) 2566392 2566392 0 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1524656 1524656 0 0.0
all-clusters-minimal-app default (read/write) 2511688 2511688 0 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1469952 1469952 0 0.0
light-app default (read/write) 2441616 2441616 0 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1399880 1399880 0 0.0
lock-app default (read/write) 2468768 2468768 0 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1427032 1427032 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 797540 797540 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565736 565732 -4 -0.0
lighting-app tlsr9518adk80d (read/write) 817372 817364 -8 -0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 582058 582056 -2 -0.0

@isiu-apple isiu-apple merged commit 01d0deb into project-chip:master Jul 15, 2022
@bzbarsky-apple bzbarsky-apple deleted the fix-run-management branch July 15, 2022 17:14
github-actions bot pushed a commit that referenced this pull request Jul 15, 2022
Without this change, we can schedule a reporting run, then do a sync
Run (due to urgent events), then (unnecessarily) schedule another
reporting run.
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.

5 participants