ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "system property: property set without time spent asleep" am: 0f65650859

Browse source 
am: 2b4d5e6958

Change-Id: Ia82dbaf01943f29d4f50cc133137b62184b15860
This commit is contained in:
Tom Cherry 2018-01-04 17:16:03 +00:00 • committed by android-build-merger
commit daef77ed4c
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/property_service.cpp
View file

@ -350,13 +350,15 @@ class SocketConnection {
ufds[0].events = POLLIN;
ufds[0].revents = 0;
while (*timeout_ms > 0) {
Timer timer;
int nr = poll(ufds, 1, *timeout_ms);
uint64_t millis = timer.duration().count();
*timeout_ms = (millis > *timeout_ms) ? 0 : *timeout_ms - millis;
auto start_time = std::chrono::steady_clock::now();
int nr = poll(ufds, 1, *timeout_ms);
auto now = std::chrono::steady_clock::now();
auto time_elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);
uint64_t millis = time_elapsed.count();
*timeout_ms = (millis > *timeout_ms) ? 0 : *timeout_ms - millis;
if (nr > 0) {
return true;
if (nr > 0) {
return true;
}
if (nr == 0) {