From fcdc4ad0bf5ef3661e6cb1fa7abd487efb23e46c Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Sun, 13 Jul 2014 21:57:00 +0000 Subject: astobj2: work around REF_DEBUG race which causes out of order log entries * Update refcounter.py to use delta's to track the current reference count. * Use result from internal_ao2_ref to write old_refcount to refs_log. Review: https://reviewboard.asterisk.org/r/3756/ ........ Merged revisions 418504 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 418505 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 418506 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418507 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- contrib/scripts/refcounter.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'contrib/scripts/refcounter.py') diff --git a/contrib/scripts/refcounter.py b/contrib/scripts/refcounter.py index 3aad3530a..9bad4007c 100755 --- a/contrib/scripts/refcounter.py +++ b/contrib/scripts/refcounter.py @@ -79,10 +79,15 @@ def process_file(options): obj = parsed_line['addr'] if obj not in current_objects: - current_objects[obj] = [] - if options.skewed and 'constructor' not in parsed_line['state']: - skewed_objects.append((obj, current_objects[obj])) - current_objects[obj].append("[%s] %s:%s %s: %s %s - [%s]" % ( + current_objects[obj] = {'log': [], 'curcount': 1,} + if 'constructor' not in parsed_line['state']: + current_objects[obj]['curcount'] = parsed_line['state'] + if options.skewed: + skewed_objects.append((obj, current_objects[obj])) + else: + current_objects[obj]['curcount'] += int(parsed_line['delta']) + + current_objects[obj]['log'].append("[%s] %s:%s %s: %s %s - [%s]" % ( parsed_line['thread_id'], parsed_line['file'], parsed_line['line'], @@ -91,7 +96,7 @@ def process_file(options): parsed_line['tag'], parsed_line['state'])) - if 'destructor' in parsed_line['state']: + if current_objects[obj]['curcount'] == 0: if options.normal: finished_objects.append((obj, current_objects[obj])) del current_objects[obj] @@ -115,7 +120,7 @@ def print_objects(objects, prefix=""): print "\n" for obj in objects: print "==== %s Object %s history ====" % (prefix, obj[0]) - for line in obj[1]: + for line in obj[1]['log']: print line print "\n" -- cgit v1.2.3