From 35bd60b4c0eb40e3f7aee9252214a975e722cc6b Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 13 Dec 2005 16:55:21 +0000
Subject: [PATCH] Change affinity test to use config.h
---
testsuite/expect/test1.89.prog.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/testsuite/expect/test1.89.prog.c b/testsuite/expect/test1.89.prog.c
index 563a6ec5c36..a8e0c763876 100644
--- a/testsuite/expect/test1.89.prog.c
+++ b/testsuite/expect/test1.89.prog.c
@@ -5,32 +5,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <gnu/libc-version.h>
+#include "../../config.h"
static void _load_mask(cpu_set_t *mask)
{
- int rc, affinity_args = 3;
- int (*fptr_sched_getaffinity)() = sched_getaffinity;
+ int rc;
-#if defined __GLIBC__
- const char *glibc_vers = gnu_get_libc_version();
- if (glibc_vers != NULL) {
- int scnt = 0, major = 0, minor = 0, point = 0;
- scnt = sscanf (glibc_vers, "%d.%d.%d", &major,
- &minor, &point);
- if (scnt == 3) {
- if ((major <= 2) && (minor <= 3) && (point <= 2)) {
- affinity_args = 2;
- }
- }
- }
+#ifdef SCHED_GETAFFINITY_THREE_ARGS
+ rc = sched_getaffinity((pid_t) 0, (unsigned int) sizeof(cpu_set_t),
+ mask);
+#else
+ rc = sched_getaffinity((pid_t) 0, mask);
#endif
- if (affinity_args == 3) {
- rc = (*fptr_sched_getaffinity)((pid_t) 0,
- (unsigned int) sizeof(cpu_set_t), mask);
- } else {
- rc = (*fptr_sched_getaffinity)((pid_t) 0, mask);
- }
if (rc != 0) {
fprintf(stderr, "ERROR: sched_getaffinity: %s\n",
strerror(errno));
--
GitLab