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

Merge "loc timer util fix to handle the race condition"

Browse source
This commit is contained in:
Linux Build Service Account 2014-08-05 17:11:39 -07:00 committed by Gerrit - the friendly Code Review server
commit 2f1653763d
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
utils/loc_timer.c
View file

@ -101,12 +101,28 @@ static void *timer_thread(void *thread_data)
break; break;
} }
pthread_mutex_destroy(&t->timer_mutex);
pthread_cond_destroy(&t->timer_cond);
if(ETIMEDOUT == ret) if(ETIMEDOUT == ret)
t->callback_func(t->user_data, ret); t->callback_func(t->user_data, ret);
// A (should be rare) race condition is that, when the loc_time_stop is called
// and acquired mutex, we reach here. pthread_mutex_destroy will fail with
// error code EBUSY. We give it 6 tries in 5 seconds. Should be eanough time
// for loc_timer_stop to complete. With the 7th try, we also perform unlock
// prior to destroy.
{
int i;
for (i = 0; EBUSY == pthread_mutex_destroy(&t->timer_mutex) && i <= 5; i++) {
if (i < 5) {
sleep(1);
} else {
// nah, forget it, something is seriously wrong. Mutex has been
// held too long. Unlock the mutext here.
pthread_mutex_unlock(&t->timer_mutex);
}
}
}
pthread_cond_destroy(&t->timer_cond);
free(t); free(t);
LOC_LOGD("%s:%d]: Exit\n", __func__, __LINE__); LOC_LOGD("%s:%d]: Exit\n", __func__, __LINE__);
return NULL; return NULL;
@ -175,8 +191,8 @@ _err:
void loc_timer_stop(void* handle) { void loc_timer_stop(void* handle) {
timer_data* t = (timer_data*)handle; timer_data* t = (timer_data*)handle;
if (NULL != t && (READY == t->state || WAITING == t->state)) { if (NULL != t && (READY == t->state || WAITING == t->state) &&
pthread_mutex_lock(&(t->timer_mutex)); pthread_mutex_lock(&(t->timer_mutex)) == 0) {
if (READY == t->state || WAITING == t->state) { if (READY == t->state || WAITING == t->state) {
pthread_cond_signal(&t->timer_cond); pthread_cond_signal(&t->timer_cond);
t->state = ABORT; t->state = ABORT;