| Message ID | 20250103125833.58396-1-BlaiseD@GMail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 79900d49ac68eb8deeaf6108a97abf26f00daacd |
| Headers | show |
| Series | [BlueZ,v2] plugin: Order plugin init by priority | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
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=922047 ---Test result--- Test Summary: CheckPatch PENDING 0.22 seconds GitLint PENDING 0.25 seconds BuildEll PASS 20.62 seconds BluezMake PASS 1508.95 seconds MakeCheck PASS 13.33 seconds MakeDistcheck PASS 159.48 seconds CheckValgrind PASS 215.26 seconds CheckSmatch PASS 273.34 seconds bluezmakeextell PASS 99.30 seconds IncrementalBuild PENDING 0.26 seconds ScanBuild PASS 853.33 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
Hello: This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Fri, 3 Jan 2025 06:55:32 -0600 you wrote: > The init order matters for some plugins, e.g. wiimote > Add them to a sorted list before calling add_plugin > --- > Cast has been removed and add_plugin is adjusted for g_slist_foreach > > src/plugin.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) Here is the summary with links: - [BlueZ,v2] plugin: Order plugin init by priority https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=79900d49ac68 You are awesome, thank you!
diff --git a/src/plugin.c b/src/plugin.c index 00d3d7b6a..a566bd2f4 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -37,10 +37,10 @@ struct bluetooth_plugin { static int compare_priority(gconstpointer a, gconstpointer b) { - const struct bluetooth_plugin *plugin1 = a; - const struct bluetooth_plugin *plugin2 = b; + const struct bluetooth_plugin_desc *plugin1 = a; + const struct bluetooth_plugin_desc *plugin2 = b; - return plugin2->desc->priority - plugin1->desc->priority; + return plugin2->priority - plugin1->priority; } static int init_plugin(const struct bluetooth_plugin_desc *desc) @@ -86,14 +86,15 @@ static gboolean add_external_plugin(void *handle, __btd_enable_debug(desc->debug_start, desc->debug_stop); - plugins = g_slist_insert_sorted(plugins, plugin, compare_priority); + plugins = g_slist_append(plugins, plugin); DBG("Plugin %s loaded", desc->name); return TRUE; } -static void add_plugin(const struct bluetooth_plugin_desc *desc) +static void add_plugin(void *data, void *user_data) { + struct bluetooth_plugin_desc *desc = data; struct bluetooth_plugin *plugin; DBG("Loading %s plugin", desc->name); @@ -109,7 +110,7 @@ static void add_plugin(const struct bluetooth_plugin_desc *desc) return; } - plugins = g_slist_insert_sorted(plugins, plugin, compare_priority); + plugins = g_slist_append(plugins, plugin); DBG("Plugin %s loaded", desc->name); } @@ -201,6 +202,7 @@ static void external_plugin_init(char **cli_disabled, char **cli_enabled) void plugin_init(const char *enable, const char *disable) { + GSList *builtins = NULL; char **cli_disabled = NULL; char **cli_enabled = NULL; unsigned int i; @@ -222,12 +224,16 @@ void plugin_init(const char *enable, const char *disable) cli_disabled)) continue; - add_plugin(__bluetooth_builtin[i]); + builtins = g_slist_insert_sorted(builtins, + (void *) __bluetooth_builtin[i], compare_priority); } + g_slist_foreach(builtins, add_plugin, NULL); + if IS_ENABLED(EXTERNAL_PLUGINS) external_plugin_init(cli_enabled, cli_disabled); + g_slist_free(builtins); g_strfreev(cli_enabled); g_strfreev(cli_disabled); }