On Mon, 22 Feb 2021, Jonathan Schwender wrote:
> Move error handling for setting the affinity of the main pid
> into a separate function.
> This prevents duplicating the code in the next commit,
> where the main thread pid can be restricted to one of
> two bitmasks depending on the passed parameters.
>
> Signed-off-by: Jonathan Schwender <schwenderjonathan@xxxxxxxxx>
> ---
> src/cyclictest/cyclictest.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index c3d45f3..3cd592d 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -1749,6 +1749,16 @@ static void write_stats(FILE *f, void *data)
> fprintf(f, " }\n");
> }
>
> +static void set_main_thread_affinity(struct bitmask* cpumask) {
> + int res;
> +
> + errno = 0;
> + res = numa_sched_setaffinity(getpid(), cpumask);
> + if (res != 0)
> + warn("Couldn't setaffinity in main thread: %s\n", strerror(errno));
> +}
> +
> +
Maybe this would be better in src/lib/rt-numa.c ?
Note your brace style is inconsistent with the rest of the suite.
We try to follow the linux kernel style, where it makes sense.
> int main(int argc, char **argv)
> {
> sigset_t sigset;
> @@ -1778,13 +1788,7 @@ int main(int argc, char **argv)
>
> /* Restrict the main pid to the affinity specified by the user */
> if (affinity_mask) {
> - int res;
> -
> - errno = 0;
> - res = numa_sched_setaffinity(getpid(), affinity_mask);
> - if (res != 0)
> - warn("Couldn't setaffinity in main thread: %s\n", strerror(errno));
> -
> + set_main_thread_affinity(affinity_mask);
> if (verbose)
> printf("Using %u cpus.\n",
> numa_bitmask_weight(affinity_mask));
> --
> 2.29.2
>
>
