X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=utilities%2Fovs-lib.in;h=3905a846fd84d3884cf7ab6695e4c367de96bff3;hb=d2859659800b7e01281d1ca84a726d6b20e98ee1;hp=f8e26091c5c3619a750b4205ed5b4097ad7ac185;hpb=287e3bc0ae88b7fe8cb09561be7cf2e0a0aa4920;p=openvswitch

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index f8e26091..3905a846 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -91,6 +91,7 @@ start_daemon () {
     wrapper=$2
     shift; shift
     daemon=$1
+    strace=""
 
     # drop core files in a sensible place
     test -d "$DAEMON_CWD" || install -d -m 755 -o root -g root "$DAEMON_CWD"
@@ -118,7 +119,12 @@ start_daemon () {
             ;;
         strace)
             if (strace -V) > /dev/null 2>&1; then
-                set strace -D -ff -o "$logdir/$daemon.strace.log" "$@"
+                strace="strace -tt -T -s 256 -ff"
+                if (strace -DV) > /dev/null 2>&1; then
+                    # Has the -D option.
+                    set $strace -D -o "$logdir/$daemon.strace.log" "$@"
+                    strace=""
+                fi
             else
                 log_failure_msg "strace not installed, running $daemon without it"
             fi
@@ -136,6 +142,12 @@ start_daemon () {
     fi
 
     action "Starting $daemon" "$@"
+
+    if test X"$strace" != X; then
+        # Strace doesn't have the -D option so we attach after the fact.
+        setsid $strace -o "$logdir/$daemon.strace.log" \
+            -p `cat $rundir/$daemon.pid` > /dev/null 2>&1 &
+    fi
 }
 
 DAEMON_CWD=/