mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
dev-util/rt-tests: Drop old
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/18777 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
|
||||
DIST rt-tests-1.9.tar.xz 112180 BLAKE2B fa9b7b70bd9ae5d5f5e1077ddbd916bc4556d079d4067f16289ab34fec16ed0c8074607a7a8e50ea7bad4df318a063074f1c0ec5c2e895851d3045d51a8ecd74 SHA512 66f086dbda31567e6dc5297424ec66b2c6bd7cb0e065c32e02c326f33967f3a301b1b34f9eb0dd0acd853279c64fb1c2bc271ac26648f4abc3f6090ba6484cfa
|
||||
|
||||
@@ -1,380 +0,0 @@
|
||||
From fd78f200ac8e9d1eb7579cd9e4adaaa1a4dc2d46 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Date: Wed, 1 Apr 2020 20:15:24 +0200
|
||||
Subject: [PATCH] all: Fix musl build
|
||||
|
||||
There are a few problems:
|
||||
|
||||
* pi stress: pthread_attr_setaffinity_np() is not supported
|
||||
* cyclictest: SIGEV_THREAD_ID is not supported
|
||||
* hackbench: Fix include
|
||||
* all: Fix sched_* calls
|
||||
|
||||
With these changes applied, the rt-tests seem to run fine.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
Makefile | 5 --
|
||||
src/backfire/sendme.c | 1 +
|
||||
src/cyclictest/cyclictest.c | 68 ++++-----------------------
|
||||
src/hackbench/hackbench.c | 4 +-
|
||||
src/include/musl.h | 28 +++++++++++
|
||||
src/lib/rt-utils.c | 1 +
|
||||
src/pi_tests/classic_pi.c | 2 +
|
||||
src/pi_tests/tst-mutexpi10.c | 2 +
|
||||
src/pmqtest/pmqtest.c | 1 +
|
||||
src/ptsematest/ptsematest.c | 1 +
|
||||
src/rt-migrate-test/rt-migrate-test.c | 1 +
|
||||
src/sched_deadline/cyclicdeadline.c | 2 +
|
||||
12 files changed, 50 insertions(+), 66 deletions(-)
|
||||
create mode 100644 src/include/musl.h
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c3ebbd7b2a2e..8815c113c0df 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -7,7 +7,6 @@ OBJDIR = bld
|
||||
sources = cyclictest.c \
|
||||
hackbench.c \
|
||||
pip_stress.c \
|
||||
- pi_stress.c \
|
||||
pmqtest.c \
|
||||
ptsematest.c \
|
||||
rt-migrate-test.c \
|
||||
@@ -36,7 +35,6 @@ LDFLAGS ?=
|
||||
PYLIB ?= $(shell python3 -c 'import distutils.sysconfig; print (distutils.sysconfig.get_python_lib())')
|
||||
|
||||
MANPAGES = src/cyclictest/cyclictest.8 \
|
||||
- src/pi_tests/pi_stress.8 \
|
||||
src/ptsematest/ptsematest.8 \
|
||||
src/rt-migrate-test/rt-migrate-test.8 \
|
||||
src/sigwaittest/sigwaittest.8 \
|
||||
@@ -129,9 +127,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
|
||||
signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
|
||||
|
||||
-pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
|
||||
-
|
||||
hwlatdetect: src/hwlatdetect/hwlatdetect.py
|
||||
chmod +x src/hwlatdetect/hwlatdetect.py
|
||||
ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
|
||||
diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
|
||||
index d963723b1c93..b355bbbcfece 100644
|
||||
--- a/src/backfire/sendme.c
|
||||
+++ b/src/backfire/sendme.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <errno.h>
|
||||
#include "rt-utils.h"
|
||||
#include "rt-get_cpu.h"
|
||||
+#include "musl.h"
|
||||
|
||||
#include <utmpx.h>
|
||||
#include <sys/types.h>
|
||||
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
|
||||
index b41d42f13f24..56b27a4e0547 100644
|
||||
--- a/src/cyclictest/cyclictest.c
|
||||
+++ b/src/cyclictest/cyclictest.c
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "rt_numa.h"
|
||||
|
||||
#include "rt-utils.h"
|
||||
+#include "musl.h"
|
||||
|
||||
#include <bionic.h>
|
||||
|
||||
@@ -501,12 +502,8 @@ static void *timerthread(void *param)
|
||||
{
|
||||
struct thread_param *par = param;
|
||||
struct sched_param schedp;
|
||||
- struct sigevent sigev;
|
||||
sigset_t sigset;
|
||||
- timer_t timer;
|
||||
struct timespec now, next, interval, stop;
|
||||
- struct itimerval itimer;
|
||||
- struct itimerspec tspec;
|
||||
struct thread_stat *stat = par->stats;
|
||||
int stopped = 0;
|
||||
cpu_set_t mask;
|
||||
@@ -537,14 +534,6 @@ static void *timerthread(void *param)
|
||||
sigaddset(&sigset, par->signal);
|
||||
sigprocmask(SIG_BLOCK, &sigset, NULL);
|
||||
|
||||
- if (par->mode == MODE_CYCLIC) {
|
||||
- sigev.sigev_notify = SIGEV_THREAD_ID | SIGEV_SIGNAL;
|
||||
- sigev.sigev_signo = par->signal;
|
||||
- sigev.sigev_notify_thread_id = stat->tid;
|
||||
- timer_create(par->clock, &sigev, &timer);
|
||||
- tspec.it_interval = interval;
|
||||
- }
|
||||
-
|
||||
memset(&schedp, 0, sizeof(schedp));
|
||||
schedp.sched_priority = par->prio;
|
||||
if (setscheduler(0, par->policy, &schedp))
|
||||
@@ -599,20 +588,6 @@ static void *timerthread(void *param)
|
||||
stop = now;
|
||||
stop.tv_sec += duration;
|
||||
}
|
||||
- if (par->mode == MODE_CYCLIC) {
|
||||
- if (par->timermode == TIMER_ABSTIME)
|
||||
- tspec.it_value = next;
|
||||
- else
|
||||
- tspec.it_value = interval;
|
||||
- timer_settime(timer, par->timermode, &tspec, NULL);
|
||||
- }
|
||||
-
|
||||
- if (par->mode == MODE_SYS_ITIMER) {
|
||||
- itimer.it_interval.tv_sec = interval.tv_sec;
|
||||
- itimer.it_interval.tv_usec = interval.tv_nsec / 1000;
|
||||
- itimer.it_value = itimer.it_interval;
|
||||
- setitimer(ITIMER_REAL, &itimer, NULL);
|
||||
- }
|
||||
|
||||
stat->threadstarted++;
|
||||
|
||||
@@ -620,16 +595,10 @@ static void *timerthread(void *param)
|
||||
|
||||
uint64_t diff;
|
||||
unsigned long diff_smi = 0;
|
||||
- int sigs, ret;
|
||||
+ int ret;
|
||||
|
||||
/* Wait for next period */
|
||||
switch (par->mode) {
|
||||
- case MODE_CYCLIC:
|
||||
- case MODE_SYS_ITIMER:
|
||||
- if (sigwait(&sigset, &sigs) < 0)
|
||||
- goto out;
|
||||
- break;
|
||||
-
|
||||
case MODE_CLOCK_NANOSLEEP:
|
||||
if (par->timermode == TIMER_ABSTIME) {
|
||||
ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
|
||||
@@ -751,11 +720,6 @@ static void *timerthread(void *param)
|
||||
|
||||
next.tv_sec += interval.tv_sec;
|
||||
next.tv_nsec += interval.tv_nsec;
|
||||
- if (par->mode == MODE_CYCLIC) {
|
||||
- int overrun_count = timer_getoverrun(timer);
|
||||
- next.tv_sec += overrun_count * interval.tv_sec;
|
||||
- next.tv_nsec += overrun_count * interval.tv_nsec;
|
||||
- }
|
||||
tsnorm(&next);
|
||||
|
||||
while (tsgreater(&now, &next)) {
|
||||
@@ -780,17 +744,6 @@ out:
|
||||
pthread_mutex_unlock(&refresh_on_max_lock);
|
||||
}
|
||||
|
||||
- if (par->mode == MODE_CYCLIC)
|
||||
- timer_delete(timer);
|
||||
-
|
||||
- if (par->mode == MODE_SYS_ITIMER) {
|
||||
- itimer.it_value.tv_sec = 0;
|
||||
- itimer.it_value.tv_usec = 0;
|
||||
- itimer.it_interval.tv_sec = 0;
|
||||
- itimer.it_interval.tv_usec = 0;
|
||||
- setitimer(ITIMER_REAL, &itimer, NULL);
|
||||
- }
|
||||
-
|
||||
/* close msr file */
|
||||
if (smi)
|
||||
close(par->msr_fd);
|
||||
@@ -1305,7 +1258,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
|
||||
case OPT_VERBOSE: verbose = 1; break;
|
||||
case 'x':
|
||||
case OPT_POSIX_TIMERS:
|
||||
- use_nanosleep = MODE_CYCLIC; break;
|
||||
+ fatal("--posix_timers is not available on your libc\n");
|
||||
+ break;
|
||||
case '?':
|
||||
case OPT_HELP:
|
||||
display_help(0); break;
|
||||
@@ -1338,13 +1292,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
|
||||
}
|
||||
}
|
||||
|
||||
- if ((use_system == MODE_SYS_OFFSET) && (use_nanosleep == MODE_CYCLIC)) {
|
||||
- warn("The system option requires clock_nanosleep\n");
|
||||
- warn("and is not compatible with posix_timers\n");
|
||||
- warn("Using clock_nanosleep\n");
|
||||
- use_nanosleep = MODE_CLOCK_NANOSLEEP;
|
||||
- }
|
||||
-
|
||||
/* if smp wasn't requested, test for numa automatically */
|
||||
if (!smp) {
|
||||
#ifdef NUMA
|
||||
@@ -2038,7 +1985,6 @@ int main(int argc, char **argv)
|
||||
|
||||
}
|
||||
|
||||
-
|
||||
mode = use_nanosleep + use_system;
|
||||
|
||||
sigemptyset(&sigset);
|
||||
@@ -2088,16 +2034,18 @@ int main(int argc, char **argv)
|
||||
void *stack;
|
||||
void *currstk;
|
||||
size_t stksize;
|
||||
+ int err;
|
||||
|
||||
/* find the memory node associated with the cpu i */
|
||||
node = rt_numa_numa_node_of_cpu(cpu);
|
||||
|
||||
/* get the stack size set for for this thread */
|
||||
- if (pthread_attr_getstack(&attr, &currstk, &stksize))
|
||||
+ err = pthread_attr_getstack(&attr, &currstk, &stksize);
|
||||
+ if (err != EINVAL)
|
||||
fatal("failed to get stack size for thread %d\n", i);
|
||||
|
||||
/* if the stack size is zero, set a default */
|
||||
- if (stksize == 0)
|
||||
+ if (err == EINVAL || stksize == 0)
|
||||
stksize = PTHREAD_STACK_MIN * 2;
|
||||
|
||||
/* allocate memory for a stack on appropriate node */
|
||||
diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
|
||||
index 2cddff654df6..46f09fa9e7ba 100644
|
||||
--- a/src/hackbench/hackbench.c
|
||||
+++ b/src/hackbench/hackbench.c
|
||||
@@ -24,13 +24,15 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/time.h>
|
||||
-#include <sys/poll.h>
|
||||
+#include <poll.h>
|
||||
#include <limits.h>
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <sched.h>
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
static unsigned int datasize = 100;
|
||||
static unsigned int loops = 100;
|
||||
static unsigned int num_groups = 10;
|
||||
diff --git a/src/include/musl.h b/src/include/musl.h
|
||||
new file mode 100644
|
||||
index 000000000000..ea5075e768c8
|
||||
--- /dev/null
|
||||
+++ b/src/include/musl.h
|
||||
@@ -0,0 +1,28 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2020 Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
+ * Time-stamp: <2020-04-04 10:54:01 kurt>
|
||||
+ */
|
||||
+
|
||||
+#ifndef _MUSL_H_
|
||||
+#define _MUSL_H_
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+#include <sys/syscall.h>
|
||||
+
|
||||
+/*
|
||||
+ * Musl someshow defines sched_* to ENOSYS which is not correct ...
|
||||
+ * See commit 1e21e78bf7a5 ("add support for thread scheduling (POSIX TPS option)")
|
||||
+ *
|
||||
+ * Workaround: define them to syscall(...)
|
||||
+ */
|
||||
+
|
||||
+#define sched_getparam(pid, param) \
|
||||
+ syscall(SYS_sched_getparam, pid, param)
|
||||
+#define sched_setparam(pid, param) \
|
||||
+ syscall(SYS_sched_setparam, pid, param)
|
||||
+#define sched_getscheduler(pid) \
|
||||
+ syscall(SYS_sched_getscheduler, pid)
|
||||
+#define sched_setscheduler(pid, policy, param) \
|
||||
+ syscall(SYS_sched_setscheduler, pid, policy, param)
|
||||
+
|
||||
+#endif /* _MUSL_H_ */
|
||||
diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
|
||||
index f786588706cd..c1a55272dfdb 100644
|
||||
--- a/src/lib/rt-utils.c
|
||||
+++ b/src/lib/rt-utils.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "rt-utils.h"
|
||||
#include "rt-sched.h"
|
||||
#include "error.h"
|
||||
+#include "musl.h"
|
||||
|
||||
#define TRACEBUFSIZ 1024
|
||||
|
||||
diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
|
||||
index 64af8890276f..bb088d3973b2 100644
|
||||
--- a/src/pi_tests/classic_pi.c
|
||||
+++ b/src/pi_tests/classic_pi.c
|
||||
@@ -34,6 +34,8 @@
|
||||
#include <signal.h>
|
||||
#include <getopt.h>
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
/* test timeout */
|
||||
#define TIMEOUT 2
|
||||
|
||||
diff --git a/src/pi_tests/tst-mutexpi10.c b/src/pi_tests/tst-mutexpi10.c
|
||||
index 97a345edd26e..1028d344edff 100644
|
||||
--- a/src/pi_tests/tst-mutexpi10.c
|
||||
+++ b/src/pi_tests/tst-mutexpi10.c
|
||||
@@ -35,6 +35,8 @@
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
/* test timeout */
|
||||
#define TIMEOUT 2
|
||||
|
||||
diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
|
||||
index 5db8d348cdf8..2de6c1417e4a 100644
|
||||
--- a/src/pmqtest/pmqtest.c
|
||||
+++ b/src/pmqtest/pmqtest.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "rt-utils.h"
|
||||
#include "rt-get_cpu.h"
|
||||
#include "error.h"
|
||||
+#include "musl.h"
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
|
||||
index de8ea2fe1b0c..1568f3b78711 100644
|
||||
--- a/src/ptsematest/ptsematest.c
|
||||
+++ b/src/ptsematest/ptsematest.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "rt-utils.h"
|
||||
#include "rt-get_cpu.h"
|
||||
#include "error.h"
|
||||
+#include "musl.h"
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
|
||||
index 4863238edeb4..9f1aba159dc7 100644
|
||||
--- a/src/rt-migrate-test/rt-migrate-test.c
|
||||
+++ b/src/rt-migrate-test/rt-migrate-test.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <sched.h>
|
||||
#include <pthread.h>
|
||||
#include "rt-utils.h"
|
||||
+#include "musl.h"
|
||||
|
||||
int nr_tasks;
|
||||
int lfd;
|
||||
diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
|
||||
index a08e28e73c42..675a0ea1a162 100644
|
||||
--- a/src/sched_deadline/cyclicdeadline.c
|
||||
+++ b/src/sched_deadline/cyclicdeadline.c
|
||||
@@ -32,6 +32,8 @@
|
||||
#include <rt-utils.h>
|
||||
#include <rt-sched.h>
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
#define _STR(x) #x
|
||||
#define STR(x) _STR(x)
|
||||
#ifndef MAXPATH
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6..9} )
|
||||
|
||||
inherit python-single-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
|
||||
HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
|
||||
SRC_URI="
|
||||
https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz
|
||||
https://kernel.org/pub/linux/utils/rt-tests/older/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
sys-process/numactl"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
|
||||
python_fix_shebang "${ED}"
|
||||
python_optimize
|
||||
}
|
||||
Reference in New Issue
Block a user