diff options
Diffstat (limited to 'meta/recipes-devtools/bootchart2')
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch | 68 | ||||
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb (renamed from meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb) | 8 |
2 files changed, 72 insertions, 4 deletions
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch new file mode 100644 index 0000000000..3cb8a3c2a2 --- /dev/null +++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From 988ca784d4840c87509e770a21d5d22105af8668 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Fri, 5 Nov 2021 11:18:07 +0800 | ||
4 | Subject: [PATCH] bootchartd.in: make sure only one bootchartd process | ||
5 | |||
6 | When boot with "init=/sbin/bootchartd" as below: | ||
7 | # runqemu qemux86 bootparams="init=/sbin/bootchartd" | ||
8 | |||
9 | There are two bootchartd process after boot [1]. | ||
10 | # ps -ef | grep bootchart | ||
11 | root 101 1 0 03:27 ? 00:00:00 /bin/sh /sbin/bootchartd | ||
12 | root 103 101 8 03:27 ? 00:00:02 /lib64/bootchart/bootchart-collector 50 | ||
13 | root 106 1 0 03:27 ? 00:00:00 /bin/sh /sbin/bootchartd | ||
14 | root 792 106 0 03:27 ? 00:00:00 /lib64/bootchart/bootchart-collector --usleep 1000000 | ||
15 | root 794 725 0 03:27 ttyS0 00:00:00 grep bootchart | ||
16 | |||
17 | # /sbin/bootchartd stop | ||
18 | [bootchart] bootchart-collector started as pid 596 with 2 args: | ||
19 | [bootchart] '--dump' | ||
20 | [bootchart] '/tmp/bootchart.3lXpVDAq3v' | ||
21 | [bootchart] Extracting profile data from pid 204 | ||
22 | [bootchart] map 0xbed9a000 -> 0xbedbb000 size: 132k from 'bed9a000' 'bedbb000' | ||
23 | [bootchart] read 135168 bytes of 135168 | ||
24 | [bootchart] reading 150 chunks (of 150) ... | ||
25 | [bootchart] wrote 18760 kbB | ||
26 | [bootchart] bootchart-collector pid: 596 unmounted proc / clean exit | ||
27 | |||
28 | But there still one process exist after the above stop command finish. | ||
29 | # ps -ef | grep bootchartd | ||
30 | root 202 1 0 09:09 ? 00:00:00 /bin/sh /sbin/bootchartd | ||
31 | root 629 516 0 09:10 ? 00:00:00 grep bootchartd | ||
32 | |||
33 | Remove the wait_boot which used to wait the boot process to finish to | ||
34 | make sure only one bootchartd process and meanwhile we don't need the | ||
35 | wait_boot logic because we either use "/sbin/bootchartd stop" to stop | ||
36 | the bootchartd manually or install package bootchartd-stop-initscript | ||
37 | altogether with bootchart2 to stop bootchartd automatically after boot. | ||
38 | |||
39 | After patch: | ||
40 | # ps -ef | grep bootchart | ||
41 | root 101 1 0 03:36 ? 00:00:00 /bin/sh /sbin/bootchartd | ||
42 | root 103 101 6 03:36 ? 00:00:04 /lib64/bootchart/bootchart-collector 50 | ||
43 | root 596 592 0 03:37 ttyS0 00:00:00 grep bootchart | ||
44 | |||
45 | [1] https://github.com/xrmx/bootchart/issues/94 | ||
46 | |||
47 | Upstream-Status: Submitted [https://github.com/xrmx/bootchart/pull/95] | ||
48 | |||
49 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
50 | --- | ||
51 | bootchartd.in | 1 - | ||
52 | 1 file changed, 1 deletion(-) | ||
53 | |||
54 | diff --git a/bootchartd.in b/bootchartd.in | ||
55 | index 7979ef9..f0e466d 100755 | ||
56 | --- a/bootchartd.in | ||
57 | +++ b/bootchartd.in | ||
58 | @@ -183,7 +183,6 @@ if [ $$ -eq 1 ]; then | ||
59 | else # running inside the main system | ||
60 | echo "bootchart: no initrd used; starting" | ||
61 | start & | ||
62 | - wait_boot & | ||
63 | # wait a little, until the collector is going, before allowing | ||
64 | # the rest of the system to charge ahead, so we catch it | ||
65 | $USLEEP 250000 | ||
66 | -- | ||
67 | 2.17.1 | ||
68 | |||
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index a938b2da49..7f05bd1b0b 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | |||
@@ -90,15 +90,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124" | |||
90 | 90 | ||
91 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" | 91 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" |
92 | 92 | ||
93 | SRC_URI = "git://github.com/xrmx/bootchart.git \ | 93 | SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ |
94 | file://bootchartd_stop.sh \ | 94 | file://bootchartd_stop.sh \ |
95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ | 95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ |
96 | file://0001-bootchart2-support-usrmerge.patch \ | 96 | file://0001-bootchart2-support-usrmerge.patch \ |
97 | file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ | ||
97 | " | 98 | " |
98 | 99 | ||
99 | S = "${WORKDIR}/git" | 100 | S = "${WORKDIR}/git" |
100 | SRCREV = "331ada031f1d65f6d934d918f896e1c708c64bf7" | 101 | SRCREV = "868a2afab9da34f32c007d773b77253c93104636" |
101 | PV .= "+git${SRCPV}" | ||
102 | 102 | ||
103 | inherit systemd update-rc.d python3native update-alternatives | 103 | inherit systemd update-rc.d python3native update-alternatives |
104 | 104 | ||
@@ -144,7 +144,7 @@ do_install () { | |||
144 | 144 | ||
145 | PACKAGES =+ "pybootchartgui" | 145 | PACKAGES =+ "pybootchartgui" |
146 | FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" | 146 | FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" |
147 | RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-shell python3-compression python3-codecs" | 147 | RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-math python3-shell python3-compression python3-codecs" |
148 | RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" | 148 | RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" |
149 | RDEPENDS_${PN}_class-target += "lsb-release" | 149 | RDEPENDS_${PN}_class-target += "lsb-release" |
150 | DEPENDS_append_class-native = " python3-pycairo-native" | 150 | DEPENDS_append_class-native = " python3-pycairo-native" |