diff options
| author |  Nikias Bassen | 2019-10-11 23:08:48 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2019-10-11 23:10:07 +0200 |
| commit | 767fcceaeb456f5e281a6bd1b3f51713e4989293 (patch) | |
| tree | d9a01fbea3c1a85f41ca0f033037737739a14629 /src/recovery.c | |
| parent | 75a61508bd3c2013492744fb5aea755e19b01086 (diff) | |
| download | idevicerestore-767fcceaeb456f5e281a6bd1b3f51713e4989293.tar.gz idevicerestore-767fcceaeb456f5e281a6bd1b3f51713e4989293.tar.bz2 | |
Use condition variable instead of active waiting for device event handling
With some devices and USB hardware the reconnect of a device might actually
be faster than the check interval of the active waiting loop. With mutexes
and a condition variable we will not miss the moment of reconnect anymore,
even if it is really quick (like 7ms, right DanyL?)
Diffstat (limited to 'src/recovery.c')
| -rw-r--r-- | src/recovery.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/recovery.c b/src/recovery.c index 4a1e819..88eeab5 100644 --- a/src/recovery.c +++ b/src/recovery.c @@ -226,17 +226,21 @@ int recovery_enter_restore(struct idevicerestore_client_t* client, plist_t build return -1; } + mutex_lock(&client->device_event_mutex); if (recovery_send_kernelcache(client, build_identity) < 0) { + mutex_unlock(&client->device_event_mutex); error("ERROR: Unable to send KernelCache\n"); return -1; } debug("DEBUG: Waiting for device to disconnect...\n"); - WAIT_FOR(client->mode != &idevicerestore_modes[MODE_RECOVERY] || (client->flags & FLAG_QUIT), 30); + cond_wait_timeout(&client->device_event_cond, &client->device_event_mutex, 30000); if (client->mode == &idevicerestore_modes[MODE_RECOVERY] || (client->flags & FLAG_QUIT)) { + mutex_unlock(&client->device_event_mutex); error("ERROR: Failed to place device in restore mode\n"); return -1; } + mutex_unlock(&client->device_event_mutex); return 0; } |