Merge pull request iovisor#959 from r4f4/fix-uobjnew

Fix uobjnew and ustat on python3

src/python/bcc/usdt.py

@@ -128,7 +128,7 @@ def enable_probe(self, probe, fn_name):
  probe)
 
  def get_text(self):
- return lib.bcc_usdt_genargs(self.context)
+ return lib.bcc_usdt_genargs(self.context).decode()
 
  def get_probe_arg_ctype(self, probe_name, arg_index):
  return lib.bcc_usdt_get_probe_argctype(

tools/uobjnew.py

@@ -147,13 +147,13 @@
  print()
  data = bpf["allocs"]
  if args.top_count:
- data = sorted(data.items(), key=lambda (k, v): v.num_allocs)
+ data = sorted(data.items(), key=lambda k, v: v.num_allocs)
  data = data[-args.top_count:]
  elif args.top_size:
- data = sorted(data.items(), key=lambda (k, v): v.total_size)
+ data = sorted(data.items(), key=lambda k, v: v.total_size)
  data = data[-args.top_size:]
  else:
- data = sorted(data.items(), key=lambda (k, v): v.total_size)
+ data = sorted(data.items(), key=lambda k, v: v.total_size)
  print("%-30s %8s %12s" % ("TYPE", "# ALLOCS", "# BYTES"))
  for key, value in data:
  if args.language == "c":

tools/ustat.py

@@ -239,10 +239,10 @@ def _loop_iter(self):
  counts.update(probe.get_counts(self.bpf))
  targets.update(probe.targets)
  if self.args.sort:
- counts = sorted(counts.items(), key=lambda (_, v):
+ counts = sorted(counts.items(), key=lambda _, v:
  -v.get(self.args.sort.upper(), 0))
  else:
- counts = sorted(counts.items(), key=lambda (k, _): k)
+ counts = sorted(counts.items(), key=lambda k, _: k)
  for pid, stats in counts:
  print("%-6d %-20s %-10d %-6d %-10d %-8d %-6d %-6d" % (
  pid, targets[pid][:20],