MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix threading problem that resulted in the wakelock being held too long.

Browse source 
In some circumstances we were calling wait after we had been signalled, causing
us to wait until we are signalled again (while holding a wakelock).
Now we only want to wait in the deferred action thread if no events are pending
and only hold the wakelock while not waiting.

BUG: 3127617

Change-Id: I4c6886b2bbdcbcb2c0cf348d89bc5408f0d875b9
Signed-off-by: Mike Lockwood <lockwood@google.com>
This commit is contained in:
Mike Lockwood 2010-10-27 14:53:57 -04:00
parent 0b602e40b8
commit a162c43519
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
loc_api/libloc_api/loc_eng.cpp
View file

@ -1449,11 +1449,17 @@ static void loc_eng_process_deferred_action (void* arg)
// Wait until we are signalled to do a deferred action, or exit // Wait until we are signalled to do a deferred action, or exit
pthread_mutex_lock(&loc_eng_data.deferred_action_mutex); pthread_mutex_lock(&loc_eng_data.deferred_action_mutex);
if (loc_eng_data.deferred_action_flags == 0) // If we have an event we should process it immediately,
// otherwise wait until we are signalled
if (loc_eng_data.deferred_action_flags == 0) {
// do not hold a wake lock while waiting for an event...
loc_eng_data.release_wakelock_cb(); loc_eng_data.release_wakelock_cb();
pthread_cond_wait(&loc_eng_data.deferred_action_cond,
pthread_cond_wait(&loc_eng_data.deferred_action_cond, &loc_eng_data.deferred_action_mutex);
&loc_eng_data.deferred_action_mutex); // but after we are signalled reacquire the wake lock
// until we are done processing the event.
loc_eng_data.acquire_wakelock_cb();
}
if (loc_eng_data.deferred_action_flags & DEFERRED_ACTION_QUIT) if (loc_eng_data.deferred_action_flags & DEFERRED_ACTION_QUIT)
{ {