diff options
author | He Zhe <zhe.he@windriver.com> | 2021-01-22 18:16:51 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-01-25 14:34:06 -0800 |
commit | 51614ac65121b962976ae366da7f07748e0784f8 (patch) | |
tree | d2d5deca9dbffc289783686da426680470a0fe4c /meta-oe/recipes-benchmark | |
parent | 78c7e559a4bac082428478e54fbe5167a6d35c52 (diff) | |
download | meta-openembedded-51614ac65121b962976ae366da7f07748e0784f8.tar.gz |
lmbench: Fix webpage-lm and manual page typos
/usr/binlmbench references src/webpages which was never copied to target.
Fix this and a bunch of typos in manual pages
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
3 files changed, 180 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch new file mode 100644 index 000000000..b27e6c9fe --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch | |||
@@ -0,0 +1,100 @@ | |||
1 | From a8d86a2d994a008dab3c3ecad65528c0e5fc2cba Mon Sep 17 00:00:00 2001 | ||
2 | From: He Zhe <zhe.he@windriver.com> | ||
3 | Date: Fri, 22 Jan 2021 11:22:48 +0800 | ||
4 | Subject: [PATCH] doc: Fix typos in manual pages | ||
5 | |||
6 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
7 | --- | ||
8 | doc/bw_mem.8 | 2 +- | ||
9 | doc/lat_fcntl.8 | 2 +- | ||
10 | doc/lat_fifo.8 | 2 +- | ||
11 | doc/lat_http.8 | 6 +++--- | ||
12 | doc/lat_select.8 | 2 +- | ||
13 | doc/lat_sig.8 | 2 +- | ||
14 | 6 files changed, 8 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/doc/bw_mem.8 b/doc/bw_mem.8 | ||
17 | index 33df417..9e84d73 100644 | ||
18 | --- a/doc/bw_mem.8 | ||
19 | +++ b/doc/bw_mem.8 | ||
20 | @@ -3,7 +3,7 @@ | ||
21 | .SH NAME | ||
22 | bw_mem \- time memory bandwidth | ||
23 | .SH SYNOPSIS | ||
24 | -.B bw_mem_cp | ||
25 | +.B bw_mem | ||
26 | [ | ||
27 | .I "-P <parallelism>" | ||
28 | ] | ||
29 | diff --git a/doc/lat_fcntl.8 b/doc/lat_fcntl.8 | ||
30 | index cf3c93e..2e501d6 100644 | ||
31 | --- a/doc/lat_fcntl.8 | ||
32 | +++ b/doc/lat_fcntl.8 | ||
33 | @@ -3,7 +3,7 @@ | ||
34 | .SH NAME | ||
35 | lat_fcntl \- fcntl file locking benchmark | ||
36 | .SH SYNOPSIS | ||
37 | -.B lat_ctx | ||
38 | +.B lat_fcntl | ||
39 | [ | ||
40 | .I "-P <parallelism>" | ||
41 | ] | ||
42 | diff --git a/doc/lat_fifo.8 b/doc/lat_fifo.8 | ||
43 | index 65e5a08..90bc900 100644 | ||
44 | --- a/doc/lat_fifo.8 | ||
45 | +++ b/doc/lat_fifo.8 | ||
46 | @@ -3,7 +3,7 @@ | ||
47 | .SH NAME | ||
48 | lat_fifo \- FIFO benchmark | ||
49 | .SH SYNOPSIS | ||
50 | -.B lat_ctx | ||
51 | +.B lat_fifo | ||
52 | [ | ||
53 | .I "-P <parallelism>" | ||
54 | ] | ||
55 | diff --git a/doc/lat_http.8 b/doc/lat_http.8 | ||
56 | index a4bb459..99c5d4a 100644 | ||
57 | --- a/doc/lat_http.8 | ||
58 | +++ b/doc/lat_http.8 | ||
59 | @@ -1,9 +1,9 @@ | ||
60 | .\" $Id$ | ||
61 | -.TH LAT_FCNTL 8 "$Date$" "(c)1994-2000 Carl Staelin and Larry McVoy" "LMBENCH" | ||
62 | +.TH LAT_HTTP 8 "$Date$" "(c)1994-2000 Carl Staelin and Larry McVoy" "LMBENCH" | ||
63 | .SH NAME | ||
64 | -lat_fcntl \- fcntl file locking benchmark | ||
65 | +lat_http \- http GET request latency | ||
66 | .SH SYNOPSIS | ||
67 | -.B lat_ctx | ||
68 | +.B lat_http | ||
69 | [ | ||
70 | .I "-d" | ||
71 | ] | ||
72 | diff --git a/doc/lat_select.8 b/doc/lat_select.8 | ||
73 | index 03f83bf..e13499f 100644 | ||
74 | --- a/doc/lat_select.8 | ||
75 | +++ b/doc/lat_select.8 | ||
76 | @@ -3,7 +3,7 @@ | ||
77 | .SH NAME | ||
78 | lat_select \- select benchmark | ||
79 | .SH SYNOPSIS | ||
80 | -.B lat_ctx | ||
81 | +.B lat_select | ||
82 | [ | ||
83 | .I "-P <parallelism>" | ||
84 | ] | ||
85 | diff --git a/doc/lat_sig.8 b/doc/lat_sig.8 | ||
86 | index 91baf78..19a8838 100644 | ||
87 | --- a/doc/lat_sig.8 | ||
88 | +++ b/doc/lat_sig.8 | ||
89 | @@ -3,7 +3,7 @@ | ||
90 | .SH NAME | ||
91 | lat_sig \- select benchmark | ||
92 | .SH SYNOPSIS | ||
93 | -.B lat_ctx | ||
94 | +.B lat_sig | ||
95 | [ | ||
96 | .I "-P <parallelism>" | ||
97 | ] | ||
98 | -- | ||
99 | 2.17.1 | ||
100 | |||
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch new file mode 100644 index 000000000..4a26b8ea7 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From 353e8a62bf3cb5f1b9504efa16b8b974e93cac49 Mon Sep 17 00:00:00 2001 | ||
2 | From: He Zhe <zhe.he@windriver.com> | ||
3 | Date: Fri, 22 Jan 2021 10:58:41 +0800 | ||
4 | Subject: [PATCH] lmbench: Point webpage-lm to target directory | ||
5 | |||
6 | As webpage-lm.tar has been copied to ${datadir}\lmbench. | ||
7 | Plus improve 'hello' copying in lmbench script. | ||
8 | |||
9 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
10 | --- | ||
11 | scripts/lmbench | 18 +++++++++--------- | ||
12 | 1 file changed, 9 insertions(+), 9 deletions(-) | ||
13 | |||
14 | diff --git a/scripts/lmbench b/scripts/lmbench | ||
15 | index 7a52cb1..82e36b6 100755 | ||
16 | --- a/scripts/lmbench | ||
17 | +++ b/scripts/lmbench | ||
18 | @@ -167,7 +167,7 @@ if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UNIX = XYES ]; then | ||
19 | lat_unix -P $SYNC_MAX | ||
20 | fi | ||
21 | if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_PROC = XYES ]; then | ||
22 | - cp hello /tmp/hello | ||
23 | + cp `which hello` /tmp/hello | ||
24 | for i in fork exec shell | ||
25 | do lat_proc -P $SYNC_MAX $i | ||
26 | done | ||
27 | @@ -237,14 +237,14 @@ fi | ||
28 | |||
29 | date >> ${OUTPUT} | ||
30 | echo Local networking >> ${OUTPUT} | ||
31 | -if [ ! -d ../../src/webpage-lm ] | ||
32 | -then (cd ../../src && tar xf webpage-lm.tar) | ||
33 | +if [ ! -d /usr/share/lmbench/webpage-lm ] | ||
34 | +then (cd /usr/share/lmbench && tar xf webpage-lm.tar) | ||
35 | sync | ||
36 | sleep 1 | ||
37 | fi | ||
38 | SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp" | ||
39 | for server in $SERVERS; do $server -s; done | ||
40 | -DOCROOT=../../src/webpage-lm lmhttp 8008 & | ||
41 | +DOCROOT=/usr/share/lmbench/webpage-lm lmhttp 8008 & | ||
42 | sleep 2; | ||
43 | |||
44 | if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then | ||
45 | @@ -280,15 +280,15 @@ bw_tcp -S localhost | ||
46 | |||
47 | if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then | ||
48 | # I want a hot cache number | ||
49 | - lat_http localhost 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 | ||
50 | - lat_http localhost 8008 < ../../src/webpage-lm/URLS | ||
51 | + lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 | ||
52 | + lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS | ||
53 | fi | ||
54 | lat_http -S localhost 8008 | ||
55 | |||
56 | for remote in $REMOTE | ||
57 | do | ||
58 | echo Networking to $remote >> ${OUTPUT} | ||
59 | - $RCP $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp | ||
60 | + $RCP $SERVERS lmhttp /usr/share/lmbench/webpage-lm.tar ${remote}:/tmp | ||
61 | for server in $SERVERS | ||
62 | do $RSH $remote -n /tmp/$server -s & | ||
63 | done | ||
64 | @@ -327,8 +327,8 @@ do | ||
65 | |||
66 | if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then | ||
67 | # I want a hot cache number | ||
68 | - lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 | ||
69 | - lat_http $remote 8008 < ../../src/webpage-lm/URLS | ||
70 | + lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 | ||
71 | + lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS | ||
72 | fi | ||
73 | lat_http -S $remote 8008 | ||
74 | |||
75 | -- | ||
76 | 2.17.1 | ||
77 | |||
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 171ac31ac..68c7e7b4f 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | |||
@@ -26,6 +26,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ | |||
26 | file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ | 26 | file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ |
27 | file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ | 27 | file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ |
28 | file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ | 28 | file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ |
29 | file://0001-lmbench-Point-webpage-lm-to-target-directory.patch \ | ||
30 | file://0001-doc-Fix-typos-in-manual-pages.patch \ | ||
29 | " | 31 | " |
30 | SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" | 32 | SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" |
31 | SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" | 33 | SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" |
@@ -75,6 +77,7 @@ do_install () { | |||
75 | ${D}${bindir}/lmbench-run | 77 | ${D}${bindir}/lmbench-run |
76 | install -m 0755 ${S}/scripts/lmbench ${D}${bindir} | 78 | install -m 0755 ${S}/scripts/lmbench ${D}${bindir} |
77 | install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts | 79 | install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts |
80 | install -m 0644 ${S}/src/webpage-lm.tar ${D}${datadir}/lmbench | ||
78 | } | 81 | } |
79 | 82 | ||
80 | pkg_postinst_${PN} () { | 83 | pkg_postinst_${PN} () { |