diff options
author | Maxin B. John <maxin.john@enea.com> | 2014-02-11 16:56:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 17:15:54 +0000 |
commit | 93a4de6a72d0a00628dd1bd3b93467e74ddff1e4 (patch) | |
tree | a682b6c2c54972f715b9637b1816725114f46767 | |
parent | f60f802a0faa9f06cf6885c8811b02eef8388af8 (diff) | |
download | poky-93a4de6a72d0a00628dd1bd3b93467e74ddff1e4.tar.gz |
rt-tests: version bump to 0.87
- Drop PR and INC_PR.
- license remains the same with cyclictest.c checksum change
(From OE-Core rev: 10c7a45af7085b0442adc495112fed3b9d0f1d3e)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-rt/rt-tests/files/cyclictest-finish-removal-of-1-second-first-loops.patch | 61 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests.inc | 9 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests_0.87.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_0.85.bb) | 4 |
3 files changed, 3 insertions, 71 deletions
diff --git a/meta/recipes-rt/rt-tests/files/cyclictest-finish-removal-of-1-second-first-loops.patch b/meta/recipes-rt/rt-tests/files/cyclictest-finish-removal-of-1-second-first-loops.patch deleted file mode 100644 index a9cc0e34ef..0000000000 --- a/meta/recipes-rt/rt-tests/files/cyclictest-finish-removal-of-1-second-first-loops.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From 8959451a8ec5dc83dcb2dba6701abe8bf419e12c Mon Sep 17 00:00:00 2001 | ||
2 | Message-Id: <8959451a8ec5dc83dcb2dba6701abe8bf419e12c.1358783585.git.Jim.Somerville@windriver.com> | ||
3 | From: Jim Somerville <Jim.Somerville@windriver.com> | ||
4 | Date: Mon, 21 Jan 2013 10:50:18 -0500 | ||
5 | Subject: [PATCH 1/1] cyclictest: finish removal of 1 second first loops | ||
6 | |||
7 | Observation: | ||
8 | Huge latencies reported close to 1 second when certain options | ||
9 | are used in cyclictest. | ||
10 | |||
11 | Problem: | ||
12 | [ commit da4956cbcaf7945554f30e4d3a9be09b1431b19a | ||
13 | use interval on first loop instead of 1 second ] | ||
14 | removed the 1 second first timing loop out of the main path | ||
15 | in cyclictest but left it in two other paths, namely the ones | ||
16 | triggered by these two options: | ||
17 | -r --relative use relative timer instead of absolute | ||
18 | -s --system use sys_nanosleep and sys_setitimer | ||
19 | This causes huge latencies of close to 1 second to be reported | ||
20 | by cyclictest with certain uses of those two options. | ||
21 | |||
22 | Fix: | ||
23 | Extend the original commit to remove the 1 second hardcoded | ||
24 | timer values from the RELTIME and ITIMER options. Use the | ||
25 | the actual interval instead. | ||
26 | |||
27 | Upstream-Status: Accepted | ||
28 | [ https://git.kernel.org/cgit/linux/kernel/git/clrkwllms/rt-tests.git/commit/?h=work&id=1b92da30837e9552aba209cbdf938877f0fd3bbf ] | ||
29 | |||
30 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | ||
31 | --- | ||
32 | src/cyclictest/cyclictest.c | 6 ++---- | ||
33 | 1 files changed, 2 insertions(+), 4 deletions(-) | ||
34 | |||
35 | diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c | ||
36 | index 11b6cea..8487409 100644 | ||
37 | --- a/src/cyclictest/cyclictest.c | ||
38 | +++ b/src/cyclictest/cyclictest.c | ||
39 | @@ -741,17 +741,15 @@ void *timerthread(void *param) | ||
40 | if (par->timermode == TIMER_ABSTIME) | ||
41 | tspec.it_value = next; | ||
42 | else { | ||
43 | - tspec.it_value.tv_nsec = 0; | ||
44 | - tspec.it_value.tv_sec = 1; | ||
45 | + tspec.it_value = interval; | ||
46 | } | ||
47 | timer_settime(timer, par->timermode, &tspec, NULL); | ||
48 | } | ||
49 | |||
50 | if (par->mode == MODE_SYS_ITIMER) { | ||
51 | - itimer.it_value.tv_sec = 1; | ||
52 | - itimer.it_value.tv_usec = 0; | ||
53 | itimer.it_interval.tv_sec = interval.tv_sec; | ||
54 | itimer.it_interval.tv_usec = interval.tv_nsec / 1000; | ||
55 | + itimer.it_value = itimer.it_interval; | ||
56 | setitimer (ITIMER_REAL, &itimer, NULL); | ||
57 | } | ||
58 | |||
59 | -- | ||
60 | 1.7.4.1 | ||
61 | |||
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 91e5028eda..81f4f2b109 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc | |||
@@ -1,18 +1,13 @@ | |||
1 | # Version v0.85 | 1 | # Version v0.87 |
2 | SRCREV = "210e625227d21e0b589b8eaa36cd81f1cb981819" | 2 | SRCREV = "b0413ae5ed802004fb0c4af74a1757381fd2b91f" |
3 | |||
4 | PR = "r0" | ||
5 | 3 | ||
6 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \ | 4 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \ |
7 | file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \ | 5 | file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \ |
8 | file://0002-rt-tests-Break-out-install_hwlatdetect.patch \ | 6 | file://0002-rt-tests-Break-out-install_hwlatdetect.patch \ |
9 | file://added-missing-dependencies.patch \ | 7 | file://added-missing-dependencies.patch \ |
10 | file://cyclictest-finish-removal-of-1-second-first-loops.patch \ | ||
11 | file://hackbench-fix-error-check.patch \ | 8 | file://hackbench-fix-error-check.patch \ |
12 | " | 9 | " |
13 | 10 | ||
14 | INC_PR = "r2" | ||
15 | |||
16 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
17 | 12 | ||
18 | # need to append rt-tests' default CFLAGS to ours | 13 | # need to append rt-tests' default CFLAGS to ours |
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.85.bb b/meta/recipes-rt/rt-tests/rt-tests_0.87.bb index ae61092326..df646de8ed 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_0.85.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_0.87.bb | |||
@@ -4,13 +4,11 @@ SECTION = "tests" | |||
4 | DEPENDS = "linux-libc-headers virtual/libc" | 4 | DEPENDS = "linux-libc-headers virtual/libc" |
5 | LICENSE = "GPLv2 & GPLv2+" | 5 | LICENSE = "GPLv2 & GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
7 | file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \ | 7 | file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=e768b8da44555fe63f65e5c497844cb5 \ |
8 | file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949" | 8 | file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949" |
9 | 9 | ||
10 | require rt-tests.inc | 10 | require rt-tests.inc |
11 | 11 | ||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | # Do not install hwlatdetect | 12 | # Do not install hwlatdetect |
15 | EXTRA_OEMAKE += "PYLIB=''" | 13 | EXTRA_OEMAKE += "PYLIB=''" |
16 | 14 | ||