[COMMIT osv master] scripts/loader.py: make osv info callouts work with older C++ ABI

4 views
Skip to first unread message

Commit Bot

unread,
Feb 25, 2020, 12:35:14 AM2/25/20
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

scripts/loader.py: make osv info callouts work with older C++ ABI

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/scripts/loader.py b/scripts/loader.py
--- a/scripts/loader.py
+++ b/scripts/loader.py
@@ -1034,7 +1034,10 @@ def invoke(self, arg, for_tty):
fname = callout['c_fn']

# time
- t = int(callout['c_to_ns']['__d']['__r'])
+ try:
+ t = int(callout['c_to_ns']['__d']['__r'])
+ except gdb.error:
+ t = int(callout['c_to_ns'])

# flags
CALLOUT_ACTIVE = 0x0002
Reply all
Reply to author
Forward
0 new messages