Skip to content

Commit

Permalink
Improve new tst-abstime test.
Browse files Browse the repository at this point in the history
(cherry picked from commit 145569d)
  • Loading branch information
Ulrich Drepper authored and Andreas Schwab committed Dec 1, 2010
1 parent 66c60fc commit dcb52a4
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 14 deletions.
4 changes: 4 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2010-07-02 Ulrich Drepper <drepper@redhat.com>

* tst-abstime.c: Correct testing and add test for sem_timedwait.

2010-07-01 Andreas Schwab <schwab@redhat.com>
Ulrich Drepper <drepper@redhat.com>

Expand Down
57 changes: 43 additions & 14 deletions nptl/tst-abstime.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,76 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */

#include <assert.h>
#include <errno.h>
#include <pthread.h>
#include <semaphore.h>
#include <stdio.h>

pthread_cond_t c = PTHREAD_COND_INITIALIZER;
pthread_mutex_t m1 = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t m2 = PTHREAD_MUTEX_INITIALIZER;
pthread_rwlock_t rw1 = PTHREAD_RWLOCK_INITIALIZER;
pthread_rwlock_t rw2 = PTHREAD_RWLOCK_INITIALIZER;
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t m1 = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t m2 = PTHREAD_MUTEX_INITIALIZER;
static pthread_rwlock_t rw1 = PTHREAD_RWLOCK_INITIALIZER;
static pthread_rwlock_t rw2 = PTHREAD_RWLOCK_INITIALIZER;
static sem_t sem;

static void *
th (void *arg)
{
long int res = 0;
int r;
struct timespec t = { -2, 0 };

r = pthread_mutex_timedlock (&m1, &t);
assert (r == ETIMEDOUT);
if (r != ETIMEDOUT)
{
puts ("pthread_mutex_timedlock did not return ETIMEDOUT");
res = 1;
}
r = pthread_rwlock_timedrdlock (&rw1, &t);
assert (r == ETIMEDOUT);
if (r != ETIMEDOUT)
{
puts ("pthread_rwlock_timedrdlock did not return ETIMEDOUT");
res = 1;
}
r = pthread_rwlock_timedwrlock (&rw2, &t);
assert (r == ETIMEDOUT);
return 0;
if (r != ETIMEDOUT)
{
puts ("pthread_rwlock_timedwrlock did not return ETIMEDOUT");
res = 1;
}
return (void *) res;
}

int
static int
do_test (void)
{
int res = 0;
int r;
struct timespec t = { -2, 0 };
pthread_t pth;

sem_init (&sem, 0, 0);
r = sem_timedwait (&sem, &t);
if (r != -1 || errno != ETIMEDOUT)
{
puts ("sem_timedwait did not fail with ETIMEDOUT");
res = 1;
}

pthread_mutex_lock (&m1);
pthread_rwlock_wrlock (&rw1);
pthread_rwlock_rdlock (&rw2);
pthread_mutex_lock (&m2);
pthread_create (&pth, 0, th, 0);
r = pthread_cond_timedwait (&c, &m2, &t);
assert (r == ETIMEDOUT);
pthread_join (pth, 0);
return 0;
if (r != ETIMEDOUT)
{
puts ("pthread_cond_timedwait did not return ETIMEDOUT");
res = 1;
}
void *thres;
pthread_join (pth, &thres);
return res | (thres != NULL);
}


Expand Down

0 comments on commit dcb52a4

Please sign in to comment.