Changeset 5865 for pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c

Timestamp:

Aug 23, 2018 4:42:29 AM (6 years ago)

Author:

ming

Message:

Fixed #2140: Timestamp clock issue when device is asleep in iOS

File:

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

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

@@ -122 +122 @@
 
 #elif defined(PJ_DARWINOS) && PJ_DARWINOS != 0
-#include <mach/mach.h>
-#include <mach/clock.h>
-#include <errno.h>
+
+/* SYSTEM_CLOCK will stop when the device is in deep sleep, so we use
+ * KERN_BOOTTIME instead. 
+ * See ticket #2140 for more details.
+ */
+#define USE_KERN_BOOTTIME 1
+
+#if USE_KERN_BOOTTIME
+#   include <sys/sysctl.h>
+#else
+#   include <mach/mach.h>
+#   include <mach/clock.h>
+#   include <errno.h>
+#endif
 
 #ifndef NSEC_PER_SEC
@@ -130 +141 @@
 #endif
 
-PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
-{
+#if USE_KERN_BOOTTIME
+static int64_t get_boottime()
+{
+    struct timeval boottime;
+    int mib[2] = {CTL_KERN, KERN_BOOTTIME};
+    size_t size = sizeof(boottime);
+    int rc;
+
+    rc = sysctl(mib, 2, &boottime, &size, NULL, 0);
+    if (rc != 0)
+      return 0;
+
+    return (int64_t)boottime.tv_sec * 1000000 + (int64_t)boottime.tv_usec;
+}
+#endif
+
+PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
+{
+#if USE_KERN_BOOTTIME
+    int64_t before_now, after_now;
+    struct timeval now;
+
+    after_now = get_boottime();
+    do {
+        before_now = after_now;
+        gettimeofday(&now, NULL);
+        after_now = get_boottime();
+    } while (after_now != before_now);
+
+    ts->u64 = (int64_t)now.tv_sec * 1000000 + (int64_t)now.tv_usec;
+    ts->u64 -= before_now;
+    ts->u64 *= 1000;
+#else
     mach_timespec_t tp;
     int ret;
@@ -149 +191 @@
     ts->u64 *= NSEC_PER_SEC;
     ts->u64 += tp.tv_nsec;
+#endif
 
     return PJ_SUCCESS;