journalctl: implement quering field values with new -F switch

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

diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze
index 5d451c35e574bbad6989c8c1f4cdd66878681b9e..636fd7422b4a682a6f1e760231ec3be5c65592dd 100755 (executable)
--- a/src/analyze/systemd-analyze
+++ b/src/analyze/systemd-analyze
@@ -32,17 +32,17 @@ def acquire_start_time():
         properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.DBus.Properties')
 
         initrd_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic'))
-        startup_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'StartupTimestampMonotonic'))
+        userspace_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic'))
         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
+        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()
@@ -91,16 +91,16 @@ 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 +161,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 +185,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
@@ -285,8 +285,8 @@ bus = dbus.SystemBus()
 
 try:
         opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"])
-except getopt.GetoptError, err:
-        print str(err)
+except getopt.GetoptError as err:
+        sys.stdout.write(str(err) + "\n")
         usage()
         sys.exit(2)
 for o, a in opts: