Skip to content

[Tizen] Properly implement BLEManagerImpl::_NumConnections #39965

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

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

arkq
Copy link
Contributor

@arkq arkq commented Jul 11, 2025

Summary

The chip::DeviceLayer::ConnectivityMgr().NumBLEConnections() always returns 0 because underlying implementation was incorrect.

Changes

  • Store BLE connection in std unordered map (no need to do any locks when obtaining connection count)
  • Fix memory leak when obtaining BLE device name
  • Simplification for parameters check in subscribe/unsubscribe functions

Testing

Locally verified that the application can check whether there is an ongoing BLE connection.

@github-actions github-actions bot added platform tizen For Tizen platform labels Jul 11, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The pull request implements _NumConnections to return the actual number of BLE connections. The review focuses on a potential race condition when accessing the shared connection map and suggests adding thread synchronization using the platform's locking mechanism to ensure data integrity.

Copy link

github-actions bot commented Jul 11, 2025

PR #39965: Size comparison from c0a78ce to 0258186

Full report (70 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink)
platform target config section c0a78ce 0258186 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1102622 1102622 0 0.0
RAM 179010 179010 0 0.0
bl702 lighting-app bl702+eth FLASH 656030 656030 0 0.0
RAM 134961 134961 0 0.0
bl702+wifi FLASH 833212 833212 0 0.0
RAM 124517 124517 0 0.0
bl706+mfd+rpc+littlefs FLASH 1065330 1065330 0 0.0
RAM 117373 117373 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 894876 894876 0 0.0
RAM 105660 105660 0 0.0
lighting-app bl702l+mfd+littlefs FLASH 978594 978594 0 0.0
RAM 109852 109852 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 763128 763128 0 0.0
RAM 103368 103368 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 774668 774668 0 0.0
RAM 108536 108536 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 721008 721008 0 0.0
RAM 96940 96940 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 705300 705300 0 0.0
RAM 97148 97148 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 548850 548850 0 0.0
RAM 205144 205144 0 0.0
lock CC3235SF_LAUNCHXL FLASH 581842 581842 0 0.0
RAM 205344 205344 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 662613 662613 0 0.0
RAM 77472 77472 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 682465 682465 0 0.0
RAM 80112 80112 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 682465 682465 0 0.0
RAM 80112 80112 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 639397 639397 0 0.0
RAM 72540 72540 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 623837 623837 0 0.0
RAM 73784 73784 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 643473 643473 0 0.0
RAM 76336 76336 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 643473 643473 0 0.0
RAM 76336 76336 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 644797 644797 0 0.0
RAM 76784 76784 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 664513 664513 0 0.0
RAM 79336 79336 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 664513 664513 0 0.0
RAM 79336 79336 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 619577 619577 0 0.0
RAM 70888 70888 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 639429 639429 0 0.0
RAM 73520 73520 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 639429 639429 0 0.0
RAM 73520 73520 0 0.0
efr32 lock-app BRD4187C FLASH 955016 955016 0 0.0
RAM 126564 126564 0 0.0
BRD4338a FLASH 749468 749460 -8 -0.0
RAM 251912 251912 0 0.0
window-app BRD4187C FLASH 1049576 1049576 0 0.0
RAM 122760 122760 0 0.0
esp32 all-clusters-app c3devkit DRAM 102272 102272 0 0.0
FLASH 1780616 1780616 0 0.0
IRAM 83862 83862 0 0.0
m5stack DRAM 121156 121156 0 0.0
FLASH 1747894 1747894 0 0.0
IRAM 117071 117071 0 0.0
linux air-purifier-app debug unknown 4856 4856 0 0.0
FLASH 2796646 2796646 0 0.0
RAM 117320 117320 0 0.0
all-clusters-app debug unknown 5672 5672 0 0.0
FLASH 6198206 6198206 0 0.0
RAM 531216 531216 0 0.0
all-clusters-minimal-app debug unknown 5536 5536 0 0.0
FLASH 5473562 5473562 0 0.0
RAM 228008 228008 0 0.0
bridge-app debug unknown 5568 5568 0 0.0
FLASH 4807802 4807802 0 0.0
RAM 207712 207712 0 0.0
camera-app debug unknown 8976 8976 0 0.0
FLASH 6935131 6935131 0 0.0
RAM 230024 230024 0 0.0
camera-controller debug unknown 9216 9216 0 0.0
FLASH 14387339 14387339 0 0.0
RAM 661528 661528 0 0.0
chip-tool debug unknown 6272 6272 0 0.0
FLASH 14738305 14738305 0 0.0
RAM 655072 655072 0 0.0
chip-tool-ipv6only arm64 unknown 40672 40672 0 0.0
FLASH 12713487 12713487 0 0.0
RAM 701344 701344 0 0.0
closure-app debug unknown 5536 5536 0 0.0
FLASH 4790656 4790656 0 0.0
RAM 200584 200584 0 0.0
fabric-admin debug unknown 5952 5952 0 0.0
FLASH 12798837 12798837 0 0.0
RAM 654104 654104 0 0.0
fabric-bridge-app debug unknown 4816 4816 0 0.0
FLASH 4593134 4593134 0 0.0
RAM 193424 193424 0 0.0
fabric-sync debug unknown 5056 5056 0 0.0
FLASH 5741661 5741661 0 0.0
RAM 491728 491728 0 0.0
lighting-app debug+rpc+ui unknown 6280 6280 0 0.0
FLASH 5694593 5694593 0 0.0
RAM 209944 209944 0 0.0
lock-app debug unknown 5488 5488 0 0.0
FLASH 4836482 4836482 0 0.0
RAM 197192 197192 0 0.0
ota-provider-app debug unknown 4856 4856 0 0.0
FLASH 4446986 4446986 0 0.0
RAM 186112 186112 0 0.0
ota-requestor-app debug unknown 4736 4736 0 0.0
FLASH 4519108 4519108 0 0.0
RAM 188984 188984 0 0.0
shell debug unknown 4288 4288 0 0.0
FLASH 3076572 3076572 0 0.0
RAM 147344 147344 0 0.0
thermostat-no-ble arm64 unknown 9832 9832 0 0.0
FLASH 4236319 4236319 0 0.0
RAM 233304 233304 0 0.0
tv-app debug unknown 5824 5824 0 0.0
FLASH 6106653 6106653 0 0.0
RAM 615976 615976 0 0.0
tv-casting-app debug unknown 5352 5352 0 0.0
FLASH 12888029 12888029 0 0.0
RAM 771728 771728 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 888100 888100 0 0.0
RAM 166162 166162 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 897252 897252 0 0.0
RAM 145100 145100 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 858424 858424 0 0.0
RAM 141049 141049 0 0.0
nxp contact mcxw71+release FLASH 624800 624800 0 0.0
RAM 63164 63164 0 0.0
lock mcxw71+release FLASH 776008 776008 0 0.0
RAM 67820 67820 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1632532 1632532 0 0.0
RAM 211104 211104 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1576708 1576708 0 0.0
RAM 208472 208472 0 0.0
light cy8ckit_062s2_43012 FLASH 1449500 1449500 0 0.0
RAM 197184 197184 0 0.0
lock cy8ckit_062s2_43012 FLASH 1481756 1481756 0 0.0
RAM 224904 224904 0 0.0
qpg lighting-app qpg6200+debug FLASH 743856 743856 0 0.0
RAM 94220 94220 0 0.0
lock-app qpg6200+debug FLASH 753476 753476 0 0.0
RAM 94248 94248 0 0.0
stm32 light STM32WB5MM-DK FLASH 465292 465292 0 0.0
RAM 141376 141376 0 0.0
telink bridge-app tl7218x FLASH 702340 702340 0 0.0
RAM 93600 93600 0 0.0
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 794072 794072 0 0.0
RAM 44016 44016 0 0.0
light-app-ota-shell-factory-data tl7218x FLASH 782478 782478 0 0.0
RAM 100912 100912 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 709590 709590 0 0.0
RAM 54240 54240 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 746184 746184 0 0.0
RAM 77404 77404 0 0.0
light-switch-app-ota-factory-data tl3218x_retention FLASH 722910 722910 0 0.0
RAM 36996 36996 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 603014 603014 0 0.0
RAM 112532 112532 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 818032 818036 4 0.0
RAM 99164 99164 0 0.0

