Changeset 2805 for pjproject/branches/1.0/pjlib/src/pjlib-test/sleep.c

Timestamp:

Jun 25, 2009 12:29:04 PM (15 years ago)

Author:

bennylp

Message:

Ticket #765: Bug with milliseconds time resolution in WinCE/Windows Mobile targets (thanks Johan Lantz for the report)

• backported changes in #764

File:

• pjproject/branches/1.0/pjlib/src/pjlib-test/sleep.c (modified) (10 diffs)

pjproject/branches/1.0/pjlib/src/pjlib-test/sleep.c

@@ -56 +56 @@
 static int simple_sleep_test(void)
 {
-    enum { COUNT = 5 };
+    enum { COUNT = 10 };
     int i;
     pj_status_t rc;
@@ -63 +63 @@
     
     for (i=0; i<COUNT; ++i) {
+        pj_time_val tv;
+        pj_parsed_time pt;
+
         rc = pj_thread_sleep(1000);
         if (rc != PJ_SUCCESS) {
@@ -68 +71 @@
             return -10;
         }
-        PJ_LOG(3,(THIS_FILE, "...wake up.."));
+
+        rc = pj_gettimeofday(&tv);
+        if (rc != PJ_SUCCESS) {
+            app_perror("...error: pj_gettimeofday()", rc);
+            return -11;
+        }
+
+        pj_time_decode(&tv, &pt);
+
+        PJ_LOG(3,(THIS_FILE, 
+                  "...%04d-%02d-%02d %02d:%02d:%02d.%03d",
+                  pt.year, pt.mon, pt.day,
+                  pt.hour, pt.min, pt.sec, pt.msec));
+
     }
 
@@ -76 +92 @@
 static int sleep_duration_test(void)
 {
-    enum { MIS = 20, DURATION = 1000, DURATION2 = 500 };
+    enum { MIS = 20};
+    unsigned duration[] = { 2000, 1000, 500, 200, 100 };
+    unsigned i;
     pj_status_t rc;
 
@@ -82 +100 @@
 
     /* Test pj_thread_sleep() and pj_gettimeofday() */
-    {
+    for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) {
         pj_time_val start, stop;
         pj_uint32_t msec;
@@ -94 +112 @@
 
         /* Sleep */
-        rc = pj_thread_sleep(DURATION);
+        rc = pj_thread_sleep(duration[i]);
         if (rc != PJ_SUCCESS) {
             app_perror("...error: pj_thread_sleep()", rc);
@@ -110 +128 @@
 
         /* Check if it's within range. */
-        if (msec < DURATION * (100-MIS)/100 ||
-            msec > DURATION * (100+MIS)/100)
+        if (msec < duration[i] * (100-MIS)/100 ||
+            msec > duration[i] * (100+MIS)/100)
         {
             PJ_LOG(3,(THIS_FILE, 
                       "...error: slept for %d ms instead of %d ms "
                       "(outside %d%% err window)",
-                      msec, DURATION, MIS));
+                      msec, duration[i], MIS));
             return -30;
         }
@@ -123 +141 @@
 
     /* Test pj_thread_sleep() and pj_get_timestamp() and friends */
-    {
+    for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) {
         pj_time_val t1, t2;
         pj_timestamp start, stop;
@@ -141 +159 @@
 
         /* Sleep */
-        rc = pj_thread_sleep(DURATION2);
+        rc = pj_thread_sleep(duration[i]);
         if (rc != PJ_SUCCESS) {
             app_perror("...error: pj_thread_sleep()", rc);
@@ -163 +181 @@
 
         /* Check if it's within range. */
-        if (msec < DURATION2 * (100-MIS)/100 ||
-            msec > DURATION2 * (100+MIS)/100)
+        if (msec < duration[i] * (100-MIS)/100 ||
+            msec > duration[i] * (100+MIS)/100)
         {
             PJ_LOG(3,(THIS_FILE, 
                       "...error: slept for %d ms instead of %d ms "
                       "(outside %d%% err window)",
-                      msec, DURATION2, MIS));
+                      msec, duration[i], MIS));
             PJ_TIME_VAL_SUB(t2, t1);
             PJ_LOG(3,(THIS_FILE,