Piteball/android_hardware_samsung
1
0
Fork 0
mirror of https://github.com/team-infusion-developers/android_hardware_samsung.git synced 2024-10-31 23:37:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

secril-client: close fds on I/O errors

Browse source 
if a kernel device returns an I/O error, it is better not to chew
the CPU resources retrying I/O operation on a not ready device.

Fixes periodical 100%-core load in audioserver after a voice call
completion.

Change-Id: I2b66ffd18c85823a11e50598a6b4e3c0245a0083
This commit is contained in:
Basil Gello 2017-07-18 22:00:01 +03:00 committed by Christopher N. Hesse
parent fb5669e851
commit 2a40024127
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ril/libsecril-client/secril-client.cpp
View file

@ -1141,6 +1141,12 @@ error:
FreeToken(&(client_prv->token_pool), token);
ClearReqHistory(client_prv, token);
if (ret == -EPIPE || ret == -EBADFD) {
close(client_prv->sock);
client_prv->sock = -1;
client_prv->b_connect = 0;
}
return RIL_CLIENT_ERR_UNKNOWN;
}
@ -1298,6 +1304,23 @@ static void * RxReaderFunc(void *param) {
client_prv->b_connect = 0;
}
}
} else {
RLOGE("%s: select() returned %d\n", __FUNCTION__, -errno);
if (client_prv->sock > 0) {
close(client_prv->sock);
client_prv->sock = -1;
client_prv->b_connect = 0;
}
if (client_prv->p_rs)
record_stream_free(client_prv->p_rs);
// EOS
if (client_prv->err_cb) {
client_prv->err_cb(client_prv->err_cb_data, RIL_CLIENT_ERR_CONNECT);
return NULL;
}
}
}