X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd-analyze;h=ae7dcfbd8a68bab41cbed072cd5d7cc2f33c2eaa;hp=4ffa3bb95eec8b55dd322ddbf34759f6410241a8;hb=b9b2b042c5564dfff730eeab43db9ac4bbe4c650;hpb=8e028bb1edf33da3ced2d353fbfafac7ad75e6be diff --git a/src/systemd-analyze b/src/systemd-analyze index 4ffa3bb95..ae7dcfbd8 100755 --- a/src/systemd-analyze +++ b/src/systemd-analyze @@ -10,12 +10,15 @@ def acquire_time_data(): l = [] for i in units: + if i[5] != "": + continue + properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', i[6]), 'org.freedesktop.DBus.Properties') - ixt = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveExitTimestamp')) - aet = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveEnterTimestamp')) - axt = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveExitTimestamp')) - iet = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveEnterTimestamp')) + ixt = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic')) + aet = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic')) + axt = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic')) + iet = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic')) l.append((str(i[0]), ixt, aet, axt, iet)) @@ -24,12 +27,14 @@ def acquire_time_data(): def acquire_start_time(): properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.DBus.Properties') - startup_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'StartupTimestamp')) - finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestamp')) + initrd_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic')) + startup_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'StartupTimestampMonotonic')) + finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic')) + assert initrd_time <= startup_time assert startup_time <= finish_time - return startup_time, finish_time + return initrd_time, startup_time, finish_time def draw_box(context, j, k, l, m, r = 0, g = 0, b = 0): context.save() @@ -38,26 +43,58 @@ def draw_box(context, j, k, l, m, r = 0, g = 0, b = 0): context.fill() context.restore() -def draw_text(context, x, y, text, size = 12, r = 0, g = 0, b = 0, center = True): +def draw_text(context, x, y, text, size = 12, r = 0, g = 0, b = 0, vcenter = 0.5, hcenter = 0.5): context.save() context.set_source_rgb(r, g, b) context.select_font_face("Sans", cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_NORMAL) context.set_font_size(size) - if center: + if vcenter or hcenter: x_bearing, y_bearing, width, height = context.text_extents(text)[:4] -# context.move_to(x - width / 2 - x_bearing, y - height / 2 - y_bearing) - context.move_to(x, y - height / 2 - y_bearing) - else: - context.move_to(x, y) + + if hcenter: + x = x - width*hcenter - x_bearing + + if vcenter: + y = y - height*vcenter - y_bearing + + context.move_to(x, y) context.show_text(text) context.restore() +def help(): + sys.stdout.write("""systemd-analyze time +systemd-analyze blame +systemd-analyze plot + +Process systemd profiling information + + -h --help Show this help +""") + + bus = dbus.SystemBus() -if len(sys.argv) <= 1 or sys.argv[1] == 'blame': +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" % ( \ + initrd_time/1000, \ + (start_time - initrd_time)/1000, \ + (finish_time - start_time)/1000, \ + finish_time/1000) + else: + print "Startup finished in %lums (kernel) + %lums (userspace) = %lums" % ( \ + start_time/1000, \ + (finish_time - start_time)/1000, \ + finish_time/1000) + + +elif sys.argv[1] == 'blame': data = acquire_time_data() s = sorted(data, key = lambda i: i[2] - i[1], reverse = True) @@ -73,20 +110,32 @@ if len(sys.argv) <= 1 or sys.argv[1] == 'blame': sys.stdout.write("%6lums %s\n" % ((aet - ixt) / 1000, name)) elif sys.argv[1] == 'plot': - import cairo + import cairo, os - start_time, finish_time = acquire_start_time() + initrd_time, start_time, finish_time = acquire_start_time() data = acquire_time_data() s = sorted(data, key = lambda i: i[1]) - # 1000px = 10s, 1px = 10ms - border = 100 - width = (finish_time - start_time)/10000 + border*2 - height = 3000 + count = 0 + + for name, ixt, aet, axt, iet in s: + + if (ixt >= start_time and ixt <= finish_time) or \ + (aet >= start_time and aet <= finish_time) or \ + (axt >= start_time and axt <= finish_time): + count += 1 + border = 100 bar_height = 20 bar_space = bar_height * 0.1 + # 1000px = 10s, 1px = 10ms + width = (finish_time - start_time)/10000 + border*2 + height = count * (bar_height + bar_space) + border * 2 + + if width < 1000: + width = 1000 + surface = cairo.SVGSurface(sys.stdout, width, height) context = cairo.Context(surface) @@ -111,8 +160,11 @@ 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]) + draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1) + for x in range(0, (finish_time - start_time)/10000, 100): - draw_text(context, x, -5, "%lus" % (x/100), center = False) + draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0) y = 0 @@ -121,33 +173,36 @@ elif sys.argv[1] == 'plot': drawn = False left = -1 - if ixt >= start_time and aet > ixt: + if ixt >= start_time and ixt <= finish_time: # Activating a = ixt - start_time - b = aet - 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) drawn = True if left < 0: left = a - if aet >= start_time and axt > aet: + if aet >= start_time and aet <= finish_time: # Active a = aet - start_time - b = axt - aet - draw_box(context, a/10000, y, b/10000, bar_height, .7, .5, .5) + 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) drawn = True if left < 0: left = a - if axt >= start_time and iet > axt: + if axt >= start_time and axt <= finish_time: # Deactivating a = axt - start_time - b = iet - 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) drawn = True @@ -155,11 +210,20 @@ elif sys.argv[1] == 'plot': left = a if drawn: - draw_text(context, left/10000 + 10, y + bar_height/2, name) + x = left/10000 + + if x < width/2-border: + draw_text(context, x + 10, y + bar_height/2, name, hcenter = 0) + else: + draw_text(context, x - 10, y + bar_height/2, name, hcenter = 1) y += bar_height + bar_space - surface.finish() + draw_text(context, 0, height-border*2, "Legend: Red = Activating; Pink = Active; Dark Pink = Deactivating", hcenter = 0, vcenter = -1) + surface.finish() +elif sys.argv[1] in ("help", "--help", "-h"): + help() else: sys.stderr.write("Unknown verb '%s'.\n" % sys.argv[1]) + sys.exit(1)