use new time conversion macros in place of APR_USEC_PER_SEC

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63565 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 15 insertions, 13 deletions

diff --git a/test/client.c b/test/client.c
index c1a2fe46b..98d502606 100644
--- a/test/client.c
+++ b/test/client.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
     char *local_ipaddr, *remote_ipaddr;
     char *dest = "127.0.0.1";
     apr_port_t local_port, remote_port;
-    apr_interval_time_t timeout = 2 * APR_USEC_PER_SEC;
+    apr_interval_time_t timeout = apr_time_from_sec(2);
     apr_sockaddr_t *local_sa, *remote_sa;
 
     setbuf(stdout, NULL);
diff --git a/test/testflock.c b/test/testflock.c
index 4f9ffe069..b1d0aa4fd 100644
--- a/test/testflock.c
+++ b/test/testflock.c
@@ -147,7 +147,7 @@ static void do_write(void)
     printf("Lock created.\nSleeping...");
     fflush(stdout);
 
-    apr_sleep(30 * APR_USEC_PER_SEC);
+    apr_sleep(apr_time_from_sec(30));
 
     (void) apr_file_close(file);
     printf(" done.\nExiting.\n");
diff --git a/test/testlock.c b/test/testlock.c
index 30a225759..d0996890d 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -395,7 +395,7 @@ apr_status_t test_timeoutcond(void)
     }
     printf("OK\n");
 
-    timeout = 5 * APR_USEC_PER_SEC;
+    timeout = apr_time_from_sec(5);
 
     for (i = 0; i < MAX_RETRY; i++) {
         apr_thread_mutex_lock(timeout_mutex);
diff --git a/test/testmutexscope.c b/test/testmutexscope.c
index 9b85b28e1..1893302f7 100644
--- a/test/testmutexscope.c
+++ b/test/testmutexscope.c
@@ -174,7 +174,7 @@ static void test_mech_mode(apr_lockmech_e mech, const char *mech_name,
     ++i;
   }
 
-  apr_sleep(5 * APR_USEC_PER_SEC);
+  apr_sleep(apr_time_from_sec(5));
 
   if (test_mode == TEST_PROC) {
       printf("  Mutex mechanism `%s' is %sglobal in scope on this platform.\n",
diff --git a/test/testoc.c b/test/testoc.c
index af228d36b..e5254533d 100644
--- a/test/testoc.c
+++ b/test/testoc.c
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 
     fprintf(stdout, "[PARENT] Sending SIGKILL to child......");
     fflush(stdout);
-    apr_sleep(1 * APR_USEC_PER_SEC);
+    apr_sleep(apr_time_from_sec(1));
     if ((rv = apr_proc_kill(&newproc, SIGKILL)) != APR_SUCCESS) {
         char msgbuf[120];
 
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
     fprintf(stdout,"OK\n");
     
     /* allow time for things to settle... */
-    apr_sleep(3 * APR_USEC_PER_SEC);
+    apr_sleep(apr_time_from_sec(3));
     
     fprintf(stdout, "[PARENT] Checking on children..........\n");
     apr_proc_other_child_check();
diff --git a/test/testpipe.c b/test/testpipe.c
index 7b5e8bdaf..8d57954b5 100644
--- a/test/testpipe.c
+++ b/test/testpipe.c
@@ -95,7 +95,7 @@ int main(void)
     }
     
     fprintf(stdout, "\tSetting pipe timeout.......");
-    if ((rv = apr_file_pipe_timeout_set(readp, 1 * APR_USEC_PER_SEC)) != APR_SUCCESS) {
+    if ((rv = apr_file_pipe_timeout_set(readp, apr_time_from_sec(1))) != APR_SUCCESS) {
         fprintf(stderr, "apr_file_pipe_timeout_set()->%d/%s\n",
                 rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
         exit(-1);
diff --git a/test/testshm.c b/test/testshm.c
index 347ec2a7b..bde95edb6 100644
--- a/test/testshm.c
+++ b/test/testshm.c
@@ -82,7 +82,8 @@ static void msgwait(int sleep_sec, int first_box, int last_box)
 {
     int i;
     apr_time_t start = apr_time_now();
-    while (apr_time_now() - start < sleep_sec * APR_USEC_PER_SEC) {
+    apr_interval_time_t sleep_duration = apr_time_from_sec(sleep_sec);
+    while (apr_time_now() - start < sleep_duration) {
         for (i = first_box; i < last_box; i++) {
             if (boxes[i].msgavail) {
                 fprintf(stdout, "received a message in box %d, message was: %s\n", 
@@ -90,7 +91,7 @@ static void msgwait(int sleep_sec, int first_box, int last_box)
                 boxes[i].msgavail = 0; /* reset back to 0 */
             }
         }
-        apr_sleep(1*APR_USEC_PER_SEC/100);
+        apr_sleep(apr_time_make(0, 10000)); /* 10ms */
     }
     fprintf(stdout, "done waiting on mailboxes...\n");
 }
@@ -157,7 +158,7 @@ static apr_status_t test_anon(apr_pool_t *parpool)
                 i += N_BOXES; /* start over at the top */
             }
             msgput(i, "Sending a message\n");
-            apr_sleep(1*APR_USEC_PER_SEC/100);
+            apr_sleep(apr_time_make(0, 10000));
         }
     }
     else {
diff --git a/test/testshmconsumer.c b/test/testshmconsumer.c
index d01467faa..673516624 100644
--- a/test/testshmconsumer.c
+++ b/test/testshmconsumer.c
@@ -81,7 +81,8 @@ static void msgwait(int sleep_sec, int first_box, int last_box)
 {
     int i;
     apr_time_t start = apr_time_now();
-    while (apr_time_now() - start < sleep_sec * APR_USEC_PER_SEC) {
+    apr_interval_time_t sleep_duration = apr_time_from_sec(sleep_sec);
+    while (apr_time_now() - start < sleep_duration) {
         for (i = first_box; i < last_box; i++) {
             if (boxes[i].msgavail) {
                 fprintf(stdout, "Consumer: received a message in box %d, message was: %s\n", 
@@ -89,7 +90,7 @@ static void msgwait(int sleep_sec, int first_box, int last_box)
                 boxes[i].msgavail = 0; /* reset back to 0 */
             }
         }
-        apr_sleep(1*APR_USEC_PER_SEC);
+        apr_sleep(apr_time_from_sec(1));
     }
     fprintf(stdout, "Consumer: done waiting on mailboxes...\n");
 }
diff --git a/test/testsleep.c b/test/testsleep.c
index 5d29fbb60..579a6866e 100644
--- a/test/testsleep.c
+++ b/test/testsleep.c
@@ -66,7 +66,7 @@
 static void do_sleep(int howlong)
 {
     apr_time_t then, now, diff;
-    apr_time_t interval = howlong * APR_USEC_PER_SEC;
+    apr_time_t interval = apr_time_from_sec(howlong);
 
     printf("    I'm about to go to sleep!\n");