Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 12 Oct 2001 01:11:14 -0000
Message-ID: <20011012011114.78196.qmail@icarus.apache.org>
From: aaron@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/test testlock.c

aaron       01/10/11 18:11:14

  Modified:    test     testlock.c
  Log:
  New test for apr_thread_cond_timedwait().
  Sets the timer at 5 seconds. No signals are thrown. Measures the time
  that we were asleep.
  
  - If the timer comes back early with APR_TIMEUP, then it passes.
  - If it comes back more than 100ms late, it fails.
    (We may wish to fool with the timeout leeway, I think 100ms is pretty
     generous, especially since the timeout is supposed to be a maximum.)
  - If it comes back and there is no error, we try again (up to 5 times) since
    it was probably just a spurious wakeup.
  - If we get an error that is not APR_TIMEUP, it failed.
  
  Revision  Changes    Path
  1.11      +77 -0     apr/test/testlock.c
  
  Index: testlock.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testlock.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- testlock.c	2001/09/15 01:00:48	1.10
  +++ testlock.c	2001/10/12 01:11:14	1.11
  @@ -77,6 +77,7 @@
   
   #define MAX_ITER 40000
   #define MAX_COUNTER 100000
  +#define MAX_RETRY 5
   
   void * APR_THREAD_FUNC thread_rw_func(apr_thread_t *thd, void *data);
   void * APR_THREAD_FUNC thread_rwlock_func(apr_thread_t *thd, void *data);
  @@ -110,6 +111,9 @@
       int                nready;
   } nready;
   
  +apr_thread_mutex_t *timeout_mutex;
  +apr_thread_cond_t *timeout_cond;
  +
   void * APR_THREAD_FUNC thread_rw_func(apr_thread_t *thd, void *data)
   {
       int exitLoop = 1;
  @@ -564,6 +568,73 @@
       return APR_SUCCESS;
   }
   
  +apr_status_t test_timeoutcond(void)
  +{
  +    apr_status_t s;
  +    apr_interval_time_t timeout;
  +    apr_time_t begin, end;
  +    int i;
  +
  +    printf("thread_cond_timedwait Tests\n");
  +    printf("%-60s", "    Initializing the first apr_thread_mutex_t");
  +    s = apr_thread_mutex_create(&timeout_mutex, pool);
  +    if (s != APR_SUCCESS) {
  +        printf("Failed!\n");
  +        return s;
  +    }
  +    printf("OK\n");
  +
  +    printf("%-60s", "    Initializing the apr_thread_cond_t");
  +    s = apr_thread_cond_create(&timeout_cond, pool);
  +    if (s != APR_SUCCESS) {
  +        printf("Failed!\n");
  +        return s;
  +    }
  +    printf("OK\n");
  +
  +    timeout = 5 * APR_USEC_PER_SEC;
  +
  +    for (i = 0; i < MAX_RETRY; i++) {
  +        printf("%-60s","    Waiting for condition for 5 seconds"); 
  +
  +        begin = apr_time_now();
  +        s = apr_thread_cond_timedwait(timeout_cond, timeout_mutex, timeout);
  +        end = apr_time_now();
  +
  +        /* If we slept for more than 100ms over the timeout. */
  +        if (end - begin - timeout > 100000) {
  +            if (APR_STATUS_IS_TIMEUP(s)) {
  +                printf("Failed (late TIMEUP)!\n");
  +                printf("    The timer returned in %" APR_TIME_T_FMT " usec!\n",
  +                    end - begin);
  +                return s;
  +            }
  +            else if (s != APR_SUCCESS) {
  +                printf("Failed!\n");
  +                return s;
  +            }
  +        }
  +        /* else, everything is ok */
  +        else if (APR_STATUS_IS_TIMEUP(s)) {
  +            printf("OK\n");
  +            return APR_SUCCESS;
  +        }
  +        /* else, we were within the time limit, and something broke. */
  +        else if (s != APR_SUCCESS) {
  +            printf("Failed! (bad timer)\n");
  +            return s;
  +        }
  +        /* else, spurious wakeup, just try again. */
  +        else {
  +            printf("Spurious wakeup...retrying\n");
  +            continue;
  +        }
  +    }
  +    printf("Too many spurious wakeups, unable to complete test.\n");
  +
  +    return APR_EGENERAL;
  +}
  +
   int main(int argc, const char * const *argv)
   {
       apr_status_t rv;
  @@ -632,6 +703,12 @@
           fprintf(stderr,"thread_cond test failed : [%d] %s\n",
                   rv, apr_strerror(rv, (char*)errmsg, 200));
           exit(-7);
  +    }
  +
  +    if ((rv = test_timeoutcond()) != APR_SUCCESS) {
  +        fprintf(stderr,"thread_cond_timedwait test failed : [%d] %s\n",
  +                rv, apr_strerror(rv, (char*)errmsg, 200));
  +        exit(-8);
       }
   
       return 0;