@arkq arkq marked this pull request as draft July 11, 2025 13:20
@arkq arkq force-pushed the tizen-ble-con-count branch from 0258186 to 208374f Compare July 14, 2025 09:57
@arkq
Copy link
Contributor Author

arkq commented Jul 14, 2025

/gemini review

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request implements _NumConnections by switching from GHashTable to std::unordered_map for managing BLE connections, which improves type safety and simplifies the code. The PR also fixes a memory leak in _GetDeviceName and simplifies parameter validation in several functions. There is a critical operator precedence bug that needs to be addressed, and a high-severity logic issue in CloseConnection that could lead to race conditions and confusing logs.

Comment on lines +1189 to +1192
int ret = bt_gatt_disconnect(conId->peerAddr.c_str());
VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_disconnect() failed: %s", get_error_message(ret)));

RemoveConnectionData(conId->peerAddr);
RemoveConnection(conId->peerAddr.c_str());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Calling RemoveConnection here can lead to a race condition and confusing logs. The bt_gatt_disconnect function is asynchronous and will trigger a ConnectionStateChangedCb callback upon completion, which in turn calls HandleConnectionEvent and then RemoveConnection.

This means the connection is removed twice: once synchronously here, and again asynchronously in the event handler. While the current implementation of RemoveConnection is safe against a double-free, it will log an error when the connection is not found on the second call. To avoid this, I recommend removing the synchronous call to RemoveConnection and relying solely on the event handler for cleanup. This ensures a single, consistent point of state management for connection removal.

