Add cb_cookie to perf_reader_lost_cb

devopsleague · Dec 20, 2017 · b7bbd04 · b7bbd04
1 parent d271f3e
commit b7bbd04
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/cc/libbpf.h b/src/cc/libbpf.h
@@ -68,7 +68,7 @@ int bpf_open_raw_sock(const char *name);
 typedef void (*perf_reader_cb)(void *cb_cookie, int pid, uint64_t callchain_num,
  void *callchain);
 typedef void (*perf_reader_raw_cb)(void *cb_cookie, void *raw, int raw_size);
-typedef void (*perf_reader_lost_cb)(uint64_t lost);
+typedef void (*perf_reader_lost_cb)(void *cb_cookie, uint64_t lost);
 
 void *bpf_attach_kprobe(int progfd, enum bpf_probe_attach_type attach_type,
  const char *ev_name, const char *fn_name,

diff --git a/src/cc/perf_reader.c b/src/cc/perf_reader.c
@@ -253,7 +253,7 @@ void perf_reader_event_read(struct perf_reader *reader) {
  */
  uint64_t lost = *(uint64_t *)(ptr + sizeof(*e) + sizeof(uint64_t));
  if (reader->lost_cb) {
- reader->lost_cb(lost);
+ reader->lost_cb(reader->cb_cookie, lost);
  } else {
  fprintf(stderr, "Possibly lost %" PRIu64 " samples\n", lost);
  }

diff --git a/src/lua/bcc/libbcc.lua b/src/lua/bcc/libbcc.lua
@@ -41,7 +41,7 @@ int bpf_open_raw_sock(const char *name);
 
 typedef void (*perf_reader_cb)(void *cb_cookie, int pid, uint64_t callchain_num, void *callchain);
 typedef void (*perf_reader_raw_cb)(void *cb_cookie, void *raw, int raw_size);
-typedef void (*perf_reader_lost_cb)(uint64_t lost);
+typedef void (*perf_reader_lost_cb)(void *cb_cookie, uint64_t lost);
 
 void *bpf_attach_kprobe(int progfd, int attach_type, const char *ev_name,
  const char *fn_name, perf_reader_cb cb,

diff --git a/src/lua/bcc/table.lua b/src/lua/bcc/table.lua
@@ -252,8 +252,8 @@ function PerfEventArray:_open_perf_buffer(cpu, callback, ctype, page_cnt, lost_c
  local _lost_cb = nil
  if lost_cb then
  _lost_cb = ffi.cast("perf_reader_lost_cb",
- function (lost)
- lost_cb(lost)
+ function (cookie, lost)
+ lost_cb(cookie, lost)
  end)
  end
 

diff --git a/src/python/bcc/libbcc.py b/src/python/bcc/libbcc.py
@@ -89,7 +89,7 @@
 _CB_TYPE = ct.CFUNCTYPE(None, ct.py_object, ct.c_int,
  ct.c_ulonglong, ct.POINTER(ct.c_ulonglong))
 _RAW_CB_TYPE = ct.CFUNCTYPE(None, ct.py_object, ct.c_void_p, ct.c_int)
-_LOST_CB_TYPE = ct.CFUNCTYPE(None, ct.c_ulonglong)
+_LOST_CB_TYPE = ct.CFUNCTYPE(None, ct.py_object, ct.c_ulonglong)
 lib.bpf_attach_kprobe.argtypes = [ct.c_int, ct.c_int, ct.c_char_p, ct.c_char_p,
  _CB_TYPE, ct.py_object]
 lib.bpf_detach_kprobe.restype = ct.c_int