analyze: Python 3 compatibility

[elogind.git] / src / analyze / systemd-analyze

diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze
index a49fbb7eb057cac4685294767a9e51e2434b9e56..76eceee9f0f236aa66abe4bc069ca5d3a82a51ff 100755 (executable)
--- a/src/analyze/systemd-analyze
+++ b/src/analyze/systemd-analyze
@@ -1,6 +1,10 @@
 #!/usr/bin/python
 
-import dbus, sys
+import getopt, dbus, sys, os
+try:
+        import cairo
+except ImportError:
+        cairo = None
 
 def acquire_time_data():
 
@@ -68,37 +72,38 @@ def draw_text(context, x, y, text, size = 12, r = 0, g = 0, b = 0, vcenter = 0.5
 
         context.restore()
 
-def help():
-        sys.stdout.write("""systemd-analyze time
-systemd-analyze blame
-systemd-analyze plot
+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()
 
-bus = dbus.SystemBus()
-
-if len(sys.argv) <= 1 or sys.argv[1] == 'time':
+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))
 
 
-elif sys.argv[1] == 'blame':
+def blame():
 
         data = acquire_time_data()
         s = sorted(data, key = lambda i: i[2] - i[1], reverse = True)
@@ -113,9 +118,10 @@ elif sys.argv[1] == 'blame':
 
                 sys.stdout.write("%6lums %s\n" % ((aet - ixt) / 1000, name))
 
-elif sys.argv[1] == 'plot':
-        import cairo, os
-
+def plot():
+        if cairo is None:
+                sys.stderr.write("Failed to initilize python-cairo required for 'plot' verb.\n")
+                sys.exit(1)
         initrd_time, start_time, finish_time = acquire_start_time()
         data = acquire_time_data()
         s = sorted(data, key = lambda i: i[1])
@@ -155,7 +161,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, 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)
 
@@ -179,7 +185,7 @@ elif sys.argv[1] == '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
@@ -269,8 +275,35 @@ elif sys.argv[1] == 'plot':
                         finish_time/1000), 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])
+
+def unknown_verb():
+        sys.stderr.write("Unknown verb '%s'.\n" % args[0])
+        usage()
         sys.exit(1)
+
+bus = dbus.SystemBus()
+
+try:
+        opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"])
+except getopt.GetoptError as err:
+        sys.stdout.write(str(err) + "\n")
+        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"
+
+verb = {'time' : time,
+       'blame': blame,
+       'plot' : plot,
+       'help' : help,
+       }
+
+if len(args) == 0:
+        time()
+else:
+        verb.get(args[0], unknown_verb)()