From: Daniel Wagner <dwagner@suse.de>
To: Clark Williams <williams@redhat.com>, John Kacur <jkacur@redhat.com>
Cc: linux-rt-users@vger.kernel.org, Daniel Wagner <dwagner@suse.de>
Subject: [rt-tests v2 v2 03/20] cyclictest: Use affinity_mask for stearing thread placement
Date: Fri, 18 Dec 2020 17:18:26 +0100 [thread overview]
Message-ID: <20201218161843.1764-4-dwagner@suse.de> (raw)
In-Reply-To: <20201218161843.1764-1-dwagner@suse.de>
We don't need an extra variable to track the state if a bitmask is
available or not. Check directly if the mask is usable.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
src/cyclictest/cyclictest.c | 34 +++++++---------------------------
1 file changed, 7 insertions(+), 27 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index a5ca764da254..3dafef4e7e5a 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -893,7 +893,6 @@ static int interval = DEFAULT_INTERVAL;
static int distance = -1;
static struct bitmask *affinity_mask = NULL;
static int smp = 0;
-static int setaffinity = AFFINITY_UNSPECIFIED;
static int clocksources[] = {
CLOCK_MONOTONIC,
@@ -1020,19 +1019,13 @@ static void process_options(int argc, char *argv[], int max_cpus)
break;
if (optarg) {
parse_cpumask(optarg, max_cpus, &affinity_mask);
- setaffinity = AFFINITY_SPECIFIED;
} else if (optind < argc &&
(atoi(argv[optind]) ||
argv[optind][0] == '0' ||
argv[optind][0] == '!')) {
parse_cpumask(argv[optind], max_cpus, &affinity_mask);
- setaffinity = AFFINITY_SPECIFIED;
- } else {
- setaffinity = AFFINITY_USEALL;
}
- if (setaffinity == AFFINITY_SPECIFIED && !affinity_mask)
- display_help(1);
if (verbose)
printf("Using %u cpus.\n",
numa_bitmask_weight(affinity_mask));
@@ -1125,7 +1118,6 @@ static void process_options(int argc, char *argv[], int max_cpus)
case OPT_SMP: /* SMP testing */
smp = 1;
num_threads = -1; /* update after parsing */
- setaffinity = AFFINITY_USEALL;
break;
case 't':
case OPT_THREADS:
@@ -1194,23 +1186,16 @@ static void process_options(int argc, char *argv[], int max_cpus)
use_nanosleep = MODE_CLOCK_NANOSLEEP;
}
- /* if smp wasn't requested, test for numa automatically */
- if (!smp) {
- if (setaffinity == AFFINITY_UNSPECIFIED)
- setaffinity = AFFINITY_USEALL;
- }
-
if (option_affinity && smp) {
warn("-a ignored due to smp mode\n");
if (affinity_mask) {
numa_bitmask_free(affinity_mask);
affinity_mask = NULL;
}
- setaffinity = AFFINITY_USEALL;
}
if (smi) {
- if (setaffinity == AFFINITY_UNSPECIFIED)
+ if (affinity_mask)
fatal("SMI counter relies on thread affinity\n");
if (!has_smi_counter())
@@ -1756,7 +1741,7 @@ int main(int argc, char **argv)
printf("Max CPUs = %d\n", max_cpus);
/* Restrict the main pid to the affinity specified by the user */
- if (affinity_mask != NULL) {
+ if (affinity_mask) {
int res;
errno = 0;
@@ -1915,18 +1900,13 @@ int main(int argc, char **argv)
if (status != 0)
fatal("error from pthread_attr_init for thread %d: %s\n", i, strerror(status));
- switch (setaffinity) {
- case AFFINITY_UNSPECIFIED: cpu = -1; break;
- case AFFINITY_SPECIFIED:
+ if (affinity_mask)
cpu = cpu_for_thread_sp(i, max_cpus, affinity_mask);
- if (verbose)
- printf("Thread %d using cpu %d.\n", i, cpu);
- break;
- case AFFINITY_USEALL:
+ else
cpu = cpu_for_thread_ua(i, max_cpus);
- break;
- default: cpu = -1;
- }
+
+ if (verbose)
+ printf("Thread %d using cpu %d.\n", i, cpu);
/* find the memory node associated with the cpu i */
node = numa_node_of_cpu(cpu);
--
2.29.2
next prev parent reply other threads:[~2020-12-18 16:19 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 16:18 [rt-tests v2 v2 00/20] rt-numa.h cleanups Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 01/20] cyclictest: Always use libnuma Daniel Wagner
2021-01-26 5:10 ` John Kacur
2021-02-19 13:44 ` Kurt Kanzenbach
2021-02-19 14:12 ` Daniel Wagner
2021-02-19 14:39 ` Kurt Kanzenbach
2021-02-19 14:54 ` Daniel Wagner
2021-02-19 15:17 ` Sebastian Andrzej Siewior
2021-02-19 15:21 ` Christian Eggers
2021-02-19 16:16 ` Daniel Wagner
2021-02-19 16:21 ` John Kacur
2021-02-19 16:27 ` Christian Eggers
2021-02-19 16:35 ` Daniel Wagner
2021-02-19 16:39 ` John Kacur
2021-02-19 17:07 ` John Kacur
2021-02-19 16:45 ` John Kacur
2020-12-18 16:18 ` [rt-tests v2 v2 02/20] cyclictest: Use numa API directly Daniel Wagner
2021-01-26 5:31 ` John Kacur
2021-01-26 8:11 ` Daniel Wagner
2020-12-18 16:18 ` Daniel Wagner [this message]
2020-12-18 16:18 ` [rt-tests v2 v2 04/20] cyclictest: Mimik --smp behavior with --affinity Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 05/20] cyclictest: Simplify --smp vs --affinity vs --threads argument logic Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 06/20] cyclictest: Move verbose message into main Daniel Wagner
2021-01-26 6:28 ` John Kacur
2020-12-18 16:18 ` [rt-tests v2 v2 07/20] signaltest: Always use libnuma Daniel Wagner
2021-01-26 6:29 ` John Kacur
2020-12-18 16:18 ` [rt-tests v2 v2 08/20] signaltest: Use affinity_mask for stearing thread placement Daniel Wagner
2021-01-26 6:31 ` John Kacur
2021-01-26 8:15 ` Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 09/20] signaltest: Simplify --smp vs --affinity vs --threads argument logic Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 10/20] rt-numa: Remove unused definitions and numa_initialize() Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 11/20] rt-numa: Add generic cpu_for_thread() helper Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 12/20] rt-numa: Use mask size for iterator limit Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 13/20] rt-numa: Remove max_cpus argument from parse_cpusmask Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 14/20] rt-numa: Use error message helpers Daniel Wagner
2021-01-26 6:40 ` John Kacur
2020-12-18 16:18 ` [rt-tests v2 v2 15/20] signaltest: Remove unused max_cpus argument from process_options Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 16/20] cyclictest: " Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 17/20] rt-numa: Use CPU_SETSIZE as upper loop limit Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 18/20] rt-numa: Remove used max_cpus argument from cpu_for_thread() Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 19/20] cyclictest: Remove max cpus used verbose information Daniel Wagner
2020-12-18 16:18 ` [rt-tests v2 v2 20/20] cyclictest: Remove unecessary local variable Daniel Wagner
2021-01-22 12:51 ` [rt-tests v2 v2 00/20] rt-numa.h cleanups Daniel Wagner
2021-01-26 5:04 ` John Kacur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201218161843.1764-4-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).