Merge pull request iovisor#1585 from palmtenor/usdt_destruct

Destruct USDTContext correctly in Python
ego · Feb 10, 2018 · cbfd285 · cbfd285
2 parents e01c993 + e060464
commit cbfd285
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/cc/usdt/usdt.cc b/src/cc/usdt/usdt.cc
@@ -414,8 +414,10 @@ void *bcc_usdt_new_frompath(const char *path) {
 }
 
 void bcc_usdt_close(void *usdt) {
- USDT::Context *ctx = static_cast<USDT::Context *>(usdt);
- delete ctx;
+ if (usdt) {
+ USDT::Context *ctx = static_cast<USDT::Context *>(usdt);
+ delete ctx;
+ }
 }
 
 int bcc_usdt_enable_probe(void *usdt, const char *probe_name,

diff --git a/src/python/bcc/usdt.py b/src/python/bcc/usdt.py
@@ -142,6 +142,9 @@ def __init__(self, pid=None, path=None):
  raise USDTException(
  "either a pid or a binary path must be specified")
 
+ def __del__(self):
+ lib.bcc_usdt_close(self.context)
+
  def enable_probe(self, probe, fn_name):
  if lib.bcc_usdt_enable_probe(self.context, probe.encode('ascii'),
  fn_name.encode('ascii')) != 0: