OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2004-02-27  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/sysconf.c: Include stdlib.h.
This commit is contained in:
Ulrich Drepper 2004-02-28 10:18:58 +00:00
parent a2c33d5af3
commit 4c771a3b26
6 changed files with 290 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-02-27 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/sysconf.c: Include stdlib.h.
2004-02-26 Ulrich Drepper <drepper@redhat.com>
* nss/getXXbyYY_r.c: Pass result also to the nscd_* function. Don't

6
nptl/ChangeLog
View File

@ -1,3 +1,9 @@
2004-02-28 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-cond14 and tst-cond15.
* tst-cond14.c: New file.
* tst-cond15.c: New file.
2004-02-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/createthread.c (create_thread): Remove use of

1
nptl/Makefile
View File

@ -194,6 +194,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
tst-spin1 tst-spin2 tst-spin3 \
tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
tst-cond14 tst-cond15 \
tst-rwlock1 tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 \
tst-rwlock6 tst-rwlock7 tst-rwlock8 tst-rwlock9 tst-rwlock10 \
tst-rwlock11 tst-rwlock12 tst-rwlock13 \

118
nptl/tst-cond14.c Normal file
View File

@ -0,0 +1,118 @@
/* Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t mut = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
static pthread_mutex_t mut2 = PTHREAD_MUTEX_INITIALIZER;
static void *
tf (void *p)
{
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 1st mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 2nd mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 3rd mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_unlock (&mut2) != 0)
{
printf ("%s: mutex_unlock failed\n", __func__);
exit (1);
}
if (pthread_cond_wait (&cond, &mut) != 0)
{
printf ("%s: cond_wait failed\n", __func__);
exit (1);
}
puts ("child: done");
return NULL;
}
static int
do_test (void)
{
if (pthread_mutex_lock (&mut2) != 0)
{
puts ("1st mutex_lock failed");
return 1;
}
puts ("parent: create child");
pthread_t th;
int err = pthread_create (&th, NULL, tf, NULL);
if (err != 0)
{
printf ("parent: cannot create thread: %s\n", strerror (err));
return 1;
}
/* We have to synchronize with the child. */
if (pthread_mutex_lock (&mut2) != 0)
{
puts ("2nd mutex_lock failed");
return 1;
}
/* Give the child to reach to pthread_cond_wait. */
sleep (1);
if (pthread_cond_signal (&cond) != 0)
{
puts ("cond_signal failed");
return 1;
}
err = pthread_join (th, NULL);
if (err != 0)
{
printf ("parent: failed to join: %s\n", strerror (err));
return 1;
}
puts ("done");
return 0;
}
#define TEST_FUNCTION do_test ()
#define TIMEOUT 3
#include "../test-skeleton.c"

160
nptl/tst-cond15.c Normal file
View File

@ -0,0 +1,160 @@
/* Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/time.h>
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t mut = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
static pthread_mutex_t mut2 = PTHREAD_MUTEX_INITIALIZER;
static void *
tf (void *p)
{
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 1st mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 2nd mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_lock (&mut) != 0)
{
printf ("%s: 3rd mutex_lock failed\n", __func__);
exit (1);
}
if (pthread_mutex_unlock (&mut2) != 0)
{
printf ("%s: mutex_unlock failed\n", __func__);
exit (1);
}
struct timeval tv;
gettimeofday (&tv, NULL);
struct timespec ts;
TIMEVAL_TO_TIMESPEC (&tv, &ts);
ts.tv_sec += p == NULL ? 100 : 1;
int err = pthread_cond_timedwait (&cond, &mut, &ts);
if ((err != 0 && p == NULL) || (err != ETIMEDOUT && p != NULL))
{
printf ("%s: cond_wait failed\n", __func__);
exit (1);
}
if (pthread_mutex_unlock (&mut) != 0)
{
printf ("%s: 1st mutex_unlock failed\n", __func__);
exit (1);
}
if (pthread_mutex_unlock (&mut) != 0)
{
printf ("%s: 2nd mutex_unlock failed\n", __func__);
exit (1);
}
if (pthread_mutex_unlock (&mut) != 0)
{
printf ("%s: 3rd mutex_unlock failed\n", __func__);
exit (1);
}
puts ("child: done");
return NULL;
}
static int
do_test (void)
{
if (pthread_mutex_lock (&mut2) != 0)
{
puts ("1st mutex_lock failed");
return 1;
}
puts ("parent: create 1st child");
pthread_t th;
int err = pthread_create (&th, NULL, tf, NULL);
if (err != 0)
{
printf ("parent: cannot 1st create thread: %s\n", strerror (err));
return 1;
}
/* We have to synchronize with the child. */
if (pthread_mutex_lock (&mut2) != 0)
{
puts ("2nd mutex_lock failed");
return 1;
}
/* Give the child to reach to pthread_cond_wait. */
sleep (1);
if (pthread_cond_signal (&cond) != 0)
{
puts ("cond_signal failed");
return 1;
}
err = pthread_join (th, NULL);
if (err != 0)
{
printf ("parent: failed to join: %s\n", strerror (err));
return 1;
}
puts ("parent: create 2nd child");
err = pthread_create (&th, NULL, tf, (void *) 1l);
if (err != 0)
{
printf ("parent: cannot 2nd create thread: %s\n", strerror (err));
return 1;
}
err = pthread_join (th, NULL);
if (err != 0)
{
printf ("parent: failed to join: %s\n", strerror (err));
return 1;
}
puts ("done");
return 0;
}
#define TEST_FUNCTION do_test ()
#define TIMEOUT 6
#include "../test-skeleton.c"

1
sysdeps/unix/sysv/linux/sysconf.c
View File

@ -18,6 +18,7 @@
02111-1307 USA. */
#include <fcntl.h>
#include <stdlib.h>
#include <sysdep.h>
#include <time.h>
#include <unistd.h>