X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd-analyze;h=a49fbb7eb057cac4685294767a9e51e2434b9e56;hb=b8b5e648cacc8d73c55fdffbb3466ecd8146131a;hp=649d0e1273b0e2e6a083881c37272ea5b8db2278;hpb=70daa623320835dbad111ca6e4c6f8ae31388904;p=elogind.git diff --git a/src/systemd-analyze b/src/systemd-analyze index 649d0e127..a49fbb7eb 100755 --- a/src/systemd-analyze +++ b/src/systemd-analyze @@ -31,6 +31,10 @@ def acquire_start_time(): startup_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'StartupTimestampMonotonic')) finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic')) + if finish_time == 0: + sys.stderr.write("Bootup is not yet finished. Please try again later.\n") + sys.exit(1) + assert initrd_time <= startup_time assert startup_time <= finish_time @@ -82,7 +86,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 +120,11 @@ elif sys.argv[1] == 'plot': data = acquire_time_data() s = sorted(data, key = lambda i: i[1]) - count = 0 + # Account for kernel and initramfs bars if they exist + if initrd_time > 0: + count = 3 + else: + count = 2 for name, ixt, aet, axt, iet in s: @@ -130,7 +138,7 @@ elif sys.argv[1] == 'plot': bar_space = bar_height * 0.1 # 1000px = 10s, 1px = 10ms - width = (finish_time - start_time)/10000 + border*2 + width = finish_time/10000 + border*2 height = count * (bar_height + bar_space) + border * 2 if width < 1000: @@ -147,7 +155,7 @@ elif sys.argv[1] == 'plot': context.set_line_width(1) 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, finish_time/10000 + 100, 100): context.move_to(x, 0) context.line_to(x, height-border*2) @@ -160,14 +168,41 @@ elif sys.argv[1] == 'plot': context.stroke() context.restore() - banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4]) + osrel = "Linux" + if os.path.exists("/etc/os-release"): + for line in open("/etc/os-release"): + if line.startswith('PRETTY_NAME='): + osrel = line[12:] + osrel = osrel.strip('\"\n') + break + + banner = "{} {} ({} {}) {}".format(osrel, *(os.uname()[1:5])) 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, finish_time/10000 + 100, 100): draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0) y = 0 + # draw boxes for kernel and initramfs boot time + 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) + 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: drawn = False @@ -176,7 +211,7 @@ elif sys.argv[1] == 'plot': if ixt >= start_time and ixt <= finish_time: # Activating - a = ixt - start_time + a = 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) @@ -188,7 +223,7 @@ elif sys.argv[1] == 'plot': if aet >= start_time and aet <= finish_time: # Active - a = aet - start_time + a = 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) @@ -200,7 +235,7 @@ elif sys.argv[1] == 'plot': if axt >= start_time and axt <= finish_time: # Deactivating - a = axt - start_time + a = 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) @@ -221,6 +256,18 @@ 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 (initramfs) + %lums (userspace) = %lums" % ( \ + initrd_time/1000, \ + (start_time - initrd_time)/1000, \ + (finish_time - start_time)/1000, \ + finish_time/1000), hcenter = 0, vcenter = -1) + else: + draw_text(context, 0, height-border*2 + bar_height, "Startup finished in %lums (kernel) + %lums (userspace) = %lums" % ( \ + start_time/1000, \ + (finish_time - start_time)/1000, \ + finish_time/1000), hcenter = 0, vcenter = -1) + surface.finish() elif sys.argv[1] in ("help", "--help", "-h"): help()