Author: kpvdr
Date: 2009-07-29 15:22:31 -0400 (Wed, 29 Jul 2009)
New Revision: 3526
Modified:
store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
Log:
Minor improvements to python analysis tool
Modified: store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-07-29 17:18:34 UTC (rev 3525)
+++ store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-07-29 19:22:31 UTC (rev 3526)
@@ -550,7 +550,7 @@
warn = ' (WARNING: dequeue rid 0x%x dequeues
locked enqueue record 0x%x)' % (hdr.rid, hdr.deq_rid)
del self.emap[hdr.deq_rid]
else:
- warn = ' (WARNING: rid being dequeued %d not
found in enqueued records)' % hdr.deq_rid
+ warn = ' (WARNING: rid being dequeued 0x%x not
found in enqueued records)' % hdr.deq_rid
else:
if hdr.deq_rid in self.emap:
t = self.emap[hdr.deq_rid]
@@ -800,13 +800,14 @@
print 'WARNING: Found %d messages; %d expected.' % (self.msg_cnt,
self.num_msgs)
if len(self.emap) > 0:
print
- print 'Remaining enqueued records: '
- for h in self.emap:
- if self.emap[h][2] == True: # locked
+ print 'Remaining enqueued records (sorted by rid): '
+ keys = sorted(self.emap.keys())
+ for k in keys:
+ if self.emap[k][2] == True: # locked
locked = ' (locked)'
else:
locked = ''
- print " fid=%d %s%s" % (self.emap[h][0], self.emap[h][1],
locked)
+ print " fid=%d %s%s" % (self.emap[k][0], self.emap[k][1],
locked)
print 'WARNING: Enqueue-Dequeue mismatch, %d enqueued records
remain.' % len(self.emap)
if len(self.tmap) > 0:
txn_rec_cnt = 0