Changeset 3456

Timestamp:

Mar 16, 2011 9:22:24 AM (14 years ago)

Author:

ming

Message:

Fixed #1211: Add pjlib API pj_gettickcount() that returns a monotonically increasing timestamp

• Changed the timer_heap to use pj_gettickcount().
• Changed ioqueue to use pj_gettickcount().

Location:

pjproject/trunk/pjlib

Files:

• include/pj/os.h (modified) (1 diff)
• src/pj/ioqueue_epoll.c (modified) (2 diffs)
• src/pj/ioqueue_select.c (modified) (2 diffs)
• src/pj/ioqueue_winnt.c (modified) (2 diffs)
• src/pj/os_timestamp_common.c (modified) (1 diff)
• src/pj/os_timestamp_posix.c (modified) (3 diffs)
• src/pj/symbols.c (modified) (1 diff)
• src/pj/timer.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/os.h

@@ -1170 +1170 @@
 
 /**
+ * Get monotonic time since some unspecified starting point.
+ *
+ * @param tv    Variable to store the result.
+ *
+ * @return PJ_SUCCESS if successful.
+ */
+PJ_DECL(pj_status_t) pj_gettickcount(pj_time_val *tv);
+
+/**
  * Acquire high resolution timer value. The time value are stored
  * in cycles.

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

@@ -466 +466 @@
 
         pj_assert(key->closing == 1);
-        pj_gettimeofday(&key->free_time);
+        pj_gettickcount(&key->free_time);
         key->free_time.msec += PJ_IOQUEUE_KEY_FREE_DELAY;
         pj_time_val_normalize(&key->free_time);
@@ -584 +584 @@
     pj_ioqueue_key_t *h;
 
-    pj_gettimeofday(&now);
+    pj_gettickcount(&now);
     h = ioqueue->closing_list.next;
     while (h != &ioqueue->closing_list) {

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

@@ -412 +412 @@
 
         pj_assert(key->closing == 1);
-        pj_gettimeofday(&key->free_time);
+        pj_gettickcount(&key->free_time);
         key->free_time.msec += PJ_IOQUEUE_KEY_FREE_DELAY;
         pj_time_val_normalize(&key->free_time);
@@ -609 +609 @@
     pj_ioqueue_key_t *h;
 
-    pj_gettimeofday(&now);
+    pj_gettickcount(&now);
     h = ioqueue->closing_list.next;
     while (h != &ioqueue->closing_list) {

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

@@ -620 +620 @@
 
         pj_assert(key->closing == 1);
-        pj_gettimeofday(&key->free_time);
+        pj_gettickcount(&key->free_time);
         key->free_time.msec += PJ_IOQUEUE_KEY_FREE_DELAY;
         pj_time_val_normalize(&key->free_time);
@@ -875 +875 @@
         pj_ioqueue_key_t *key;
 
-        pj_gettimeofday(&now);
+        pj_gettickcount(&now);
         
         /* Move closing keys to free list when they've finished the closing

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

@@ -189 +189 @@
 }
 
+PJ_DEF(pj_status_t) pj_gettickcount(pj_time_val *tv)
+{
+    pj_timestamp ts, start;
+    pj_status_t status;
+
+    if ((status = pj_get_timestamp(&ts)) != PJ_SUCCESS)
+        return status;
+
+    pj_set_timestamp32(&start, 0, 0);
+    *tv = pj_elapsed_time(&start, &ts);
+
+    return PJ_SUCCESS;
+}
+
 #endif  /* PJ_HAS_HIGH_RES_TIMER */
 

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

@@ -25 +25 @@
 #include <ctype.h>
 
+#if defined(PJ_HAS_UNISTD_H) && PJ_HAS_UNISTD_H != 0
+#   include <unistd.h>
+
+#   if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && \
+       defined(_POSIX_MONOTONIC_CLOCK)
+#       define USE_POSIX_TIMERS 1
+#   endif
+
+#endif
+
 #if defined(PJ_HAS_PENTIUM) && PJ_HAS_PENTIUM!=0 && \
     defined(PJ_TIMESTAMP_USE_RDTSC) && PJ_TIMESTAMP_USE_RDTSC!=0 && \
@@ -111 +121 @@
 }
 
+#elif defined(PJ_DARWINOS) && PJ_DARWINOS != 0
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <errno.h>
+
+#define NSEC_PER_SEC    1000000000
+
+PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
+{
+    mach_timespec_t tp;
+    int ret;
+    clock_serv_t serv;
+
+    ret = host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &serv);
+    if (ret != KERN_SUCCESS) {
+        return PJ_RETURN_OS_ERROR(EINVAL);
+    }
+
+    ret = clock_get_time(serv, &tp);
+    if (ret != KERN_SUCCESS) {
+        return PJ_RETURN_OS_ERROR(EINVAL);
+    }
+
+    ts->u64 = tp.tv_sec;
+    ts->u64 *= NSEC_PER_SEC;
+    ts->u64 += tp.tv_nsec;
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_get_timestamp_freq(pj_timestamp *freq)
+{
+    freq->u32.hi = 0;
+    freq->u32.lo = NSEC_PER_SEC;
+
+    return PJ_SUCCESS;
+}
+
+#elif defined(USE_POSIX_TIMERS) && USE_POSIX_TIMERS != 0
+#include <sys/time.h>
+#include <errno.h>
+
+#define NSEC_PER_SEC    1000000000
+
+PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
+{
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) {
+        return PJ_RETURN_OS_ERROR(pj_get_native_os_error());
+    }
+
+    ts->u64 = tp.tv_sec;
+    ts->u64 *= NSEC_PER_SEC;
+    ts->u64 += tp.tv_nsec;
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_get_timestamp_freq(pj_timestamp *freq)
+{
+    freq->u32.hi = 0;
+    freq->u32.lo = NSEC_PER_SEC;
+
+    return PJ_SUCCESS;
+}
+
 #else
 #include <sys/time.h>
@@ -141 +218 @@
 
 #endif
-

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

@@ -198 +198 @@
 PJ_EXPORT_SYMBOL(pj_time_decode)
 #if defined(PJ_HAS_HIGH_RES_TIMER) && PJ_HAS_HIGH_RES_TIMER != 0
+PJ_EXPORT_SYMBOL(pj_gettickcount)
 PJ_EXPORT_SYMBOL(pj_get_timestamp)
 PJ_EXPORT_SYMBOL(pj_get_timestamp_freq)

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

@@ -466 +466 @@
     PJ_ASSERT_RETURN(entry->_timer_id < 1, PJ_EINVALIDOP);
 
-    pj_gettimeofday(&expires);
+    pj_gettickcount(&expires);
     PJ_TIME_VAL_ADD(expires, *delay);
     
@@ -504 +504 @@
 
     count = 0;
-    pj_gettimeofday(&now);
+    pj_gettickcount(&now);
 
     lock_timer_heap(ht);