mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

systemd: replace analyze patch with upstream version

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-09-27 13:02:26 +02:00
parent fb0d50c16f
commit 92edaa1967
2 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/systemd/systemd/0003-analyze-draw-kernel-boot-time-as-well.patch
+57 -27
View File
@@ -1,69 +1,90 @@
From 3dd45de5dffb30f3b32490736eb56024a79f51c4 Mon Sep 17 00:00:00 2001 From 958ae0d75176a65dc6694829667a5cc9fead8cbc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net> From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 22 Sep 2011 15:24:32 +0200 Date: Tue, 27 Sep 2011 12:52:09 +0200
Subject: [PATCH 3/3] analyze: draw kernel boot time as well Subject: [PATCH] analyze: always draw top kernel, initramfs, userspace bars
Sample output: http://dominion.thruhere.net/koen/angstrom/systemd/omap4430-panda-201109221422.svg Based on Koen Kooi's patch. Renamed initrd to initramfs.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
--- ---
src/systemd-analyze | 41 ++++++++++++++++++++++++++++++++---------
This is just a start to see if something like this is acceptable, feedback welcome! 1 files changed, 32 insertions(+), 9 deletions(-)
src/systemd-analyze | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/systemd-analyze b/src/systemd-analyze diff --git a/src/systemd-analyze b/src/systemd-analyze
index d0db984..480f7aa 100755 index ac64040..729aa05 100755
--- a/src/systemd-analyze --- a/src/systemd-analyze
+++ b/src/systemd-analyze +++ b/src/systemd-analyze
@@ -116,7 +116,8 @@ elif sys.argv[1] == 'plot': @@ -82,7 +82,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == 'time':
initrd_time, start_time, finish_time = acquire_start_time()
if initrd_time > 0:
- print "Startup finished in %lums (kernel) + %lums (initrd) + %lums (userspace) = %lums" % ( \
+ print "Startup finished in %lums (kernel) + %lums (initramfs) + %lums (userspace) = %lums" % ( \
initrd_time/1000, \
(start_time - initrd_time)/1000, \
(finish_time - start_time)/1000, \
@@ -116,7 +116,11 @@ elif sys.argv[1] == 'plot':
data = acquire_time_data() data = acquire_time_data()
s = sorted(data, key = lambda i: i[1]) s = sorted(data, key = lambda i: i[1])
- count = 0 - count = 0
+ # start at one to account for the kernel bar + # Account for kernel and initramfs bars if they exist
+ count = 1 + if initrd_time > 0:
+ count = 3
+ else:
+ count = 2
for name, ixt, aet, axt, iet in s: for name, ixt, aet, axt, iet in s:
@@ -130,7 +131,7 @@ elif sys.argv[1] == 'plot': @@ -130,7 +134,7 @@ elif sys.argv[1] == 'plot':
bar_space = bar_height * 0.1 bar_space = bar_height * 0.1
# 1000px = 10s, 1px = 10ms # 1000px = 10s, 1px = 10ms
- width = (finish_time - start_time)/10000 + border*2 - width = (finish_time - start_time)/10000 + border*2
+ width = (finish_time)/10000 + border*2 + width = finish_time/10000 + border*2
height = count * (bar_height + bar_space) + border * 2 height = count * (bar_height + bar_space) + border * 2
if width < 1000: if width < 1000:
@@ -147,7 +148,7 @@ elif sys.argv[1] == 'plot': @@ -147,7 +151,7 @@ elif sys.argv[1] == 'plot':
context.set_line_width(1) context.set_line_width(1)
context.set_source_rgb(0.7, 0.7, 0.7) context.set_source_rgb(0.7, 0.7, 0.7)
- for x in range(0, max((finish_time - start_time)/10000,110), 100): - for x in range(0, max((finish_time - start_time)/10000,110), 100):
+ for x in range(0, max((finish_time)/10000,110), 100): + for x in range(0, finish_time/10000 + 100, 100):
context.move_to(x, 0) context.move_to(x, 0)
context.line_to(x, height-border*2) context.line_to(x, height-border*2)
@@ -163,11 +164,16 @@ elif sys.argv[1] == 'plot': @@ -163,11 +167,30 @@ elif sys.argv[1] == 'plot':
banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4]) banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4])
draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1) draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1)
- for x in range(0, max((finish_time - start_time)/10000,110), 100): - for x in range(0, max((finish_time - start_time)/10000,110), 100):
+ for x in range(0, max((finish_time)/10000,110), 100): + for x in range(0, finish_time/10000 + 100, 100):
draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0) draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0)
y = 0 y = 0
+ # draw box for kernel boot time + # draw boxes for kernel and initramfs boot time
+ draw_box(context, 0, y, start_time/10000, bar_height, 0.8, 0.6, 0.6) + if initrd_time > 0:
+ draw_box(context, 0, y, initrd_time/10000, bar_height, 0.7, 0.7, 0.7)
+ draw_text(context, 10, y + bar_height/2, "kernel", hcenter = 0) + draw_text(context, 10, y + bar_height/2, "kernel", hcenter = 0)
+ y += bar_height + bar_space + y += bar_height + bar_space
+
+ draw_box(context, initrd_time/10000, y, start_time/10000-initrd_time/10000, bar_height, 0.7, 0.7, 0.7)
+ draw_text(context, initrd_time/10000 + 10, y + bar_height/2, "initramfs", hcenter = 0)
+ y += bar_height + bar_space
+
+ else:
+ draw_box(context, 0, y, start_time/10000, bar_height, 0.6, 0.6, 0.6)
+ draw_text(context, 10, y + bar_height/2, "kernel", hcenter = 0)
+ y += bar_height + bar_space
+
+ draw_box(context, start_time/10000, y, finish_time/10000-start_time/10000, bar_height, 0.7, 0.7, 0.7)
+ draw_text(context, start_time/10000 + 10, y + bar_height/2, "userspace", hcenter = 0)
+ y += bar_height + bar_space
+ +
for name, ixt, aet, axt, iet in s: for name, ixt, aet, axt, iet in s:
drawn = False drawn = False
@@ -176,7 +182,7 @@ elif sys.argv[1] == 'plot': @@ -176,7 +199,7 @@ elif sys.argv[1] == 'plot':
if ixt >= start_time and ixt <= finish_time: if ixt >= start_time and ixt <= finish_time:
# Activating # Activating
@@ -72,7 +93,7 @@ index d0db984..480f7aa 100755
b = min(filter(lambda x: x >= ixt, (aet, axt, iet, finish_time))) - ixt b = min(filter(lambda x: x >= ixt, (aet, axt, iet, finish_time))) - ixt
draw_box(context, a/10000, y, b/10000, bar_height, 1, 0, 0) draw_box(context, a/10000, y, b/10000, bar_height, 1, 0, 0)
@@ -188,7 +194,7 @@ elif sys.argv[1] == 'plot': @@ -188,7 +211,7 @@ elif sys.argv[1] == 'plot':
if aet >= start_time and aet <= finish_time: if aet >= start_time and aet <= finish_time:
# Active # Active
@@ -81,7 +102,7 @@ index d0db984..480f7aa 100755
b = min(filter(lambda x: x >= aet, (axt, iet, finish_time))) - aet b = min(filter(lambda x: x >= aet, (axt, iet, finish_time))) - aet
draw_box(context, a/10000, y, b/10000, bar_height, .8, .6, .6) draw_box(context, a/10000, y, b/10000, bar_height, .8, .6, .6)
@@ -200,7 +206,7 @@ elif sys.argv[1] == 'plot': @@ -200,7 +223,7 @@ elif sys.argv[1] == 'plot':
if axt >= start_time and axt <= finish_time: if axt >= start_time and axt <= finish_time:
# Deactivating # Deactivating
@@ -90,6 +111,15 @@ index d0db984..480f7aa 100755
b = min(filter(lambda x: x >= axt, (iet, finish_time))) - axt b = min(filter(lambda x: x >= axt, (iet, finish_time))) - axt
draw_box(context, a/10000, y, b/10000, bar_height, .6, .4, .4) draw_box(context, a/10000, y, b/10000, bar_height, .6, .4, .4)
@@ -222,7 +245,7 @@ elif sys.argv[1] == 'plot':
draw_text(context, 0, height-border*2, "Legend: Red = Activating; Pink = Active; Dark Pink = Deactivating", hcenter = 0, vcenter = -1)
if initrd_time > 0:
- draw_text(context, 0, height-border*2 + bar_height, "Startup finished in %lums (kernel) + %lums (initrd) + %lums (userspace) = %lums" % ( \
+ draw_text(context, 0, height-border*2 + bar_height, "Startup finished in %lums (kernel) + %lums (initramfs) + %lums (userspace) = %lums" % ( \
initrd_time/1000, \
(start_time - initrd_time)/1000, \
(finish_time - start_time)/1000, \
-- --
1.6.6.1 1.6.6.1
meta-oe/recipes-core/systemd/systemd_git.bb
+1 -1
View File
@@ -14,7 +14,7 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}" PKGV = "v${GITPKGVTAG}"
PV = "git" PV = "git"
PR = "r0" PR = "r1"
inherit autotools vala perlnative inherit autotools vala perlnative