Merge pull request iovisor#1393 from pchaigno/handle-epipe

Exit on EPIPE
zilder · Oct 26, 2017 · fbbe6d6 · fbbe6d6
2 parents 1e7dc39 + 860dbb0
commit fbbe6d6
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/python/bcc/table.py b/src/python/bcc/table.py
@@ -17,6 +17,7 @@
 from functools import reduce
 import multiprocessing
 import os
+import errno
 
 from .libbcc import lib, _RAW_CB_TYPE, _LOST_CB_TYPE
 from .perf import Perf
@@ -523,8 +524,24 @@ def open_perf_buffer(self, callback, page_cnt=8, lost_cb=None):
             self._open_perf_buffer(i, callback, page_cnt, lost_cb)
 
     def _open_perf_buffer(self, cpu, callback, page_cnt, lost_cb):
-        fn = _RAW_CB_TYPE(lambda _, data, size: callback(cpu, data, size))
-        lost_fn = _LOST_CB_TYPE(lambda lost: lost_cb(lost)) if lost_cb else ct.cast(None, _LOST_CB_TYPE)
+        def raw_cb_(_, data, size):
+            try:
+                callback(cpu, data, size)
+            except IOError, e:
+                if e.errno == errno.EPIPE:
+                    exit()
+                else:
+                    raise e
+        def lost_cb_(lost):
+            try:
+                lost_cb(lost)
+            except IOError, e:
+                if e.errno == errno.EPIPE:
+                    exit()
+                else:
+                    raise e
+        fn = _RAW_CB_TYPE(raw_cb_)
+        lost_fn = _LOST_CB_TYPE(lost_cb_) if lost_cb else ct.cast(None, _LOST_CB_TYPE)
         reader = lib.bpf_open_perf_buffer(fn, lost_fn, None, -1, cpu, page_cnt)
         if not reader:
             raise Exception("Could not open perf buffer")