depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fpi-ssm: Improve debugging of SSM using driver infos

Browse source 
Always mention the driver that is triggering it
This commit is contained in:
Marco Trevisan (Treviño) 2019-12-04 20:14:16 +01:00
parent 65828e0e56
commit a522e3fd6f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libfprint/fpi-ssm.c
View file

@ -278,7 +278,8 @@ fpi_ssm_free (FpiSsm *machine)
static void static void
__ssm_call_handler (FpiSsm *machine) __ssm_call_handler (FpiSsm *machine)
{ {
fp_dbg ("%s entering state %d", machine->name, machine->cur_state); fp_dbg ("[%s] %s entering state %d", fp_device_get_driver (machine->dev),
machine->name, machine->cur_state);
machine->handler (machine, machine->dev); machine->handler (machine, machine->dev);
} }
@ -356,9 +357,11 @@ fpi_ssm_mark_completed (FpiSsm *machine)
machine->completed = TRUE; machine->completed = TRUE;
if (machine->error) if (machine->error)
fp_dbg ("%s completed with error: %s", machine->name, machine->error->message); fp_dbg ("[%s] %s completed with error: %s", fp_device_get_driver (machine->dev),
machine->name, machine->error->message);
else else
fp_dbg ("%s completed successfully", machine->name); fp_dbg ("[%s] %s completed successfully", fp_device_get_driver (machine->dev),
machine->name);
if (machine->callback) if (machine->callback)
{ {
GError *error = machine->error ? g_error_copy (machine->error) : NULL; GError *error = machine->error ? g_error_copy (machine->error) : NULL;
@ -421,12 +424,15 @@ fpi_ssm_mark_failed (FpiSsm *machine, GError *error)
g_assert (error); g_assert (error);
if (machine->error) if (machine->error)
{ {
fp_warn ("SSM already has an error set, ignoring new error %s", error->message); fp_warn ("[%s] SSM %s already has an error set, ignoring new error %s",
fp_device_get_driver (machine->dev), machine->name, error->message);
g_error_free (error); g_error_free (error);
return; return;
} }
fp_dbg ("SSM failed in state %d with error: %s", machine->cur_state, error->message); fp_dbg ("[%s] SSM %s failed in state %d with error: %s",
fp_device_get_driver (machine->dev), machine->name,
machine->cur_state, error->message);
machine->error = g_steal_pointer (&error); machine->error = g_steal_pointer (&error);
fpi_ssm_mark_completed (machine); fpi_ssm_mark_completed (machine);
} }