TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

detect leaked DelayDeletes, explicitly name and destroy DelayDeletes, base.cr.printDelayDeletes(), prevent DelayDeleted objs from being cached

Browse Source
This commit is contained in:
Darren Ranalli 2008-02-20 22:30:38 +00:00
parent 61dc831678
commit a8a8869011
6 changed files with 104 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
direct/src/distributed/CRCache.py
View File

@ -20,12 +20,28 @@ class CRCache:
"""
assert self.checkCache()
CRCache.notify.debug("Flushing the cache")
# give objects a chance to clean themselves up before checking for DelayDelete leaks
messenger.send('clientCleanup')
# some of these objects might be holding delayDeletes on others
# track each object that is delayDeleted after it gets its chance to delete,
# and check them after all objects have had a chance to delete
delayDeleted = []
for distObj in self.dict.values():
distObj.deleteOrDelay()
if distObj.getDelayDeleteCount() != 0:
self.notify.warning(
'CRCache.flush: could not delete %s (%s), delayDeleteCount=%s' %
(safeRepr(distObj), itype(distObj), distObj.getDelayDeleteCount()))
delayDeleted.append(distObj)
# now that all objects have had a chance to delete, are there any objects left
# that are still delayDeleted?
delayDeleteLeaks = []
for distObj in delayDeleted:
if distObj.getDelayDeleteCount() != 0:
delayDeleteLeaks.append(distObj)
if len(delayDeleteLeaks):
s = 'CRCache.flush:'
for obj in delayDeleteLeaks:
s += ('\n could not delete %s (%s), delayDeletes=%s' %
(safeRepr(obj), itype(obj), obj.getDelayDeleteNames()))
self.notify.error(s)
# Null out all references to the objects so they will get gcd
self.dict = {}
self.fifo = []

24
direct/src/distributed/ClientRepositoryBase.py
View File

@ -64,6 +64,8 @@ class ClientRepositoryBase(ConnectionRepository):
self.heartbeatStarted = 0
self.lastHeartbeat = 0
self._delayDeletedDOs = {}
def setDeferInterval(self, deferInterval):
"""Specifies the minimum amount of time, in seconds, that must
elapse before generating any two DistributedObjects whose
@ -474,7 +476,8 @@ class ClientRepositoryBase(ConnectionRepository):
# Only cache the object if it is a "cacheable" type
# object; this way we don't clutter up the caches with
# trivial objects that don't benefit from caching.
if distObj.getCacheable():
# also don't try to cache an object that is delayDeleted
if distObj.getCacheable() and distObj.getDelayDeleteCount() <= 0:
cache.cache(distObj)
else:
distObj.deleteOrDelay()
@ -683,3 +686,22 @@ class ClientRepositoryBase(ConnectionRepository):
# By default, no ID's are local. See also
# ClientRepository.isLocalId().
return 0
# methods for tracking delaydeletes
def _addDelayDeletedDO(self, do):
# use the id of the object, it's possible to have multiple DelayDeleted instances
# with identical doIds if an object gets deleted then re-generated
key = id(do)
assert key not in self._delayDeletedDOs
self._delayDeletedDOs[key] = do
def _removeDelayDeletedDO(self, do):
key = id(do)
del self._delayDeletedDOs[key]
def printDelayDeletes(self):
print 'DelayDeletes:'
print '============='
for obj in self._delayDeletedDOs.itervalues():
print '%s\t%s (%s)\tdelayDeletes=%s' % (
obj.doId, safeRepr(obj), itype(obj), obj.getDelayDeleteNames())

14
direct/src/distributed/DelayDelete.py
View File

