tools/execsnoop: add '-C' option to display CPU column

tools/execsnoop.py

@@ -276,8 +276,9 @@ def check_cpu_filed():
 if args.print_uid:
  print("%-6s" % ("UID"), end="")
 if args.print_cpu:
- print("%-6s" % ("CPU"), end="")
-print("%-16s %-7s %-7s %3s %s" % ("PCOMM", "PID", "PPID", "RET", "ARGS"))
+ print("%-16s %-7s %-7s %-4s %3s %s" % ("PCOMM", "PID", "PPID", "CPU", "RET", "ARGS"))
+else:
+ print("%-16s %-7s %-7s %3s %s" % ("PCOMM", "PID", "PPID", "RET", "ARGS"))
 
 class EventType(object):
  EVENT_ARG = 0
@@ -328,13 +329,15 @@ def print_event(cpu, data, size):
  printb(b"%-8.3f" % (time.time() - start_ts), nl="")
  if args.print_uid:
  printb(b"%-6d" % event.uid, nl="")
- if args.print_cpu:
- printb(b"%-6d" % event.cpu, nl="")
  ppid = event.ppid if event.ppid > 0 else get_ppid(event.pid)
  ppid = b"%d" % ppid if ppid > 0 else b"?"
  argv_text = b' '.join(argv[event.pid]).replace(b'\n', b'\\n')
- printb(b"%-16s %-7d %-7s %3d %s" % (event.comm, event.pid,
- ppid, event.retval, argv_text))
+ if args.print_cpu:
+ printb(b"%-16s %-7d %-7s %-4d %3d %s" % (event.comm, event.pid,
+ ppid, event.cpu, event.retval, argv_text))
+ else:
+ printb(b"%-16s %-7d %-7s %3d %s" % (event.comm, event.pid,
+ ppid, event.retval, argv_text))
  try:
  del(argv[event.pid])
  except Exception: