Add stdout flushing to some tools (#2110)
* add stdout flushing to some tools
* change printb import source in opensnoop tool
diff --git a/tools/opensnoop.py b/tools/opensnoop.py
index 1a68f69..d8d06d1 100755
--- a/tools/opensnoop.py
+++ b/tools/opensnoop.py
@@ -16,6 +16,7 @@
from __future__ import print_function
from bcc import ArgString, BPF
+from bcc.utils import printb
import argparse
import ctypes as ct
from datetime import datetime, timedelta
@@ -222,7 +223,7 @@
if args.extended_fields:
print("%08o " % event.flags, end="")
- print(event.fname.decode('utf-8', 'replace'))
+ printb(b'%s' % event.fname.decode('utf-8', 'replace'))
# loop with callback to print_event
b["events"].open_perf_buffer(print_event, page_cnt=64)
diff --git a/tools/solisten.py b/tools/solisten.py
index e816890..81e82e0 100755
--- a/tools/solisten.py
+++ b/tools/solisten.py
@@ -23,6 +23,7 @@
import argparse
from bcc import BPF
import ctypes as ct
+from bcc.utils import printb
# Arguments
examples = """Examples:
@@ -165,12 +166,12 @@
# Display
if show_netns:
- print("%-6d %-12.12s %-12s %-6s %-8s %-5s %-39s" % (
+ printb(b"%-6d %-12.12s %-12s %-6s %-8s %-5s %-39s" % (
pid, event.task, event.netns, protocol, event.backlog,
event.lport, address,
))
else:
- print("%-6d %-12.12s %-6s %-8s %-5s %-39s" % (
+ printb(b"%-6d %-12.12s %-6s %-8s %-5s %-39s" % (
pid, event.task, protocol, event.backlog,
event.lport, address,
))
diff --git a/tools/tcpaccept.py b/tools/tcpaccept.py
index d8ef4eb..e66d334 100755
--- a/tools/tcpaccept.py
+++ b/tools/tcpaccept.py
@@ -21,6 +21,7 @@
from struct import pack
import argparse
import ctypes as ct
+from bcc.utils import printb
# arguments
examples = """examples:
@@ -238,7 +239,7 @@
if start_ts == 0:
start_ts = event.ts_us
print("%-9.3f" % ((float(event.ts_us) - start_ts) / 1000000), end="")
- print("%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
+ printb(b"%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
event.task.decode('utf-8', 'replace'), event.ip,
inet_ntop(AF_INET, pack("I", event.daddr)),
inet_ntop(AF_INET, pack("I", event.saddr)), event.lport))
@@ -250,7 +251,7 @@
if start_ts == 0:
start_ts = event.ts_us
print("%-9.3f" % ((float(event.ts_us) - start_ts) / 1000000), end="")
- print("%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
+ printb(b"%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
event.task.decode('utf-8', 'replace'), event.ip,
inet_ntop(AF_INET6, event.daddr),inet_ntop(AF_INET6, event.saddr),
event.lport))
diff --git a/tools/tcpconnect.py b/tools/tcpconnect.py
index e1f4461..ddd3fa3 100755
--- a/tools/tcpconnect.py
+++ b/tools/tcpconnect.py
@@ -19,6 +19,7 @@
from __future__ import print_function
from bcc import BPF
+from bcc.utils import printb
import argparse
from socket import inet_ntop, ntohs, AF_INET, AF_INET6
from struct import pack
@@ -201,7 +202,7 @@
if start_ts == 0:
start_ts = event.ts_us
print("%-9.3f" % ((float(event.ts_us) - start_ts) / 1000000), end="")
- print("%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
+ printb(b"%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
event.task.decode('utf-8', 'replace'), event.ip,
inet_ntop(AF_INET, pack("I", event.saddr)),
inet_ntop(AF_INET, pack("I", event.daddr)), event.dport))
@@ -213,7 +214,7 @@
if start_ts == 0:
start_ts = event.ts_us
print("%-9.3f" % ((float(event.ts_us) - start_ts) / 1000000), end="")
- print("%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
+ printb(b"%-6d %-12.12s %-2d %-16s %-16s %-4d" % (event.pid,
event.task.decode('utf-8', 'replace'), event.ip,
inet_ntop(AF_INET6, event.saddr), inet_ntop(AF_INET6, event.daddr),
event.dport))
