TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

added 'collect' option to avoid redundant collects

Browse Source
This commit is contained in:
Darren Ranalli 2009-01-26 23:06:03 +00:00
parent 90eb2bf52e
commit 1872148320
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
direct/src/showbase/GarbageReport.py
View File

@ -37,15 +37,18 @@ class GarbageReport(Job):
def __init__(self, name, log=True, verbose=False, fullReport=False, findCycles=True, def __init__(self, name, log=True, verbose=False, fullReport=False, findCycles=True,
threaded=False, doneCallback=None, autoDestroy=False, priority=None, threaded=False, doneCallback=None, autoDestroy=False, priority=None,
safeMode=False, delOnly=False): safeMode=False, delOnly=False, collect=True):
# if autoDestroy is True, GarbageReport will self-destroy after logging # if autoDestroy is True, GarbageReport will self-destroy after logging
# if false, caller is responsible for calling destroy() # if false, caller is responsible for calling destroy()
# if threaded is True, processing will be performed over multiple frames # if threaded is True, processing will be performed over multiple frames
# if collect is False, we assume that the caller just did a collect and the results
# are still in gc.garbage
Job.__init__(self, name) Job.__init__(self, name)
# stick the arguments onto a ScratchPad so we can delete them all at once # stick the arguments onto a ScratchPad so we can delete them all at once
self._args = ScratchPad(name=name, log=log, verbose=verbose, fullReport=fullReport, self._args = ScratchPad(name=name, log=log, verbose=verbose, fullReport=fullReport,
findCycles=findCycles, doneCallback=doneCallback, findCycles=findCycles, doneCallback=doneCallback,
autoDestroy=autoDestroy, safeMode=safeMode, delOnly=delOnly) autoDestroy=autoDestroy, safeMode=safeMode, delOnly=delOnly,
collect=collect)
if priority is not None: if priority is not None:
self.setPriority(priority) self.setPriority(priority)
jobMgr.add(self) jobMgr.add(self)
@ -62,7 +65,8 @@ class GarbageReport(Job):
# cycles that do not involve any instances that define __del__ are cleaned up # cycles that do not involve any instances that define __del__ are cleaned up
# automatically by Python, but they also appear in gc.garbage when SAVEALL is set # automatically by Python, but they also appear in gc.garbage when SAVEALL is set
gc.set_debug(0) gc.set_debug(0)
gc.collect() if self._args.collect:
gc.collect()
garbageInstances = gc.garbage[:] garbageInstances = gc.garbage[:]
del gc.garbage[:] del gc.garbage[:]
# only yield if there's more time-consuming work to do, # only yield if there's more time-consuming work to do,
@ -88,7 +92,8 @@ class GarbageReport(Job):
# do a SAVEALL pass so that we have all of the objects involved in legitimate garbage cycles # do a SAVEALL pass so that we have all of the objects involved in legitimate garbage cycles
# without SAVEALL, gc.garbage only contains objects with __del__ methods # without SAVEALL, gc.garbage only contains objects with __del__ methods
gc.set_debug(gc.DEBUG_SAVEALL) gc.set_debug(gc.DEBUG_SAVEALL)
gc.collect() if self._args.collect:
gc.collect()
self.garbage = gc.garbage[:] self.garbage = gc.garbage[:]
del gc.garbage[:] del gc.garbage[:]
# only yield if there's more time-consuming work to do, # only yield if there's more time-consuming work to do,
@ -523,7 +528,7 @@ def checkForGarbageLeaks():
(not configIsToday('disable-garbage-logging'))): (not configIsToday('disable-garbage-logging'))):
GarbageLogger.LastNumGarbage = numGarbage GarbageLogger.LastNumGarbage = numGarbage
print print
gr = GarbageLogger('found garbage', threaded=False) gr = GarbageLogger('found garbage', threaded=False, collect=False)
print print
notify = directNotify.newCategory("GarbageDetect") notify = directNotify.newCategory("GarbageDetect")
if config.GetBool('allow-garbage-cycles', 1): if config.GetBool('allow-garbage-cycles', 1):