[BlueZ] adapter: Fix discovery trigger for 0 second delay

Commit Message

Frédéric Danis March 12, 2021, 10:52 a.m. UTC

When calling `StartDiscovery` the effective start can take around 10 ms or
up to 700 ms.
g_timeout_add_seconds() call doesn't ensure the time for the first call of
the timer if the delay is less or equal to 1 second.
---
 src/adapter.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

[e-mail] March 12, 2021, 11:09 a.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=446939

---Test result---

##############################
Test: CheckPatch - FAIL
Output:
adapter: Fix discovery trigger for 0 second delay
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#20: FILE: src/adapter.c:1801:
+		adapter->discovery_idle_timeout = g_idle_add(start_discovery_timeout,

- total: 0 errors, 1 warnings, 12 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

"[PATCH] adapter: Fix discovery trigger for 0 second delay" has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: CheckGitLint - PASS

##############################
Test: CheckBuild - PASS

##############################
Test: MakeCheck - PASS



---
Regards,
Linux Bluetooth

Patch

diff --git a/src/adapter.c b/src/adapter.c
index cc0849f99..daa4c18b7 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1797,6 +1797,12 @@  static void trigger_start_discovery(struct btd_adapter *adapter, guint delay)
 	if (!btd_adapter_get_powered(adapter))
 		return;
 
+	if (!delay) {
+		adapter->discovery_idle_timeout = g_idle_add(start_discovery_timeout,
+						adapter);
+		return;
+	}
+
 	adapter->discovery_idle_timeout = g_timeout_add_seconds(delay,
 					start_discovery_timeout, adapter);
 }