diff options
Diffstat (limited to 'dev-util/rt-tests')
| -rw-r--r-- | dev-util/rt-tests/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/rt-tests/files/rt-tests-2.7-musl.patch (renamed from dev-util/rt-tests/files/rt-tests-2.6-musl.patch) | 60 | ||||
| -rw-r--r-- | dev-util/rt-tests/rt-tests-2.7.ebuild (renamed from dev-util/rt-tests/rt-tests-2.6.ebuild) | 4 |
3 files changed, 47 insertions, 23 deletions
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest index d09b0363c9b4..9fe289aba667 100644 --- a/dev-util/rt-tests/Manifest +++ b/dev-util/rt-tests/Manifest @@ -1,4 +1,4 @@ -AUX rt-tests-2.6-musl.patch 9421 BLAKE2B 22f514733f35878c9c62d154cf73d9552701e502bb282813eea533dfc7afa601fbfde108f754dd5b679c05e3dd19638995ff46f4d8172eefabc15941005ed2ee SHA512 5dacb334f3c3d26de59fcadfb90ed674f48813d986cbdf28ae93c9f85ac43c2c4d50ca0e9e40ebc68df4a829a1bae500c9a9f3c5c6f51715d6162aa1ccf31e1d -DIST rt-tests-2.6.tar.xz 104996 BLAKE2B 40b898a0ecf512eafafa277857566cea358277f4fd6aca2595077409dbbb1c2eb4c7ed5ea1b61a378506eca4f989527d7c5fb94d9c3a16d7b0286cc940496cc8 SHA512 0cfb93ef8718b8e291a23963ef8e5bf1092b5f1c377f220d35005c0fdc7982ac074da824cb26ad5b2c71a2ebadd8bf753259c6f3ca9e00f42d9198e2dbc5999a -EBUILD rt-tests-2.6.ebuild 916 BLAKE2B 3efa9208ac022f4f5b4cffc28108db7208d9427699eec5772aa90141f5d3498217786c14dc66e144ee1c197a6387a6f3d849170ef3fee46cb99e52db38865668 SHA512 c2efab311a237d2e61ea6a80d6750abe56a039cbfbbc0bdcdaedaf6b256e217f6f12a04e7941ec0358d2f434420ccdb61b24e55b61574562b1ffc0ffa4ae3516 +AUX rt-tests-2.7-musl.patch 10247 BLAKE2B fe5fde87f14efa50c90e593d4c8c858912131e25c0af90b2e90ba1d08ec50ec82d5114a1ea17c0f07b1ba4135689ff1862209dd79d9b021a2a8d5e58eca9ab3c SHA512 3aeafa3e6d2882960638cd57183983c0880f46c8116493bf76764b04a6087d88777438c1ff78d20217f879f3386fc4fac9b29a5ebb68f7d0e695ae3b324cedd7 +DIST rt-tests-2.7.tar.xz 106864 BLAKE2B 89af0a92465ca29eb19adb6bb521be377dedb4153fc98bdcce48e1bad71803ed4aad2088227cfc679ce2441d09932acae437911535daec266b7ac2247fbad8d8 SHA512 6f2e523a6ff683473a222dc3b38abd34a06610c78b488d9d103643e410089d03820c76a4f40afaa4694d29f36e1aef6ced584cae9bad72921e3d633e36a5cda3 +EBUILD rt-tests-2.7.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be MISC metadata.xml 837 BLAKE2B b0d50d18a087e0e3adde1eeeeec4f9e3cf69d921d893c5f26f9205979d53cb3fb67c66da49a19646f00463456337edfa6482a129ba6f53bdefcc083b6420a4c8 SHA512 943f07d2ac45ada4c0e961f43543c7f8f5a1e96ae6a69e8e4f99ca47f7e43a8ca2525a299f9451b0877349542955e6428e6029dfae8e30e67ca970b883eb04d7 diff --git a/dev-util/rt-tests/files/rt-tests-2.6-musl.patch b/dev-util/rt-tests/files/rt-tests-2.7-musl.patch index 830f31184fe4..0dd53cd51ddc 100644 --- a/dev-util/rt-tests/files/rt-tests-2.6-musl.patch +++ b/dev-util/rt-tests/files/rt-tests-2.7-musl.patch @@ -7,7 +7,7 @@ There are a few problems: * pi stress: pthread_attr_setaffinity_np() is not supported * cyclictest: SIGEV_THREAD_ID is not supported - * hackbench: Fix include + * hackbench: Fix include, add missing casts * all: Fix sched_* calls With these changes applied, the rt-tests seem to run fine. @@ -17,7 +17,7 @@ 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/hackbench/hackbench.c | 12 +++--- src/include/musl.h | 28 ++++++++++++++ src/lib/rt-utils.c | 1 src/pi_tests/tst-mutexpi10.c | 2 + @@ -25,12 +25,12 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> src/ptsematest/ptsematest.c | 1 src/rt-migrate-test/rt-migrate-test.c | 1 src/sched_deadline/cyclicdeadline.c | 1 - 11 files changed, 47 insertions(+), 66 deletions(-) + 11 files changed, 51 insertions(+), 70 deletions(-) create mode 100644 src/include/musl.h --- a/Makefile +++ b/Makefile -@@ -7,7 +7,6 @@ OBJDIR = bld +@@ -8,7 +8,6 @@ OBJDIR = bld sources = cyclictest.c \ hackbench.c \ pip_stress.c \ @@ -38,7 +38,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> pmqtest.c \ ptsematest.c \ rt-migrate-test.c \ -@@ -42,7 +41,6 @@ ifeq (${PYLIB},) +@@ -43,7 +42,6 @@ ifeq (${PYLIB},) endif MANPAGES = src/cyclictest/cyclictest.8 \ @@ -46,7 +46,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> src/ptsematest/ptsematest.8 \ src/rt-migrate-test/rt-migrate-test.8 \ src/sigwaittest/sigwaittest.8 \ -@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o +@@ -131,9 +129,6 @@ deadline_test: $(OBJDIR)/deadline_test.o signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA) @@ -58,7 +58,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect --- a/src/backfire/sendme.c +++ b/src/backfire/sendme.c -@@ -29,6 +29,7 @@ +@@ -16,6 +16,7 @@ #include <string.h> #include <time.h> #include <errno.h> @@ -76,7 +76,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> #include "rt_numa.h" #include "rt-utils.h" -@@ -545,12 +546,8 @@ static void *timerthread(void *param) +@@ -469,12 +470,8 @@ static void *timerthread(void *param) { struct thread_param *par = param; struct sched_param schedp; @@ -89,7 +89,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> struct thread_stat *stat = par->stats; int stopped = 0; cpu_set_t mask; -@@ -579,14 +576,6 @@ static void *timerthread(void *param) +@@ -503,14 +500,6 @@ static void *timerthread(void *param) sigaddset(&sigset, par->signal); sigprocmask(SIG_BLOCK, &sigset, NULL); @@ -104,7 +104,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> memset(&schedp, 0, sizeof(schedp)); schedp.sched_priority = par->prio; if (setscheduler(0, par->policy, &schedp)) -@@ -640,20 +629,6 @@ static void *timerthread(void *param) +@@ -564,20 +553,6 @@ static void *timerthread(void *param) stop = now; stop.tv_sec += duration; } @@ -125,7 +125,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> stat->threadstarted++; -@@ -661,16 +636,10 @@ static void *timerthread(void *param) +@@ -585,16 +560,10 @@ static void *timerthread(void *param) uint64_t diff; unsigned long diff_smi = 0; @@ -143,7 +143,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> case MODE_CLOCK_NANOSLEEP: if (par->timermode == TIMER_ABSTIME) { ret = clock_nanosleep(par->clock, TIMER_ABSTIME, -@@ -791,11 +760,6 @@ static void *timerthread(void *param) +@@ -708,11 +677,6 @@ static void *timerthread(void *param) next.tv_sec += interval.tv_sec; next.tv_nsec += interval.tv_nsec; @@ -155,7 +155,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> tsnorm(&next); while (tsgreater(&now, &next)) { -@@ -820,17 +784,6 @@ out: +@@ -737,17 +701,6 @@ out: pthread_mutex_unlock(&refresh_on_max_lock); } @@ -173,7 +173,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> /* close msr file */ if (smi) close(par->msr_fd); -@@ -1226,7 +1179,8 @@ static void process_options(int argc, ch +@@ -1143,7 +1096,8 @@ static void process_options(int argc, ch case OPT_VERBOSE: verbose = 1; break; case 'x': case OPT_POSIX_TIMERS: @@ -183,7 +183,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> case '?': case OPT_HELP: display_help(0); break; -@@ -1259,13 +1213,6 @@ static void process_options(int argc, ch +@@ -1176,13 +1130,6 @@ static void process_options(int argc, ch } } @@ -197,7 +197,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> /* if smp wasn't requested, test for numa automatically */ if (!smp) { numa = numa_initialize(); -@@ -1988,7 +1935,6 @@ int main(int argc, char **argv) +@@ -1876,7 +1823,6 @@ int main(int argc, char **argv) } @@ -205,7 +205,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> mode = use_nanosleep + use_system; sigemptyset(&sigset); -@@ -2039,6 +1985,7 @@ int main(int argc, char **argv) +@@ -1931,6 +1877,7 @@ int main(int argc, char **argv) void *currstk; size_t stksize; int node_cpu = cpu; @@ -213,7 +213,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> if (node_cpu == -1) node_cpu = cpu_for_thread_ua(i, max_cpus); -@@ -2047,11 +1994,12 @@ int main(int argc, char **argv) +@@ -1939,11 +1886,12 @@ int main(int argc, char **argv) node = rt_numa_numa_node_of_cpu(node_cpu); /* get the stack size set for this thread */ @@ -248,6 +248,30 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> static unsigned int datasize = 100; static unsigned int loops = 100; static unsigned int num_groups = 10; +@@ -128,9 +130,9 @@ static int inet_socketpair(int fds[2]) + sin.sin_port = 0; + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); + +- if (bind(s1, &sin, len) < 0) ++ if (bind(s1, (struct sockaddr *)&sin, len) < 0) + barf("bind"); +- if (getsockname(s1, &sin, &len) < 0) ++ if (getsockname(s1, (struct sockaddr *)&sin, &len) < 0) + barf("getsockname"); + if (listen(s1, 10) < 0) + barf("listen"); +@@ -138,9 +140,9 @@ static int inet_socketpair(int fds[2]) + barf("ioctl"); + if (ioctl(s1, FIONBIO, &ul) < 0) + barf("ioctl"); +- if (connect(s2, &sin, len) < 0) ++ if (connect(s2, (struct sockaddr *)&sin, len) < 0) + barf("connect"); +- if ((fds[0] = accept(s1, &sin, &len)) < 0) ++ if ((fds[0] = accept(s1, (struct sockaddr *)&sin, &len)) < 0) + barf("accept"); + ul = 0; + if (ioctl(s2, FIONBIO, &ul) < 0) --- /dev/null +++ b/src/include/musl.h @@ -0,0 +1,28 @@ diff --git a/dev-util/rt-tests/rt-tests-2.6.ebuild b/dev-util/rt-tests/rt-tests-2.7.ebuild index 91afebe3ca79..d11236401857 100644 --- a/dev-util/rt-tests/rt-tests-2.6.ebuild +++ b/dev-util/rt-tests/rt-tests-2.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-single-r1 toolchain-funcs |