AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Write messages to stdout and use write_message instead of write

Browse Source 
Replaces calls to write on file descriptor 2 with calls to write_message,
which writes to STDOUT_FILENO (1) and properly deals with the return of
write.
This commit is contained in:
Gabriel F. T. Gomes 2016-10-31 22:09:12 -02:00
parent d5b3879095
commit e0c6851980
9 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
2016-11-07 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
* nptl/tst-basic1.c (tf, do_test): Use write_message.
* nptl/tst-cleanup1.c (do_test): Likewise.
* nptl/tst-cleanup3.c (do_test): Likewise.
* nptl/tst-key1.c (do_test): Likewise.
* nptl/tst-key2.c (tf, do_test): Likewise.
* nptl/tst-key3.c (tf, do_test): Likewise.
* nptl/tst-stdio1.c (do_test): Likewise.
* nptl/tst-stdio2.c (do_test): Likewise.
* nptl/tst-kill3.c (handler): Use write_message in place of write.
* nptl/tst-kill6.c (handler): Likewise.
* nptl/tst-tls2.c (CB): Likewise.

15
nptl/tst-basic1.c
View File

@ -22,6 +22,11 @@
#include <sys/types.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static pid_t pid;
static void *
@ -29,7 +34,7 @@ tf (void *a)
{
if (getpid () != pid)
{
write (2, "pid mismatch\n", 13);
write_message ("pid mismatch\n");
_exit (1);
}
@ -49,7 +54,7 @@ do_test (void)
for (i = 0; i < N; ++i)
if (pthread_create (&t[i], NULL, tf, (void *) (long int) (i + 1)) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
else
@ -66,7 +71,7 @@ do_test (void)
}
else if (r != (void *) (long int) (i + 1))
{
write (2, "result wrong\n", 13);
write_message ("result wrong\n");
_exit (1);
}
else
@ -75,7 +80,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

11
nptl/tst-cleanup1.c
View File

@ -22,6 +22,11 @@
#include <unistd.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static int global;
@ -67,7 +72,7 @@ do_test (void)
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
@ -93,7 +98,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

11
nptl/tst-cleanup3.c
View File

@ -22,6 +22,11 @@
#include <unistd.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static int global;
@ -65,7 +70,7 @@ do_test (void)
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
@ -91,7 +96,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

11
nptl/tst-key1.c
View File

@ -23,6 +23,11 @@
#include <unistd.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
int
do_test (void)
{
@ -38,7 +43,7 @@ do_test (void)
for (i = 0; i < max; ++i)
if (pthread_key_create (&keys[i], NULL) != 0)
{
write (2, "key_create failed\n", 18);
write_message ("key_create failed\n");
_exit (1);
}
else
@ -82,7 +87,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

23
nptl/tst-key2.c
View File

@ -23,6 +23,11 @@
#define N 2
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static int cnt0;
static void
f0 (void *p)
@ -53,7 +58,7 @@ tf (void *arg)
if (pthread_setspecific (*key, (void *) -1l) != 0)
{
write (2, "setspecific failed\n", 19);
write_message ("setspecific failed\n");
_exit (1);
}
@ -70,45 +75,41 @@ do_test (void)
for (i = 0; i < N; ++i)
if (pthread_key_create (&keys[i], fcts[i]) != 0)
{
write (2, "key_create failed\n", 18);
write_message ("key_create failed\n");
_exit (1);
}
pthread_t th;
if (pthread_create (&th, NULL, tf, &keys[1]) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
if (pthread_join (th, NULL) != 0)
{
write (2, "join failed\n", 12);
write_message ("join failed\n");
_exit (1);
}
if (cnt0 != 0)
{
write (2, "cnt0 != 0\n", 10);
write_message ("cnt0 != 0\n");
_exit (1);
}
if (cnt1 != 1)
{
write (2, "cnt1 != 1\n", 10);
write_message ("cnt1 != 1\n");
_exit (1);
}
for (i = 0; i < N; ++i)
if (pthread_key_delete (keys[i]) != 0)
{
write (2, "key_delete failed\n", 18);
write_message ("key_delete failed\n");
_exit (1);
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

31
nptl/tst-key3.c
View File

@ -23,6 +23,11 @@
#define N 2
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static int cnt0;
static void
f0 (void *p)
@ -56,7 +61,7 @@ tf (void *arg)
if (pthread_setspecific (*key, (void *) -1l) != 0)
{
write (2, "setspecific failed\n", 19);
write_message ("setspecific failed\n");
_exit (1);
}
@ -80,20 +85,20 @@ do_test (void)
for (i = 0; i < N; ++i)
if (pthread_key_create (&keys[i], fcts[i]) != 0)
{
write (2, "key_create failed\n", 18);
write_message ("key_create failed\n");
_exit (1);
}
if (pthread_barrier_init (&b, NULL, 2) != 0)
{
write (2, "barrier_init failed\n", 20);
write_message ("barrier_init failed\n");
_exit (1);
}
pthread_t th;
if (pthread_create (&th, NULL, tf, &keys[1]) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
@ -101,20 +106,20 @@ do_test (void)
if (pthread_cancel (th) != 0)
{
write (2, "cancel failed\n", 14);
write_message ("cancel failed\n");
_exit (1);
}
void *status;
if (pthread_join (th, &status) != 0)
{
write (2, "join failed\n", 12);
write_message ("join failed\n");
_exit (1);
}
if (status != PTHREAD_CANCELED)
{
write (2, "thread not canceled\n", 20);
write_message ("thread not canceled\n");
_exit (1);
}
@ -124,32 +129,28 @@ do_test (void)
have run and therefore these tests succeed. */
if (cnt0 != 0)
{
write (2, "cnt0 != 0\n", 10);
write_message ("cnt0 != 0\n");
_exit (1);
}
if (cnt1 != 1)
{
write (2, "cnt1 != 1\n", 10);
write_message ("cnt1 != 1\n");
_exit (1);
}
for (i = 0; i < N; ++i)
if (pthread_key_delete (keys[i]) != 0)
{
write (2, "key_delete failed\n", 18);
write_message ("key_delete failed\n");
_exit (1);
}
if (pthread_barrier_destroy (&b) != 0)
{
write (2, "barrier_destroy failed\n", 23);
write_message ("barrier_destroy failed\n");
_exit (1);
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

2
nptl/tst-stdio1.c
View File

@ -43,7 +43,7 @@ do_test (void)
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}

11
nptl/tst-stdio2.c
View File

@ -23,6 +23,11 @@
#include <unistd.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static void *tf (void *a)
{
puts ("start tf");
@ -55,7 +60,7 @@ do_test (void)
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
write_message ("create failed\n");
_exit (1);
}
@ -75,7 +80,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"