From 2c710020650ca49b942885dd0f24b124d7913217 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Fri, 23 Jan 2009 00:31:18 +0000 Subject: [PATCH] fix for client crash --- direct/src/distributed/ConnectionRepository.py | 2 +- direct/src/showbase/GarbageReport.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index 67ccff6bf8..41183a3ff3 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/direct/src/distributed/ConnectionRepository.py @@ -116,7 +116,7 @@ class ConnectionRepository( # manual garbage-collect task taskMgr.add(self._garbageCollect, self.GarbageCollectTaskName, 200) # periodically increase gc threshold if there is no garbage - taskMgr.doMethodLater(self.config.GetFloat('garbage-threshold-adjust-delay', 15 * 60.), + taskMgr.doMethodLater(self.config.GetFloat('garbage-threshold-adjust-delay', 5 * 60.), self._adjustGcThreshold, self.GarbageThresholdTaskName) self._gcDefaultThreshold = gc.get_threshold() diff --git a/direct/src/showbase/GarbageReport.py b/direct/src/showbase/GarbageReport.py index 298d71991f..56dfb4125e 100755 --- a/direct/src/showbase/GarbageReport.py +++ b/direct/src/showbase/GarbageReport.py @@ -529,7 +529,7 @@ def checkForGarbageLeaks(): func('%s garbage cycles found, see info above' % gr.getNumCycles()) return numGarbage -def b_checkForGarbageLeaks(): +def b_checkForGarbageLeaks(wantReply=False): # does a garbage collect on the client and the AI # returns number of client garbage leaks # logs leak info and terminates (if configured to do so) @@ -540,5 +540,5 @@ def b_checkForGarbageLeaks(): pass else: if base.cr.timeManager: - base.cr.timeManager.d_checkForGarbageLeaks() + base.cr.timeManager.d_checkForGarbageLeaks(wantReply=wantReply) return checkForGarbageLeaks()