X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ffunctional%2Fpthread_robust.c;h=44f846fbb41009b2918c85b25f1e97d37eabd492;hb=HEAD;hp=0c4ce8d82b85464eb5966e84184a9704bd931339;hpb=08cb396fb7dbb632c49b0893a8e116269f195844;p=libc-test

diff --git a/src/functional/pthread_robust.c b/src/functional/pthread_robust.c
index 0c4ce8d..44f846f 100644
--- a/src/functional/pthread_robust.c
+++ b/src/functional/pthread_robust.c
@@ -4,9 +4,9 @@
 #include "test.h"
 
 #define TEST(r, f, m) ( \
-	((r) = (f)) == 0 || (error("%s failed: %s (" m ")\n", #f, strerror(r)), 0) )
+	((r) = (f)) == 0 || (t_error("%s failed: (pshared==%d, pi==%d) %s (" m ")\n", #f, pshared, pi, strerror(r)), 0) )
 #define TESTX(r, f, x, m) ( \
-	((r) = (f)) == (x) || (error("%s failed: got %d \"%s\" want %d \"%s\" (" m ")\n", #f, r, strerror(r), x, strerror(x)), 0) )
+	((r) = (f)) == (x) || (t_error("%s failed: (pshared==%d, pi==%d) got %d \"%s\" want %d \"%s\" (" m ")\n", #f, pshared, pi, r, strerror(r), x, strerror(x)), 0) )
 
 static void *start_lock(void *arg)
 {
@@ -23,7 +23,7 @@ static void *start_wait(void *arg)
 	return 0;
 }
 
-int main(void)
+void f(int pshared, int pi)
 {
 	pthread_t td;
 	int r;
@@ -37,6 +37,10 @@ int main(void)
 	/* Robust mutexes */
 	TEST(r, pthread_mutexattr_init(&mtx_a), "initializing mutex attr");
 	TEST(r, pthread_mutexattr_setrobust(&mtx_a, PTHREAD_MUTEX_ROBUST), "setting robust attribute");
+	if (pshared)
+		TEST(r, pthread_mutexattr_setpshared(&mtx_a, PTHREAD_PROCESS_SHARED), "setting pshared attribute");
+	if (pi)
+		TEST(r, pthread_mutexattr_setprotocol(&mtx_a, PTHREAD_PRIO_INHERIT), "setting PI attribute");
 	TEST(r, pthread_mutex_init(&mtx, &mtx_a), "initializing robust mutex");
 	TEST(r, pthread_mutex_lock(&mtx), "locking robust mutex");
 	TEST(r, pthread_mutex_unlock(&mtx), "unlocking robust mutex");
@@ -60,13 +64,20 @@ int main(void)
 	TEST(r, pthread_create(&td, 0, start_wait, (void *[]){ &barrier2, &mtx }), "");
 	r = pthread_barrier_wait(&barrier2);
 	if (r && r != PTHREAD_BARRIER_SERIAL_THREAD)
-		error("pthread_barrier_wait failed: got %d \"%s\", wanted either 0 or %d\n",
+		t_error("pthread_barrier_wait failed: got %d \"%s\", wanted either 0 or %d\n",
 			r, strerror(r), PTHREAD_BARRIER_SERIAL_THREAD);
+	TEST(r, pthread_barrier_destroy(&barrier2), "");
 	TESTX(r, pthread_mutex_lock(&mtx), EOWNERDEAD, "");
 	TEST(r, pthread_join(td, &res), "");
 	TEST(r, pthread_mutex_consistent(&mtx), "");
 	TEST(r, pthread_mutex_unlock(&mtx), "");
 	TEST(r, pthread_mutex_destroy(&mtx), "");
+}
 
-	return test_status;
+int main(void)
+{
+	for (int pshared=0; pshared<=1; pshared++)
+		for (int pi=0; pi<=1; pi++)
+			f(pshared, pi);
+	return t_status;
 }