From 7fb7bfa67e75714313f09300722cd4ea447ea3db Mon Sep 17 00:00:00 2001
From: Michael Przybylski <mike.przybylski@appdynamics.com>
Date: Thu, 19 Jan 2017 23:54:03 -0800
Subject: [PATCH] Fixed TestUprobes.test_simple_library() in test_uprobes.lua

---
 src/lua/bcc/bpf.lua        | 2 +-
 src/lua/bcc/sym.lua        | 4 ++--
 tests/lua/test_uprobes.lua | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lua/bcc/bpf.lua b/src/lua/bcc/bpf.lua
index 50e722eb41cd..cf68d4b72881 100644
--- a/src/lua/bcc/bpf.lua
+++ b/src/lua/bcc/bpf.lua
@@ -180,7 +180,7 @@ end
 function Bpf:attach_uprobe(args)
   Bpf.check_probe_quota(1)
 
-  local path, addr = Sym.check_path_symbol(args.name, args.sym, args.addr)
+  local path, addr = Sym.check_path_symbol(args.name, args.sym, args.addr, args.pid)
   local fn = self:load_func(args.fn_name, 'BPF_PROG_TYPE_KPROBE')
   local ptype = args.retprobe and "r" or "p"
   local ev_name = string.format("%s_%s_0x%p", ptype, path:gsub("[^%a%d]", "_"), addr)
diff --git a/src/lua/bcc/sym.lua b/src/lua/bcc/sym.lua
index 39fe017601d0..539336d2008f 100644
--- a/src/lua/bcc/sym.lua
+++ b/src/lua/bcc/sym.lua
@@ -30,10 +30,10 @@ local function create_cache(pid)
   }
 end
 
-local function check_path_symbol(module, symname, addr)
+local function check_path_symbol(module, symname, addr, pid)
   local sym = SYM()
   local module_path
-  if libbcc.bcc_resolve_symname(module, symname, addr or 0x0, 0, sym) < 0 then
+  if libbcc.bcc_resolve_symname(module, symname, addr or 0x0, pid or 0, sym) < 0 then
     if sym[0].module == nil then
       error("could not find library '%s' in the library path" % module)
     else
diff --git a/tests/lua/test_uprobes.lua b/tests/lua/test_uprobes.lua
index d419eb513bb0..965e9eba24df 100644
--- a/tests/lua/test_uprobes.lua
+++ b/tests/lua/test_uprobes.lua
@@ -27,8 +27,8 @@ int count(struct pt_regs *ctx) {
   local text = text:gsub("PID", tostring(pid))
 
   local b = BPF:new{text=text}
-  b:attach_uprobe{name="c", sym="malloc_stats", fn_name="count"}
-  b:attach_uprobe{name="c", sym="malloc_stats", fn_name="count", retprobe=true}
+  b:attach_uprobe{name="c", sym="malloc_stats", fn_name="count", pid=pid}
+  b:attach_uprobe{name="c", sym="malloc_stats", fn_name="count", pid=pid, retprobe=true}
 
   assert_equals(BPF.num_open_uprobes(), 2)