netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / strace-graph

diff --git a/strace-graph b/strace-graph
index b09c92803269e0b477156bca04bc5ea2e692367b..045f5e488b71fa8c87919da89ea2e71bc4c382c0 100755 (executable)
--- a/strace-graph
+++ b/strace-graph
@@ -9,7 +9,8 @@
 # The script can also handle the output with strace -t, -tt, or -ttt.
 # It will add elapsed time for each process in that case.
 
-# This script is Copyright (C) 1998 by Richard Braakman <dark@xs4all.nl>.
+# Copyright (c) 1998 by Richard Braakman <dark@xs4all.nl>.
+# Copyright (c) 1998-2017 The strace developers.
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -41,6 +42,7 @@ my $floatform;
 
 # Scales for strace slowdown.  Make configurable!
 my $scale_factor = 3.5;
+my %running_fqname;
 
 while (<>) {
     my ($pid, $call, $args, $result, $time, $time_spent);
@@ -75,7 +77,7 @@ while (<>) {
        delete $unfinished{$pid};
     }
 
-    if (/^--- SIG(\S+) \(.*\) ---$/) {
+    if (/^--- SIG(\S+) (.*) ---$/) {
        # $pid received signal $1
        # currently we don't do anything with this
        next;
@@ -87,6 +89,12 @@ while (<>) {
        next;
     }
 
+    if (/^\+\+\+ exited with (\d+) \+\+\+$/) {
+       # $pid exited $1
+       # currently we don't do anything with this
+       next;
+    }
+
     ($call, $args, $result) = /(\S+)\((.*)\)\s+= (.*)$/;
     if ($result =~ /^(.*) <([0-9.]*)>$/) {
        ($result, $time_spent) = ($1, $2);
@@ -206,7 +214,7 @@ my $depth = "";
 # process info, indexed by pid.
 # fields:
 #    parent         pid number
-#    seq            forks and execs for this pid, in sequence  (array)
+#    seq            clones, forks and execs for this pid, in sequence  (array)
 
 #  filename and argv (from latest exec)
 #  basename (derived from filename)
@@ -216,12 +224,15 @@ my %pr;
 
 sub handle_trace {
     my ($pid, $call, $args, $result, $time) = @_;
-    my $p;
+    my $pid_fqname = $pid . "-" . $time;
 
-    if (defined $time and not defined $pr{$pid}{start}) {
-       $pr{$pid}{start} = $time;
+    if (defined $time and not defined $running_fqname{$pid}) {
+       $pr{$pid_fqname}{start} = $time;
+       $running_fqname{$pid} = $pid_fqname;
     }
 
+    $pid_fqname = $running_fqname{$pid};
+
     if ($call eq 'execve') {
        return if $result ne '0';
 
@@ -229,29 +240,34 @@ sub handle_trace {
        my ($basename) = $filename =~ m/([^\/]*)$/;
        if ($basename ne $$argv[0]) {
            $$argv[0] = "$basename($$argv[0])";
-        }
-       my $seq = $pr{$pid}{seq};
+       }
+       my $seq = $pr{$pid_fqname}{seq};
        $seq = [] if not defined $seq;
 
        push @$seq, ['EXEC', $filename, $argv];
 
-       $pr{$pid}{seq} = $seq;
+       $pr{$pid_fqname}{seq} = $seq;
     } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'vfork') {
        return if $result == 0;
 
-       my $seq = $pr{$pid}{seq};
+       my $seq = $pr{$pid_fqname}{seq};
+       my $result_fqname= $result . "-" . $time;
        $seq = [] if not defined $seq;
-       push @$seq, ['FORK', $result];
-       $pr{$pid}{seq} = $seq;
-       $pr{$result}{parent} = $pid;
-    } elsif ($call eq '_exit') {
-       $pr{$pid}{end} = $time if defined $time;
+       push @$seq, ['FORK', $result_fqname];
+       $pr{$pid_fqname}{seq} = $seq;
+       $pr{$result_fqname}{start} = $time;
+       $pr{$result_fqname}{parent} = $pid_fqname;
+       $pr{$result_fqname}{seq} = [];
+       $running_fqname{$result} = $result_fqname;
+    } elsif ($call eq '_exit' || $call eq 'exit_group') {
+       $pr{$running_fqname{$pid}}{end} = $time if defined $time and not defined $pr{$running_fqname{$pid}}{end};
+       delete $running_fqname{$pid};
     }
 }
 
 sub handle_killed {
     my ($pid, $time) = @_;
-    $pr{$pid}{end} = $time if defined $time;
+    $pr{$pid}{end} = $time if defined $time and not defined $pr{$pid}{end};
 }
 
 sub straight_seq {
@@ -307,18 +323,18 @@ sub display_pid_trace {
        if ($$elem[0] eq 'EXEC') {
            my $argv = $$elem[2];
            if (defined $elapsed) {
-               print "$lead [$elapsed] @$argv\n";
+               print "$lead [$elapsed] $pid @$argv\n";
                undef $elapsed;
            } else {
-               print "$lead @$argv\n";
+               print "$lead $pid @$argv\n";
            }
        } elsif ($$elem[0] eq 'FORK') {
            if ($i == 1) {
-                if ($lead =~ /-$/) {
+               if ($lead =~ /-$/) {
                    display_pid_trace($$elem[1], "$lead--+--");
-                } else {
+               } else {
                    display_pid_trace($$elem[1], "$lead  +--");
-                }
+               }
            } elsif ($i == @seq) {
                display_pid_trace($$elem[1], "$lead  `--");
            } else {