Copy link

github-actions bot commented Jul 14, 2025

PR #39965: Size comparison from ad2e3f5 to b867e84

Increases above 0.2%:

platform target config section ad2e3f5 b867e84 change % change
tizen all-clusters-app arm FLASH 1695632 1701760 6128 0.4
Full report (59 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section ad2e3f5 b867e84 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1102628 1102628 0 0.0
RAM 178970 178970 0 0.0
bl702 lighting-app bl702+eth FLASH 656030 656030 0 0.0
RAM 134929 134929 0 0.0
bl702+wifi FLASH 833218 833218 0 0.0
RAM 124469 124469 0 0.0
bl706+mfd+rpc+littlefs FLASH 1065336 1065336 0 0.0
RAM 117341 117341 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 894882 894882 0 0.0
RAM 105628 105628 0 0.0
lighting-app bl702l+mfd+littlefs FLASH 978600 978600 0 0.0
RAM 109820 109820 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 763080 763080 0 0.0
RAM 103328 103328 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 774620 774620 0 0.0
RAM 108496 108496 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 720960 720960 0 0.0
RAM 96900 96900 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 705252 705252 0 0.0
RAM 97108 97108 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 548818 548818 0 0.0
RAM 205104 205104 0 0.0
lock CC3235SF_LAUNCHXL FLASH 581794 581794 0 0.0
RAM 205304 205304 0 0.0
efr32 lock-app BRD4187C FLASH 954984 954984 0 0.0
RAM 126532 126532 0 0.0
BRD4338a FLASH 749388 749380 -8 -0.0
RAM 251880 251880 0 0.0
window-app BRD4187C FLASH 1049512 1049512 0 0.0
RAM 122728 122728 0 0.0
esp32 all-clusters-app c3devkit DRAM 102232 102232 0 0.0
FLASH 1780566 1780566 0 0.0
IRAM 83862 83862 0 0.0
m5stack DRAM 121116 121116 0 0.0
FLASH 1747870 1747870 0 0.0
IRAM 117071 117071 0 0.0
linux air-purifier-app debug unknown 4856 4856 0 0.0
FLASH 2796466 2796466 0 0.0
RAM 117288 117288 0 0.0
all-clusters-app debug unknown 5672 5672 0 0.0
FLASH 6198506 6198506 0 0.0
RAM 532112 532112 0 0.0
all-clusters-minimal-app debug unknown 5536 5536 0 0.0
FLASH 5473410 5473410 0 0.0
RAM 227944 227944 0 0.0
bridge-app debug unknown 5568 5568 0 0.0
FLASH 4807622 4807622 0 0.0
RAM 207648 207648 0 0.0
camera-app debug unknown 8976 8976 0 0.0
FLASH 6948347 6948347 0 0.0
RAM 230688 230688 0 0.0
camera-controller debug unknown 9216 9216 0 0.0
FLASH 14389035 14389035 0 0.0
RAM 662488 662488 0 0.0
chip-tool debug unknown 6272 6272 0 0.0
FLASH 14763345 14763345 0 0.0
RAM 656192 656192 0 0.0
chip-tool-ipv6only arm64 unknown 40736 40736 0 0.0
FLASH 12733255 12733255 0 0.0
RAM 702440 702440 0 0.0
closure-app debug unknown 5536 5536 0 0.0
FLASH 4790478 4790478 0 0.0
RAM 200520 200520 0 0.0
fabric-admin debug unknown 5952 5952 0 0.0
FLASH 12806165 12806165 0 0.0
RAM 655224 655224 0 0.0
fabric-bridge-app debug unknown 4816 4816 0 0.0
FLASH 4592952 4592952 0 0.0
RAM 193360 193360 0 0.0
fabric-sync debug unknown 5056 5056 0 0.0
FLASH 5741517 5741517 0 0.0
RAM 492624 492624 0 0.0
lighting-app debug+rpc+ui unknown 6280 6280 0 0.0
FLASH 5694417 5694417 0 0.0
RAM 209912 209912 0 0.0
lock-app debug unknown 5488 5488 0 0.0
FLASH 4836334 4836334 0 0.0
RAM 197128 197128 0 0.0
ota-provider-app debug unknown 4856 4856 0 0.0
FLASH 4446808 4446808 0 0.0
RAM 186048 186048 0 0.0
ota-requestor-app debug unknown 4736 4736 0 0.0
FLASH 4518930 4518930 0 0.0
RAM 188920 188920 0 0.0
shell debug unknown 4288 4288 0 0.0
FLASH 3076412 3076412 0 0.0
RAM 147280 147280 0 0.0
thermostat-no-ble arm64 unknown 9832 9832 0 0.0
FLASH 4236063 4236063 0 0.0
RAM 233272 233272 0 0.0
tv-app debug unknown 5824 5824 0 0.0
FLASH 6106541 6106541 0 0.0
RAM 616904 616904 0 0.0
tv-casting-app debug unknown 5352 5352 0 0.0
FLASH 12907581 12907581 0 0.0
RAM 772624 772624 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 888064 888064 0 0.0
RAM 166122 166122 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 897204 897204 0 0.0
RAM 145060 145060 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 858388 858388 0 0.0
RAM 141014 141014 0 0.0
nxp contact mcxw71+release FLASH 624744 624744 0 0.0
RAM 63132 63132 0 0.0
lock mcxw71+release FLASH 775952 775952 0 0.0
RAM 67788 67788 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1632452 1632452 0 0.0
RAM 211064 211064 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1576644 1576644 0 0.0
RAM 208432 208432 0 0.0
light cy8ckit_062s2_43012 FLASH 1449436 1449436 0 0.0
RAM 197152 197152 0 0.0
lock cy8ckit_062s2_43012 FLASH 1481692 1481692 0 0.0
RAM 224872 224872 0 0.0
qpg lighting-app qpg6200+debug FLASH 744184 744184 0 0.0
RAM 94252 94252 0 0.0
lock-app qpg6200+debug FLASH 753804 753804 0 0.0
RAM 94280 94280 0 0.0
stm32 light STM32WB5MM-DK FLASH 465236 465236 0 0.0
RAM 141336 141336 0 0.0
telink bridge-app tl7218x FLASH 702278 702278 0 0.0
RAM 93564 93564 0 0.0
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 794006 794006 0 0.0
RAM 43980 43980 0 0.0
light-app-ota-shell-factory-data tl7218x FLASH 782412 782412 0 0.0
RAM 100876 100876 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 709528 709528 0 0.0
RAM 54204 54204 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 746122 746122 0 0.0
RAM 77368 77368 0 0.0
light-switch-app-ota-factory-data tl3218x_retention FLASH 722848 722848 0 0.0
RAM 36960 36960 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 602948 602948 0 0.0
RAM 112496 112496 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 817966 817970 4 0.0
RAM 99128 99128 0 0.0
tizen all-clusters-app arm unknown 5096 5068 -28 -0.5
FLASH 1695632 1701760 6128 0.4
RAM 91404 91436 32 0.0
chip-tool-ubsan arm unknown 20800 20760 -40 -0.2
FLASH 21098370 21116594 18224 0.1
RAM 9178412 9188092 9680 0.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants