mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
report number of garbage cycles instead of number of garbage items
This commit is contained in:
parent
fb1aa31b78
commit
82c8616e91
@ -246,10 +246,12 @@ class GarbageReport(Job):
|
|||||||
yield None
|
yield None
|
||||||
self.cycleIds.update(set(cycle))
|
self.cycleIds.update(set(cycle))
|
||||||
|
|
||||||
|
self.numCycles = len(self.cycles)
|
||||||
|
|
||||||
if self._args.findCycles:
|
if self._args.findCycles:
|
||||||
s = ['===== GarbageReport: \'%s\' (%s %s) =====' % (
|
s = ['===== GarbageReport: \'%s\' (%s %s) =====' % (
|
||||||
self._args.name, len(self.cycles),
|
self._args.name, self.numCycles,
|
||||||
choice(len(self.cycles) == 1, 'cycle', 'cycles'))]
|
choice(self.numCycles == 1, 'cycle', 'cycles'))]
|
||||||
else:
|
else:
|
||||||
s = ['===== GarbageReport: \'%s\' =====' % (
|
s = ['===== GarbageReport: \'%s\' =====' % (
|
||||||
self._args.name)]
|
self._args.name)]
|
||||||
@ -306,7 +308,7 @@ class GarbageReport(Job):
|
|||||||
if self._args.findCycles:
|
if self._args.findCycles:
|
||||||
s.append('===== Garbage Cycles (Garbage Item Numbers) =====')
|
s.append('===== Garbage Cycles (Garbage Item Numbers) =====')
|
||||||
ac = AlphabetCounter()
|
ac = AlphabetCounter()
|
||||||
for i in xrange(len(self.cycles)):
|
for i in xrange(self.numCycles):
|
||||||
yield None
|
yield None
|
||||||
s.append('%s:%s' % (ac.next(), self.cycles[i]))
|
s.append('%s:%s' % (ac.next(), self.cycles[i]))
|
||||||
|
|
||||||
@ -358,8 +360,9 @@ class GarbageReport(Job):
|
|||||||
#print 'GarbageReport.destroy'
|
#print 'GarbageReport.destroy'
|
||||||
del self._args
|
del self._args
|
||||||
del self.garbage
|
del self.garbage
|
||||||
# don't get rid of this, we might need it
|
# don't get rid of these, we might need them
|
||||||
#del self.numGarbage
|
#del self.numGarbage
|
||||||
|
#del self.numCycles
|
||||||
del self.referrersByReference
|
del self.referrersByReference
|
||||||
del self.referrersByNumber
|
del self.referrersByNumber
|
||||||
del self.referentsByReference
|
del self.referentsByReference
|
||||||
@ -371,9 +374,9 @@ class GarbageReport(Job):
|
|||||||
del self._reportStr
|
del self._reportStr
|
||||||
Job.destroy(self)
|
Job.destroy(self)
|
||||||
|
|
||||||
def getNumItems(self):
|
def getNumCycles(self):
|
||||||
# if the job hasn't run yet, we don't have a numGarbage yet
|
# if the job hasn't run yet, we don't have a numCycles yet
|
||||||
return self.numGarbage
|
return self.numCycles
|
||||||
|
|
||||||
def getGarbage(self):
|
def getGarbage(self):
|
||||||
return self.garbage
|
return self.garbage
|
||||||
|
Loading…
x
Reference in New Issue
Block a user