@ -25,9 +25,13 @@ class DelayDelete:
DelayDelete object ceases to exist, it may be deleted.
"""
def __init__(self, distObj):
self.distObj = distObj
self.distObj.delayDelete(1)
def __init__(self, distObj, name):
self._distObj = distObj
self._token = self._distObj.acquireDelayDelete(name)
def __del__(self):
self.distObj.delayDelete(0)
def destroy(self):
token = self._token
# do this first to catch cases where releaseDelayDelete causes
# this method to be called again
del self._token
self._distObj.releaseDelayDelete(token)

52
direct/src/distributed/DistributedObject.py
View File

@ -29,6 +29,8 @@ class DistributedObject(DistributedObjectBase):
# even to the quiet zone.
neverDisable = 0
DelayDeleteSerialGen = SerialNumGen()
def __init__(self, cr):
assert self.notify.debugStateCall(self)
try:
@ -45,9 +47,7 @@ class DistributedObject(DistributedObjectBase):
# it needs to be optimized in this way.
self.setCacheable(0)
# This count tells whether the object can be deleted right away,
# or not.
self.delayDeleteCount = 0
self._token2delayDeleteName = {}
# This flag tells whether a delete has been requested on this
# object.
self.deleteImminent = 0
@ -143,43 +143,45 @@ class DistributedObject(DistributedObjectBase):
return self.cacheable
def deleteOrDelay(self):
if self.delayDeleteCount > 0:
if len(self._token2delayDeleteName) > 0:
self.deleteImminent = 1
else:
self.disableAnnounceAndDelete()
def getDelayDeleteCount(self):
return self.delayDeleteCount
return len(self._token2delayDeleteName)
def delayDelete(self, flag):
# Flag should be 0 or 1, meaning increment or decrement count
def acquireDelayDelete(self, name):
# Also see DelayDelete.py
if (flag == 1):
self.delayDeleteCount += 1
elif (flag == 0):
self.delayDeleteCount -= 1
else:
self.notify.error("Invalid flag passed to delayDelete: " + str(flag))
if self.getDelayDeleteCount() == 0:
self.cr._addDelayDeletedDO(self)
if (self.delayDeleteCount < 0):
self.notify.error("Somebody decremented delayDelete for doId %s without incrementing"
% (self.doId))
elif (self.delayDeleteCount == 0):
token = DistributedObject.DelayDeleteSerialGen.next()
self._token2delayDeleteName[token] = name
assert self.notify.debug(
"delayDelete count for doId %s now %s" %
(self.doId, len(self._token2delayDeleteName)))
# Return the token, user must pass token to releaseDelayDelete
return token
def releaseDelayDelete(self, token):
name = self._token2delayDeleteName.pop(token)
assert self.notify.debug("releasing delayDelete '%s'" % name)
if len(self._token2delayDeleteName) == 0:
assert self.notify.debug(
"delayDeleteCount for doId %s now 0" % (self.doId))
"delayDelete count for doId %s now 0" % (self.doId))
self.cr._removeDelayDeletedDO(self)
if self.deleteImminent:
assert self.notify.debug(
"delayDeleteCount for doId %s -- deleteImminent" %
"delayDelete count for doId %s -- deleteImminent" %
(self.doId))
self.disableAnnounceAndDelete()
else:
self.notify.debug(
"delayDeleteCount for doId %s now %s" %
(self.doId, self.delayDeleteCount))
# Return the count just for kicks
return self.delayDeleteCount
def getDelayDeleteNames(self):
return self._token2delayDeleteName.values()
def disableAnnounceAndDelete(self):
self.disableAndAnnounce()

51
direct/src/distributed/DistributedObjectOV.py
View File

@ -29,13 +29,6 @@ class DistributedObjectOV(DistributedObjectBase):
self.DistributedObjectOV_initialized = 1
DistributedObjectBase.__init__(self, cr)
# This count tells whether the object can be deleted right away,
# or not.
self.delayDeleteCount = 0
# This flag tells whether a delete has been requested on this
# object.
self.deleteImminent = 0
# Keep track of our state as a distributed object. This
# is only trustworthy if the inheriting class properly
# calls up the chain for disable() and generate().
@ -64,51 +57,19 @@ class DistributedObjectOV(DistributedObjectBase):
print
except Exception, e: print "%serror printing status"%(spaces,), e
def getDelayDeleteCount(self):
# OV objects cannot be delayDeleted
return 0
def deleteOrDelay(self):
if self.delayDeleteCount > 0:
self.deleteImminent = 1
else:
self.disableAnnounceAndDelete()
def delayDelete(self, flag):
# Flag should be 0 or 1, meaning increment or decrement count
# Also see DelayDelete.py
if (flag == 1):
self.delayDeleteCount += 1
elif (flag == 0):
self.delayDeleteCount -= 1
else:
self.notify.error("Invalid flag passed to delayDelete: " + str(flag))
if (self.delayDeleteCount < 0):
self.notify.error("Somebody decremented delayDelete for doId %s without incrementing"
% (self.doId))
elif (self.delayDeleteCount == 0):
assert self.notify.debug(
"delayDeleteCount for doId %s now 0" %
(self.doId))
if self.deleteImminent:
assert self.notify.debug(
"delayDeleteCount for doId %s -- deleteImminent" %
(self.doId))
self.disableAnnounceAndDelete()
else:
self.notify.debug(
"delayDeleteCount for doId %s now %s" %
(self.doId, self.delayDeleteCount))
# Return the count just for kicks
return self.delayDeleteCount
self.disableAnnounceAndDelete()
def disableAnnounceAndDelete(self):
self.disableAndAnnounce()
self.delete()
def disableAndAnnounce(self):
"""
Inheritors should *not* redefine this function.
"""
# We must send the disable announce message *before* we
# actually disable the object. That way, the various cleanup
# tasks can run first and take care of restoring the object to

20
direct/src/interval/IntervalGlobal.py
View File

@ -18,3 +18,23 @@ from IntervalManager import *
if __debug__:
from TestInterval import *
from pandac.PandaModules import WaitInterval
# there is legacy code in Toontown that puts interval-related DelayDeletes directly
# on the interval object, relying on Python to __del__ the DelayDelete when the interval
# is garbage-collected. DelayDelete now requires .destroy() to be called.
# To reduce code duplication, this method may be called to clean up delayDeletes that
# have been placed on an interval.
def cleanupDelayDeletes(interval):
if hasattr(interval, 'delayDelete'):
delayDelete = interval.delayDelete
# get rid of the reference before calling destroy in case destroy causes
# this function to be called again
del interval.delayDelete
delayDelete.destroy()
if hasattr(interval, 'delayDeletes'):
delayDeletes = interval.delayDeletes
# get rid of the reference before calling destroy in case destroy causes
# this function to be called again
del interval.delayDeletes
for i in delayDeletes:
i.destroy()