X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fanalyze%2Fsystemd-analyze;h=88699d6728a86ea0d6de03b92845fe63177653f3;hp=5d451c35e574bbad6989c8c1f4cdd66878681b9e;hb=0c0271841ab45595f71528c50bcf1904d4b841d5;hpb=927735238d1cfe9bd9d9db71025e801c391cb156 diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze index 5d451c35e..88699d672 100755 --- a/src/analyze/systemd-analyze +++ b/src/analyze/systemd-analyze @@ -1,14 +1,16 @@ #!/usr/bin/python -import getopt, dbus, sys, os +import sys, os +import argparse +from gi.repository import Gio try: import cairo except ImportError: cairo = None def acquire_time_data(): - - manager = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.systemd1.Manager') + manager = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, + None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.systemd1.Manager', None) units = manager.ListUnits() l = [] @@ -17,32 +19,34 @@ def acquire_time_data(): if i[5] != "": continue - properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', i[6]), 'org.freedesktop.DBus.Properties') + properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, + None, 'org.freedesktop.systemd1', i[6], 'org.freedesktop.DBus.Properties', None) - 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')) + ixt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic') + aet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic') + axt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic') + iet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic') l.append((str(i[0]), ixt, aet, axt, iet)) return l def acquire_start_time(): - properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.DBus.Properties') + properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, + None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.DBus.Properties', None) - 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')) + initrd_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic') + userspace_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic') + finish_time = properties.Get('(ss)', '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 + assert initrd_time <= userspace_time + assert userspace_time <= finish_time - return initrd_time, startup_time, finish_time + return initrd_time, userspace_time, finish_time def draw_box(context, j, k, l, m, r = 0, g = 0, b = 0): context.save() @@ -72,35 +76,21 @@ def draw_text(context, x, y, text, size = 12, r = 0, g = 0, b = 0, vcenter = 0.5 context.restore() -def usage(): - sys.stdout.write("""systemd-analyze [--user] time -systemd-analyze [--user] blame -systemd-analyze [--user] plot - -Process systemd profiling information - - -h --help Show this help -""") - -def help(): - usage() - sys.exit() - def time(): initrd_time, start_time, finish_time = acquire_start_time() if initrd_time > 0: - print "Startup finished in %lums (kernel) + %lums (initramfs) + %lums (userspace) = %lums" % ( \ + sys.stdout.write("Startup finished in %lums (kernel) + %lums (initramfs) + %lums (userspace) = %lums\n" % ( \ initrd_time/1000, \ (start_time - initrd_time)/1000, \ (finish_time - start_time)/1000, \ - finish_time/1000) + finish_time/1000)) else: - print "Startup finished in %lums (kernel) + %lums (userspace) = %lums" % ( \ + sys.stdout.write("Startup finished in %lums (kernel) + %lums (userspace) = %lums\n" % ( \ start_time/1000, \ (finish_time - start_time)/1000, \ - finish_time/1000) + finish_time/1000)) def blame(): @@ -161,7 +151,7 @@ def plot(): context.set_line_width(1) context.set_source_rgb(0.7, 0.7, 0.7) - for x in range(0, finish_time/10000 + 100, 100): + for x in range(0, int(finish_time/10000) + 100, 100): context.move_to(x, 0) context.line_to(x, height-border*2) @@ -185,7 +175,7 @@ def plot(): banner = "{} {} ({} {}) {}".format(osrel, *(os.uname()[1:5])) draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1) - for x in range(0, finish_time/10000 + 100, 100): + for x in range(0, int(finish_time/10000) + 100, 100): draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0) y = 0 @@ -276,34 +266,29 @@ def plot(): surface.finish() -def unknown_verb(): - sys.stderr.write("Unknown verb '%s'.\n" % args[0]) - usage() - sys.exit(1) +parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, + description='Process systemd profiling information', + epilog='''\ +time - print time spent in the kernel before reaching userspace +blame - print list of running units ordered by time to init +plot - output SVG graphic showing service initialization +''') -bus = dbus.SystemBus() +parser.add_argument('action', choices=('time', 'blame', 'plot'), + default='time', nargs='?', + help='action to perform (default: time)') +parser.add_argument('--user', action='store_true', + help='use the session bus') -try: - opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"]) -except getopt.GetoptError, err: - print str(err) - usage() - sys.exit(2) -for o, a in opts: - if o in ("-h", "--help"): - help() - elif o == '--user': - bus = dbus.SessionBus() - else: - assert False, "unhandled option" +args = parser.parse_args() + +if args.user: + bus = Gio.BusType.SESSION +else: + bus = Gio.BusType.SYSTEM verb = {'time' : time, 'blame': blame, 'plot' : plot, - 'help' : help, } - -if len(args) == 0: - time() -else: - verb.get(args[0], unknown_verb)() +verb.get(args.action)()