Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug tests for trying to catch the flushmem bug #1064.

Browse source
This commit is contained in:
Griatch 2016-10-02 10:11:08 +02:00
parent 589d6737db
commit cd616caf29
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/objects/models.py
View file

@ -22,7 +22,7 @@ from django.core.exceptions import ObjectDoesNotExist
from evennia.typeclasses.models import TypedObject from evennia.typeclasses.models import TypedObject
from evennia.objects.manager import ObjectDBManager from evennia.objects.manager import ObjectDBManager
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import (make_iter, dbref, lazy_property) from evennia.utils.utils import (make_iter, dbref, lazy_property, calledby)
class ContentsHandler(object): class ContentsHandler(object):
@ -51,8 +51,10 @@ class ContentsHandler(object):
Re-initialize the content cache Re-initialize the content cache
""" """
print "__init__", self.obj, calledby()
self._pkcache.update(dict((obj.pk, None) for obj in self._pkcache.update(dict((obj.pk, None) for obj in
ObjectDB.objects.filter(db_location=self.obj) if obj.pk)) ObjectDB.objects.filter(db_location=self.obj) if obj.pk))
print "init contentscache: self._pkcache:", self.obj, self._pkcache
def get(self, exclude=None): def get(self, exclude=None):
""" """
@ -68,12 +70,15 @@ class ContentsHandler(object):
if exclude: if exclude:
pks = [pk for pk in self._pkcache if pk not in [excl.pk for excl in make_iter(exclude)]] pks = [pk for pk in self._pkcache if pk not in [excl.pk for excl in make_iter(exclude)]]
else: else:
print calledby()
print "get: self._pkcache", self.obj, self._pkcache
pks = self._pkcache pks = self._pkcache
try: try:
return [self._idcache[pk] for pk in pks] return [self._idcache[pk] for pk in pks]
except KeyError: except KeyError, err:
# this can happen if the idmapper cache was cleared for an object # this can happen if the idmapper cache was cleared for an object
# in the contents cache. If so we need to re-initialize and try again. # in the contents cache. If so we need to re-initialize and try again.
print "content_cache.get keyerror:", err, self._pkcache, self._idcache
self.init() self.init()
try: try:
return [self._idcache[pk] for pk in pks] return [self._idcache[pk] for pk in pks]
@ -91,6 +96,7 @@ class ContentsHandler(object):
""" """
self._pkcache[obj.pk] = None self._pkcache[obj.pk] = None
print "add self._pkcache:", self.obj, obj, obj.pk, self._pkcache
def remove(self, obj): def remove(self, obj):
""" """
@ -101,6 +107,7 @@ class ContentsHandler(object):
""" """
self._pkcache.pop(obj.pk, None) self._pkcache.pop(obj.pk, None)
print "remove self._pkcache", self.obj, obj, obj.pk, self._pkcache
def clear(self): def clear(self):
""" """
@ -109,6 +116,7 @@ class ContentsHandler(object):
""" """
self._pkcache = {} self._pkcache = {}
self.init() self.init()
print "clear _pkcache", self.obj, self._pkcache
#------------------------------------------------------------ #------------------------------------------------------------
# #
@ -264,10 +272,12 @@ class ObjectDB(TypedObject):
# remove the safe flag # remove the safe flag
del self._safe_contents_update del self._safe_contents_update
print "location_set:", self.key, old_location, self.db_location
# update the contents cache # update the contents cache
if old_location: if old_location:
old_location.contents_cache.remove(self) old_location.contents_cache.remove(self)
if self.db_location: if self.db_location:
print "cache add:", self.db_location, self
self.db_location.contents_cache.add(self) self.db_location.contents_cache.add(self)
except RuntimeError: except RuntimeError:

6
evennia/objects/objects.py
View file

@ -21,7 +21,7 @@ from evennia.commands.cmdsethandler import CmdSetHandler
from evennia.commands import cmdhandler from evennia.commands import cmdhandler
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import (variable_from_module, lazy_property, from evennia.utils.utils import (variable_from_module, lazy_property,
make_iter, to_unicode) make_iter, to_unicode, calledby)
_MULTISESSION_MODE = settings.MULTISESSION_MODE _MULTISESSION_MODE = settings.MULTISESSION_MODE
@ -227,7 +227,9 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
Also available as the `contents` property. Also available as the `contents` property.
""" """
return self.contents_cache.get(exclude=exclude) con = self.contents_cache.get(exclude=exclude)
print "contents_get:", self, con, calledby()
return con
contents = property(contents_get) contents = property(contents_get)
@property @property