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

Address request from #10771 - add timeouts to thread join in test #11297

Merged

Conversation

cecille
Copy link
Contributor

@cecille cecille commented Nov 2, 2021

Problem

There was a request to add a timeout to the join in #10771.
The thread itself is unlikely to hang - more likely situation here
is the subscription failing to cause updates, causing the main
thread to hang forever on the condition variable.

Change overview

Add timeouts to to both thread join and waiting threadso we can have a bit more information about what actually
happened when the test completes.

Testing

This only affects the cirque tests.

@github-actions
Copy link

github-actions bot commented Nov 2, 2021

PR #11297: Size comparison from 2fe9024 to 4ff671b

Decreases (1 build for esp32)
platform target config section 2fe9024 4ff671b change % change
esp32 all-clusters-app m5stack (read only) 911115 911039 -76 -0.0
.flash.text 911115 911039 -76 -0.0
Full report (37 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 2fe9024 4ff671b change % change
efr32 lighting-app BRD4161A (read only) 735380 735380 0 0.0
(read/write) 114444 114444 0 0.0
.bss 112692 112692 0 0.0
.data 1752 1752 0 0.0
.text 735372 735372 0 0.0
BRD4161A+rpc (read only) 722820 722820 0 0.0
(read/write) 131048 131048 0 0.0
.bss 129196 129196 0 0.0
.data 1852 1852 0 0.0
.text 722812 722812 0 0.0
lock-app BRD4161A (read only) 714664 714664 0 0.0
(read/write) 112260 112260 0 0.0
.bss 110548 110548 0 0.0
.data 1712 1712 0 0.0
.text 714656 714656 0 0.0
window-app BRD4161A (read only) 715576 715576 0 0.0
(read/write) 112588 112588 0 0.0
.bss 110868 110868 0 0.0
.data 1716 1716 0 0.0
.text 715568 715568 0 0.0
esp32 all-clusters-app c3devkit (read only) 880170 880170 0 0.0
(read/write) 1307528 1307528 0 0.0
.dram0.bss 58424 58424 0 0.0
.dram0.data 16464 16464 0 0.0
.flash.rodata 199400 199400 0 0.0
.flash.text 880170 880170 0 0.0
.iram0.text 57554 57554 0 0.0
m5stack (read only) 911115 911039 -76 -0.0
(read/write) 427296 427296 0 0.0
.dram0.bss 60920 60920 0 0.0
.dram0.data 32100 32100 0 0.0
.flash.rodata 208112 208112 0 0.0
.flash.text 911115 911039 -76 -0.0
.iram0.text 125115 125115 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 698212 698212 0 0.0
.bss 77688 77688 0 0.0
.data 1900 1900 0 0.0
.text 612824 612824 0 0.0
lock-app k32w061+debug (read/write) 590508 590508 0 0.0
.bss 68188 68188 0 0.0
.data 1864 1864 0 0.0
.text 514656 514656 0 0.0
shell k32w061+debug (read/write) 424772 424772 0 0.0
.bss 63280 63280 0 0.0
.data 672 672 0 0.0
.text 359116 359116 0 0.0
linux all-clusters-app debug (read only) 1684009 1684009 0 0.0
(read/write) 118992 118992 0 0.0
.bss 50608 50608 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62112 62112 0 0.0
.dynamic 592 592 0 0.0
.got 4088 4088 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 137749 137749 0 0.0
.text 1413202 1413202 0 0.0
bridge-app debug+rpc (read only) 1278437 1278437 0 0.0
(read/write) 84104 84104 0 0.0
.bss 50768 50768 0 0.0
.data 976 976 0 0.0
.data.rel.ro 27368 27368 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 400 400 0 0.0
.rodata 109508 109508 0 0.0
.text 1073685 1073685 0 0.0
chip-tool debug (read only) 4312861 4312861 0 0.0
(read/write) 123552 123552 0 0.0
.bss 17680 17680 0 0.0
.data 1584 1584 0 0.0
.data.rel.ro 98880 98880 0 0.0
.dynamic 592 592 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 217424 217424 0 0.0
.text 3829781 3829781 0 0.0
lighting-app debug+rpc (read only) 1537409 1537409 0 0.0
(read/write) 100976 100976 0 0.0
.bss 40152 40152 0 0.0
.data 1106 1106 0 0.0
.data.rel.ro 54448 54448 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 528 528 0 0.0
.rodata 127665 127665 0 0.0
.text 1277362 1277362 0 0.0
ota-provider-app debug (read only) 1236329 1236329 0 0.0
(read/write) 67072 67072 0 0.0
.bss 36608 36608 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24616 24616 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 440 440 0 0.0
.rodata 110280 110280 0 0.0
.text 1029922 1029922 0 0.0
ota-requestor-app debug (read only) 1293601 1293601 0 0.0
(read/write) 76392 76392 0 0.0
.bss 44864 44864 0 0.0
.data 816 816 0 0.0
.data.rel.ro 25576 25576 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 512 512 0 0.0
.rodata 121504 121504 0 0.0
.text 1074306 1074306 0 0.0
shell debug (read only) 785041 785041 0 0.0
(read/write) 57664 57664 0 0.0
.bss 16072 16072 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36848 36848 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 336 336 0 0.0
.rodata 77295 77295 0 0.0
.text 606210 606210 0 0.0
tv-app debug (read only) 1770809 1770809 0 0.0
(read/write) 288536 288536 0 0.0
.bss 222192 222192 0 0.0
.data 2032 2032 0 0.0
.data.rel.ro 58672 58672 0 0.0
.dynamic 592 592 0 0.0
.got 4408 4408 0 0.0
.init 27 27 0 0.0
.init_array 608 608 0 0.0
.rodata 153080 153080 0 0.0
.text 1475826 1475826 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2293560 2293560 0 0.0
.bss 179796 179796 0 0.0
.data 5216 5216 0 0.0
.heap 851432 851432 0 0.0
.text 1256160 1256160 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2272688 2272688 0 0.0
.bss 171836 171836 0 0.0
.data 5568 5568 0 0.0
.heap 859040 859040 0 0.0
.text 1235288 1235288 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2250344 2250344 0 0.0
.bss 170740 170740 0 0.0
.data 5552 5552 0 0.0
.heap 860152 860152 0 0.0
.text 1212944 1212944 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2048328 2048328 0 0.0
.bss 156232 156232 0 0.0
.data 4968 4968 0 0.0
.heap 875248 875248 0 0.0
.text 1010928 1010928 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 860155 860155 0 0.0
bss 111148 111148 0 0.0
rodata 96340 96340 0 0.0
text 577052 577052 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 820975 820975 0 0.0
bss 107392 107392 0 0.0
rodata 87112 87112 0 0.0
text 550224 550224 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 785194 785194 0 0.0
bss 112524 112524 0 0.0
rodata 91580 91580 0 0.0
text 506520 506520 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 836863 836863 0 0.0
bss 110184 110184 0 0.0
rodata 92696 92696 0 0.0
text 558532 558532 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 762158 762158 0 0.0
bss 111596 111596 0 0.0
rodata 88000 88000 0 0.0
text 488092 488092 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497323 497323 0 0.0
bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 842843 842843 0 0.0
bss 110320 110320 0 0.0
rodata 94404 94404 0 0.0
text 562588 562588 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 836715 836715 0 0.0
bss 110220 110220 0 0.0
rodata 92692 92692 0 0.0
text 558268 558268 0 0.0
shell nrf52840dk_nrf52840 (read/write) 775903 775903 0 0.0
bss 109096 109096 0 0.0
rodata 72404 72404 0 0.0
text 519792 519792 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 690906 690906 0 0.0
bss 110080 110080 0 0.0
rodata 67044 67044 0 0.0
text 440400 440400 0 0.0
p6 lock-app default (read/write) 2166544 2166544 0 0.0
.bss 66184 66184 0 0.0
.data 2416 2416 0 0.0
.heap 964744 964744 0 0.0
.text 1124808 1124808 0 0.0
qpg lighting-app qpg6100+debug (read only) 489664 489664 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50320 50320 0 0.0
.data 1000 1000 0 0.0
.text 484344 484344 0 0.0
lock-app qpg6100+debug (read only) 465992 465992 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49272 49272 0 0.0
.data 956 956 0 0.0
.text 460672 460672 0 0.0
persistent-storage-app qpg6100+debug (read only) 155820 155820 0 0.0
(read/write) 114140 114140 0 0.0
.bss 27752 27752 0 0.0
.data 372 372 0 0.0
.text 150500 150500 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 661586 661586 0 0.0
bss 68960 68960 0 0.0
noinit 33216 33216 0 0.0
text 457328 457328 0 0.0

There was a request to add a timeout to the join in project-chip#10771.
The thread itself is unlikely to hang - more likely situation here
is the subscription failing to cause updates, causing the main
thread to hang forever on the condition variable. Added time outs
to both so we can have a bit more information about what actually
happened when the test completes.
@cecille cecille force-pushed the add_additional_timeout_to_test branch from 4ff671b to 236f8d2 Compare November 2, 2021 19:03
@github-actions
Copy link

github-actions bot commented Nov 2, 2021

PR #11297: Size comparison from eddd4f7 to 236f8d2

Full report (37 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section eddd4f7 236f8d2 change % change
efr32 lighting-app BRD4161A (read only) 736844 736844 0 0.0
(read/write) 114612 114612 0 0.0
.bss 112852 112852 0 0.0
.data 1760 1760 0 0.0
.text 736836 736836 0 0.0
BRD4161A+rpc (read only) 724268 724268 0 0.0
(read/write) 131216 131216 0 0.0
.bss 129356 129356 0 0.0
.data 1860 1860 0 0.0
.text 724260 724260 0 0.0
lock-app BRD4161A (read only) 716124 716124 0 0.0
(read/write) 112428 112428 0 0.0
.bss 110708 110708 0 0.0
.data 1720 1720 0 0.0
.text 716116 716116 0 0.0
window-app BRD4161A (read only) 717024 717024 0 0.0
(read/write) 112756 112756 0 0.0
.bss 111028 111028 0 0.0
.data 1724 1724 0 0.0
.text 717016 717016 0 0.0
esp32 all-clusters-app c3devkit (read only) 880466 880466 0 0.0
(read/write) 1307824 1307824 0 0.0
.dram0.bss 58592 58592 0 0.0
.dram0.data 16464 16464 0 0.0
.flash.rodata 199536 199536 0 0.0
.flash.text 880466 880466 0 0.0
.iram0.text 57554 57554 0 0.0
m5stack (read only) 911571 911571 0 0.0
(read/write) 427592 427592 0 0.0
.dram0.bss 61088 61088 0 0.0
.dram0.data 32100 32100 0 0.0
.flash.rodata 208240 208240 0 0.0
.flash.text 911571 911571 0 0.0
.iram0.text 125115 125115 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 699104 699104 0 0.0
.bss 77848 77848 0 0.0
.data 1908 1908 0 0.0
.text 613548 613548 0 0.0
lock-app k32w061+debug (read/write) 591412 591412 0 0.0
.bss 68364 68364 0 0.0
.data 1872 1872 0 0.0
.text 515376 515376 0 0.0
shell k32w061+debug (read/write) 424800 424800 0 0.0
.bss 63288 63288 0 0.0
.data 672 672 0 0.0
.text 359136 359136 0 0.0
linux all-clusters-app debug (read only) 1690385 1690385 0 0.0
(read/write) 119664 119664 0 0.0
.bss 51120 51120 0 0.0
.data 1042 1042 0 0.0
.data.rel.ro 62240 62240 0 0.0
.dynamic 592 592 0 0.0
.got 4088 4088 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 139637 139637 0 0.0
.text 1417378 1417378 0 0.0
bridge-app debug+rpc (read only) 1283293 1283293 0 0.0
(read/write) 68488 68488 0 0.0
.bss 35024 35024 0 0.0
.data 992 992 0 0.0
.data.rel.ro 27496 27496 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 400 400 0 0.0
.rodata 111204 111204 0 0.0
.text 1076533 1076533 0 0.0
chip-tool debug (read only) 4329237 4329237 0 0.0
(read/write) 124064 124064 0 0.0
.bss 18192 18192 0 0.0
.data 1584 1584 0 0.0
.data.rel.ro 98856 98856 0 0.0
.dynamic 592 592 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 218928 218928 0 0.0
.text 3844677 3844677 0 0.0
lighting-app debug+rpc (read only) 1542617 1542617 0 0.0
(read/write) 101680 101680 0 0.0
.bss 40696 40696 0 0.0
.data 1138 1138 0 0.0
.data.rel.ro 54560 54560 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 528 528 0 0.0
.rodata 129297 129297 0 0.0
.text 1280626 1280626 0 0.0
ota-provider-app debug (read only) 1243145 1243145 0 0.0
(read/write) 67520 67520 0 0.0
.bss 37120 37120 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24568 24568 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 440 440 0 0.0
.rodata 112136 112136 0 0.0
.text 1034930 1034930 0 0.0
ota-requestor-app debug (read only) 1310441 1310441 0 0.0
(read/write) 76840 76840 0 0.0
.bss 45376 45376 0 0.0
.data 816 816 0 0.0
.data.rel.ro 25512 25512 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 512 512 0 0.0
.rodata 123104 123104 0 0.0
.text 1089618 1089618 0 0.0
shell debug (read only) 786529 786529 0 0.0
(read/write) 57664 57664 0 0.0
.bss 16104 16104 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36816 36816 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 336 336 0 0.0
.rodata 77839 77839 0 0.0
.text 607202 607202 0 0.0
tv-app debug (read only) 1790633 1790633 0 0.0
(read/write) 289240 289240 0 0.0
.bss 222736 222736 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 58784 58784 0 0.0
.dynamic 592 592 0 0.0
.got 4408 4408 0 0.0
.init 27 27 0 0.0
.init_array 608 608 0 0.0
.rodata 155032 155032 0 0.0
.text 1493410 1493410 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292704 2292704 0 0.0
.bss 179956 179956 0 0.0
.data 5224 5224 0 0.0
.heap 851264 851264 0 0.0
.text 1255304 1255304 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2271648 2271648 0 0.0
.bss 172004 172004 0 0.0
.data 5576 5576 0 0.0
.heap 858864 858864 0 0.0
.text 1234248 1234248 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2249368 2249368 0 0.0
.bss 170900 170900 0 0.0
.data 5560 5560 0 0.0
.heap 859984 859984 0 0.0
.text 1211968 1211968 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2048432 2048432 0 0.0
.bss 156248 156248 0 0.0
.data 4968 4968 0 0.0
.heap 875232 875232 0 0.0
.text 1011032 1011032 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 861027 861027 0 0.0
bss 111312 111312 0 0.0
rodata 96548 96548 0 0.0
text 577548 577548 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 821851 821851 0 0.0
bss 107552 107552 0 0.0
rodata 87324 87324 0 0.0
text 550720 550720 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 786050 786050 0 0.0
bss 112688 112688 0 0.0
rodata 91788 91788 0 0.0
text 507012 507012 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 837731 837731 0 0.0
bss 110348 110348 0 0.0
rodata 92900 92900 0 0.0
text 559028 559028 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 763030 763030 0 0.0
bss 111756 111756 0 0.0
rodata 88208 88208 0 0.0
text 488584 488584 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497323 497323 0 0.0
bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 843843 843843 0 0.0
bss 110484 110484 0 0.0
rodata 94612 94612 0 0.0
text 563208 563208 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 837587 837587 0 0.0
bss 110384 110384 0 0.0
rodata 92900 92900 0 0.0
text 558764 558764 0 0.0
shell nrf52840dk_nrf52840 (read/write) 775911 775911 0 0.0
bss 109104 109104 0 0.0
rodata 72412 72412 0 0.0
text 519804 519804 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 690962 690962 0 0.0
bss 110084 110084 0 0.0
rodata 67052 67052 0 0.0
text 440404 440404 0 0.0
p6 lock-app default (read/write) 2167680 2167680 0 0.0
.bss 66352 66352 0 0.0
.data 2424 2424 0 0.0
.heap 964568 964568 0 0.0
.text 1125944 1125944 0 0.0
qpg lighting-app qpg6100+debug (read only) 490384 490384 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50408 50408 0 0.0
.data 1008 1008 0 0.0
.text 485064 485064 0 0.0
lock-app qpg6100+debug (read only) 466720 466720 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49352 49352 0 0.0
.data 964 964 0 0.0
.text 461400 461400 0 0.0
persistent-storage-app qpg6100+debug (read only) 155796 155796 0 0.0
(read/write) 114140 114140 0 0.0
.bss 27760 27760 0 0.0
.data 372 372 0 0.0
.text 150476 150476 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 662422 662422 0 0.0
bss 69116 69116 0 0.0
noinit 33216 33216 0 0.0
text 457800 457800 0 0.0

@andy31415
Copy link
Contributor

Fast track: test changes only

@andy31415 andy31415 merged commit 4fe7712 into project-chip:master Nov 3, 2021
@cecille cecille deleted the add_additional_timeout_to_test branch November 4, 2021 17:05
PSONALl pushed a commit to PSONALl/connectedhomeip that referenced this pull request Dec 3, 2021
… in test (project-chip#11297)

* Address request from project-chip#10771

There was a request to add a timeout to the join in project-chip#10771.
The thread itself is unlikely to hang - more likely situation here
is the subscription failing to cause updates, causing the main
thread to hang forever on the condition variable. Added time outs
to both so we can have a bit more information about what actually
happened when the test completes.

* Restyled by autopep8

Co-authored-by: Restyled.io <commits@restyled.io>
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.

4 participants