Commit f5a16834 authored by André Almeida's avatar André Almeida Committed by Thomas Gleixner
Browse files

selftests/futex: Refactor futex_wait_wouldblock with kselftest_harness.h 



To reduce the boilerplate code, refactor futex_wait_wouldblock test to
use kselftest_harness header instead of futex's logging header.

Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0c02abf6

tools/testing/selftests/futex/functional/futex_wait_wouldblock.c

+23 −53
Original line number Diff line number Diff line
@@ -21,73 +21,45 @@ 
#include <stdlib.h>

#include <string.h>

#include <time.h>



#include "futextest.h"

#include "futex2test.h"

#include "logging.h"

#include "../../kselftest_harness.h"



#define TEST_NAME "futex-wait-wouldblock"

#define timeout_ns 100000



void usage(char *prog)

{

	printf("Usage: %s\n", prog);

	printf("  -c	Use color\n");

	printf("  -h	Display this help message\n");

	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",

	       VQUIET, VCRITICAL, VINFO);

}



int main(int argc, char *argv[])

TEST(futex_wait_wouldblock)

{

	struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns};

	futex_t f1 = FUTEX_INITIALIZER;

	int res, ret = RET_PASS;

	int c;

	struct futex_waitv waitv = {

			.uaddr = (uintptr_t)&f1,

			.val = f1+1,

			.flags = FUTEX_32,

			.__reserved = 0

		};



	while ((c = getopt(argc, argv, "cht:v:")) != -1) {

		switch (c) {

		case 'c':

			log_color(1);

			break;

		case 'h':

			usage(basename(argv[0]));

			exit(0);

		case 'v':

			log_verbosity(atoi(optarg));

			break;

		default:

			usage(basename(argv[0]));

			exit(1);

		}

	}



	ksft_print_header();

	ksft_set_plan(2);

	ksft_print_msg("%s: Test the unexpected futex value in FUTEX_WAIT\n",

	       basename(argv[0]));

	int res;



	info("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);

	ksft_print_dbg_msg("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);

	res = futex_wait(&f1, f1+1, &to, FUTEX_PRIVATE_FLAG);

	if (!res || errno != EWOULDBLOCK) {

		ksft_test_result_fail("futex_wait returned: %d %s\n",

				      res ? errno : res,

				      res ? strerror(errno) : "");

		ret = RET_FAIL;

	} else {

		ksft_test_result_pass("futex_wait\n");

	}



	if (clock_gettime(CLOCK_MONOTONIC, &to)) {

		error("clock_gettime failed\n", errno);

		return errno;

}



TEST(futex_waitv_wouldblock)

{

	struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns};

	futex_t f1 = FUTEX_INITIALIZER;

	struct futex_waitv waitv = {

		.uaddr		= (uintptr_t)&f1,

		.val		= f1 + 1,

		.flags		= FUTEX_32,

		.__reserved	= 0,

	};

	int res;



	if (clock_gettime(CLOCK_MONOTONIC, &to))

		ksft_exit_fail_msg("clock_gettime failed %d\n", errno);



	to.tv_nsec += timeout_ns;



	if (to.tv_nsec >= 1000000000) {
@@ -95,17 +67,15 @@ int main(int argc, char *argv[]) 
		to.tv_nsec -= 1000000000;

	}



	info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);

	ksft_print_dbg_msg("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);

	res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);

	if (!res || errno != EWOULDBLOCK) {

		ksft_test_result_fail("futex_waitv returned: %d %s\n",

				      res ? errno : res,

				      res ? strerror(errno) : "");

		ret = RET_FAIL;

	} else {

		ksft_test_result_pass("futex_waitv\n");

	}



	ksft_print_cnts();

	return ret;

}



TEST_HARNESS_MAIN

tools/testing/selftests/futex/functional/run.sh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ echo 
./futex_wait_timeout



echo

./futex_wait_wouldblock $COLOR

./futex_wait_wouldblock



echo

./futex_wait_uninitialized_heap $COLOR