SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugin-manager: fix waiting the minimum probing time

Browse Source 
The device port probings were being finished before the minimum
probing time, making this timeout effectively useless.
This commit is contained in:
Aleksander Morgado
2019-11-13 15:38:45 +01:00
parent d7d2b9108e
commit 76e862597c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-plugin-manager.c
+11 -9
View File
@@ -812,6 +812,15 @@ device_context_complete (DeviceContext *device_context)
{
GTask *task;
/* If the context is completed before the minimum probing time, we need to wait
* until that happens, so that we give enough time to udev/hotplug to report the
* new port additions. */
if (device_context->min_probing_time_id) {
mm_dbg ("[plugin manager] task %s: all port probings completed, but not reached min probing time yet",
device_context->name);
return;
}
/* Steal the task from the context */
g_assert (device_context->task);
task = device_context->task;
@@ -831,15 +840,8 @@ device_context_complete (DeviceContext *device_context)
device_context->released_id = 0;
}
/* Remove timeouts, if still around */
if (device_context->min_wait_time_id) {
g_source_remove (device_context->min_wait_time_id);
device_context->min_wait_time_id = 0;
}
if (device_context->min_probing_time_id) {
g_source_remove (device_context->min_probing_time_id);
device_context->min_probing_time_id = 0;
}
/* On completion, the minimum wait time must have been already elapsed */
g_assert (!device_context->min_wait_time_id);
/* Task completion */
if (!device_context->best_plugin)