File opeposix-pthread_barrierattr_getpshared-2-1-Sim... of Package ltp-stable

Overview Repositories Revisions Requests Users Attributes Meta

File opeposix-pthread_barrierattr_getpshared-2-1-Simplify.patch of Package ltp-stable (Revision 05f601d488c9adbbb0cf7f2637d0ea23)

Currently displaying revision 05f601d488c9adbbb0cf7f2637d0ea23 , Show latest

From a4ac0a30f773a1568a7ff4c8c56fe6816fe9688a Mon Sep 17 00:00:00 2001
From: Cyril Hrubis <chrubis@suse.cz>
Date: Mon, 20 Jun 2022 11:21:46 +0200
Subject: [PATCH 7/7] opeposix: pthread_barrierattr_getpshared/2-1: Simplify
 codeflow

This actually fixes a 'no return in nonvoid function' warning since gcc
may get confused during the codeflow analysis.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Reviewed-by: Li Wang <liwang@redhat.com>
Reviewed-by: Martin Doucha <mdoucha@suse.cz>
Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>
---
 .../pthread_barrierattr_getpshared/2-1.c      | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_barrierattr_getpshared/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_barrierattr_getpshared/2-1.c
index a21a5a507..a2e568460 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_barrierattr_getpshared/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_barrierattr_getpshared/2-1.c
@@ -141,7 +141,9 @@ int main(void)
 	if (pid == -1) {
 		perror("Error at fork()");
 		return PTS_UNRESOLVED;
-	} else if (pid == 0) {
+	}
+
+	if (pid == 0) {
 		/* Child */
 		/* Map the shared object to child's memory */
 		barrier =
@@ -175,44 +177,40 @@ int main(void)
 
 	}
 
-	if (pid > 0) {
-		/* parent */
-		if (wait(&status) != pid) {
-			printf("parent: error at waitpid()\n");
-			return PTS_UNRESOLVED;
-		}
+	if (pid == 0)
+		return serial;
 
-		if (!WIFEXITED(status)) {
-			printf("Child exited abnormally\n");
-			return PTS_UNRESOLVED;
-		}
-
-		if ((WEXITSTATUS(status) + serial) != LOOP_NUM) {
-			printf("status = %d\n", status);
-			printf("serial = %d\n", serial);
-			printf
-			    ("Test FAILED: One of the two processes should get "
-			     "PTHREAD_BARRIER_SERIAL_THREAD\n");
-			return PTS_FAIL;
-		}
+	/* parent */
+	if (wait(&status) != pid) {
+		printf("parent: error at waitpid()\n");
+		return PTS_UNRESOLVED;
+	}
 
-		/* Cleanup */
-		if (pthread_barrier_destroy(barrier) != 0) {
-			printf("Error at pthread_barrier_destroy()\n");
-			return PTS_UNRESOLVED;
-		}
+	if (!WIFEXITED(status)) {
+		printf("Child exited abnormally\n");
+		return PTS_UNRESOLVED;
+	}
 
-		if ((shm_unlink(shm_name)) != 0) {
-			perror("Error at shm_unlink()");
-			return PTS_UNRESOLVED;
-		}
+	if ((WEXITSTATUS(status) + serial) != LOOP_NUM) {
+		printf("status = %d\n", status);
+		printf("serial = %d\n", serial);
+		printf
+		    ("Test FAILED: One of the two processes should get "
+		     "PTHREAD_BARRIER_SERIAL_THREAD\n");
+		return PTS_FAIL;
+	}
 
-		printf("Test PASSED\n");
-		return PTS_PASS;
+	/* Cleanup */
+	if (pthread_barrier_destroy(barrier) != 0) {
+		printf("Error at pthread_barrier_destroy()\n");
+		return PTS_UNRESOLVED;
 	}
 
-	if (pid == 0) {
-		exit(serial);
+	if ((shm_unlink(shm_name)) != 0) {
+		perror("Error at shm_unlink()");
+		return PTS_UNRESOLVED;
 	}
 
+	printf("Test PASSED\n");
+	return PTS_PASS;
 }
-- 
2.34.1

Places

File opeposix-pthread_barrierattr_getpshared-2-1-Simplify.patch of Package ltp-stable (Revision 05f601d488c9adbbb0cf7f2637d0ea23)

Places