From: Jinhui Li Date: Thu, 24 Mar 2016 00:55:10 +0000 (+0800) Subject: reference-ril/atchannel.c: Fix time conversion X-Git-Tag: android-x86-7.1-r1~26 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=99f6a4e8fa12a6d54df5420aaa3eda29d9ba22a6;p=android-x86%2Fhardware-ril.git reference-ril/atchannel.c: Fix time conversion setTimespecRelative() converts a relative time to an absolute time, by adding the relative time to current system time. However, it fails to handle the case where the nanosecond component (tv_nsec) of the conversion result exceeds 10^9, which can cause a subsequent call to pthread_cond_timedwait() to return EINVAL. This bug is the root cause of the "no SIM card" error seen occasionally on x86_64 Android emulator. In fact, all 64-bit targets use setTimespecRelative() in conjunction with pthread_cond_timedwait() during AT handshake, but an EINVAL return value from the latter will lead to an infinite loop and hang the communication. With this fix, x86_64 emulator can boot with functional 3G networking every time. Signed-off-by: Jinhui Li [Revised code and commit message] Signed-off-by: Yu Ning (cherry picked from commit 11476211584f1a82c870b9486ace8f6f8bb9fc7c) Change-Id: I5d7396ef7f0af5ef02ccab785046d635fb8f168c --- diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c index f38545d..ac01cbc 100644 --- a/reference-ril/atchannel.c +++ b/reference-ril/atchannel.c @@ -86,6 +86,7 @@ static int writeCtrlZ (const char *s); static int writeline (const char *s); #ifndef USE_NP +#define NS_PER_S 1000000000 static void setTimespecRelative(struct timespec *p_ts, long long msec) { struct timeval tv; @@ -97,6 +98,11 @@ static void setTimespecRelative(struct timespec *p_ts, long long msec) a relative time again */ p_ts->tv_sec = tv.tv_sec + (msec / 1000); p_ts->tv_nsec = (tv.tv_usec + (msec % 1000) * 1000L ) * 1000L; + /* assuming tv.tv_usec < 10^6 */ + if (p_ts->tv_nsec >= NS_PER_S) { + p_ts->tv_sec++; + p_ts->tv_nsec -= NS_PER_S; + } } #endif /*USE_NP*/