Changeset 5482 for pjproject

Timestamp:

Nov 15, 2016 2:23:38 AM (8 years ago)

Author:

ming

Message:

Re #1961: Fallback to CLOCK_MONOTONIC if /dev/alarm is not found, or getting ANDROID_ALARM_ELAPSED_REALTIME fails.

File:

• pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c

@@ -181 +181 @@
 {
     struct timespec tp;
+    int err = -1;
 
     if (s_alarm_fd == -1) {
@@ -187 +188 @@
             s_alarm_fd = fd;
             pj_atexit(&close_alarm_fd);
-        } else {
-            return PJ_RETURN_OS_ERROR(pj_get_native_os_error());                
-        }
-    }
-    int err = ioctl(s_alarm_fd,
-            ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &tp);
+        }
+    }
+    
+    if (s_alarm_fd != -1) {
+        err = ioctl(s_alarm_fd,
+              ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &tp);
+    }
+    
+    if (err != 0) {
+        /* Fallback to CLOCK_MONOTONIC if /dev/alarm is not found, or
+         * getting ANDROID_ALARM_ELAPSED_REALTIME fails.
+         */
+        err = clock_gettime(CLOCK_MONOTONIC, &tp);
+    }
 
     if (err != 0) {