From 9d4324a4cbfcfcf54abeb24bfc58a2856a2f782a Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 22 Mar 2015 13:55:35 +0200 Subject: [PATCH] Fix parse_dcimports and remove CpuInfoMgr --- astron/dclass/united.dc | 6 ----- otp/ai/TimeManager.py | 26 --------------------- otp/ai/TimeManagerAI.py | 3 --- otp/distributed/DCClassImports.py | 3 +-- otp/distributed/OTPClientRepository.py | 1 - otp/launcher/LauncherBase.py | 1 - parse_dcimports.bat | 2 +- toontown/uberdog/DistributedCpuInfoMgr.py | 4 ---- toontown/uberdog/DistributedCpuInfoMgrAI.py | 9 ------- toontown/uberdog/DistributedCpuInfoMgrUD.py | 9 ------- 10 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 toontown/uberdog/DistributedCpuInfoMgr.py delete mode 100644 toontown/uberdog/DistributedCpuInfoMgrAI.py delete mode 100644 toontown/uberdog/DistributedCpuInfoMgrUD.py diff --git a/astron/dclass/united.dc b/astron/dclass/united.dc index a1255a06..94e21708 100644 --- a/astron/dclass/united.dc +++ b/astron/dclass/united.dc @@ -98,7 +98,6 @@ dclass TimeManager : DistributedObject { uint32/10 pageFileUsage, uint32/10 physicalMemory, uint32 pageFaultCount, OSInfo, CPUSpeed, uint16 cpuCores, uint16 logicalCPUs, string(0-256) apiName) airecv clsend; - setCpuInfo(string(0-1024) infoStr, string cacheStatus) airecv clsend; checkForGarbageLeaks(bool) airecv clsend; setNumAIGarbageLeaks(uint32); setClientGarbageLeak(uint32, string(0-1024)) airecv clsend; @@ -728,7 +727,6 @@ from toontown.safezone import DistributedFindFour/AI from toontown.uberdog.DistributedMailManager/AI/UD import DistributedMailManager/AI/UD from toontown.uberdog.DistributedPartyManager/AI/UD import DistributedPartyManager/AI/UD from toontown.rpc.AwardManager/UD import AwardManager/UD -from toontown.uberdog.DistributedCpuInfoMgr/AI/UD import DistributedCpuInfoMgr/AI/UD from toontown.coderedemption.TTCodeRedemptionMgr/AI import TTCodeRedemptionMgr/AI from toontown.distributed.NonRepeatableRandomSourceAI import NonRepeatableRandomSourceAI from toontown.distributed.NonRepeatableRandomSourceUD import NonRepeatableRandomSourceUD @@ -3700,10 +3698,6 @@ dclass AwardManager : DistributedObjectGlobal { giveAwardToToon(uint32, DoId, string, DoId, uint32, uint32); }; -dclass DistributedCpuInfoMgr : DistributedObjectGlobal { - setCpuInfoToUd(uint32, uint32, string, string); -}; - dclass NonRepeatableRandomSourceClient { getRandomSamplesReply(uint32, uint32 []) airecv; }; diff --git a/otp/ai/TimeManager.py b/otp/ai/TimeManager.py index 200882b1..b4ce06f9 100644 --- a/otp/ai/TimeManager.py +++ b/otp/ai/TimeManager.py @@ -182,32 +182,6 @@ class TimeManager(DistributedObject.DistributedObject): def d_setSignature(self, signature, hash, pyc): self.sendUpdate('setSignature', [signature, hash, pyc]) - def sendCpuInfo(self): - if not base.pipe: - return - di = base.pipe.getDisplayInformation() - if di.getNumCpuCores() == 0 and hasattr(base.pipe, 'lookupCpuData'): - base.pipe.lookupCpuData() - di = base.pipe.getDisplayInformation() - di.updateCpuFrequency(0) - try: - cacheStatus = preloadCache() - except NameError: - cacheStatus = '' - - ooghz = 1e-09 - cpuSpeed = (di.getMaximumCpuFrequency() * ooghz, di.getCurrentCpuFrequency() * ooghz) - numCpuCores = di.getNumCpuCores() - numLogicalCpus = di.getNumLogicalCpus() - info = '%s|%s|%d|%d|%s|%s cpus' % (di.getCpuVendorString(), - di.getCpuBrandString(), - di.getCpuVersionInformation(), - di.getCpuBrandIndex(), - '%0.03f,%0.03f' % cpuSpeed, - '%d,%d' % (numCpuCores, numLogicalCpus)) - self.notify.debug('setCpuInfo: "%s"' % info) - self.sendUpdate('setCpuInfo', [info, cacheStatus]) - def setFrameRateInterval(self, frameRateInterval): if frameRateInterval == 0: return diff --git a/otp/ai/TimeManagerAI.py b/otp/ai/TimeManagerAI.py index eda9fccb..07c12f30 100644 --- a/otp/ai/TimeManagerAI.py +++ b/otp/ai/TimeManagerAI.py @@ -26,9 +26,6 @@ class TimeManagerAI(DistributedObjectAI): def setFrameRate(self, todo0, todo1, todo2, todo3, todo4, todo5, todo6, todo7, todo8, todo9, todo10, todo11, todo12, todo13, todo14, todo15, todo16, todo17): pass - def setCpuInfo(self, todo0, todo1): - pass - def checkForGarbageLeaks(self, todo0): pass diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index e20a8c6f..143ed45b 100644 --- a/otp/distributed/DCClassImports.py +++ b/otp/distributed/DCClassImports.py @@ -2,7 +2,7 @@ from pandac.PandaModules import * -hashVal = 177192120 +hashVal = 924483511 from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot @@ -19,7 +19,6 @@ from toontown.ai.DistributedTrashcanZeroMgr import DistributedTrashcanZeroMgr from toontown.uberdog.DistributedMailManager import DistributedMailManager from otp.chat import ChatAgent from toontown.classicchars import DistributedCCharBase, DistributedMickey, DistributedVampireMickey, DistributedMinnie, DistributedWitchMinnie, DistributedGoofy, DistributedSuperGoofy, DistributedDaisy, DistributedSockHopDaisy, DistributedChip, DistributedPoliceChip, DistributedDale, DistributedJailbirdDale, DistributedGoofySpeedway, DistributedDonald, DistributedFrankenDonald, DistributedDonaldDock, DistributedPluto, DistributedWesternPluto -from toontown.uberdog.DistributedCpuInfoMgr import DistributedCpuInfoMgr from toontown.parties.GlobalPartyManager import GlobalPartyManager from toontown.racing.DistributedStartingBlock import DistributedViewingBlock from toontown.ai.DistributedPhaseEventMgr import DistributedPhaseEventMgr diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py index fc8d459d..812388f2 100644 --- a/otp/distributed/OTPClientRepository.py +++ b/otp/distributed/OTPClientRepository.py @@ -1361,7 +1361,6 @@ class OTPClientRepository(ClientRepositoryBase): hashPrcVariables(h) pyc = HashVal() self.timeManager.d_setSignature(self.userSignature, h.asBin(), pyc.asBin()) - self.timeManager.sendCpuInfo() if self.timeManager.synchronize('startup'): self.accept('gotTimeSync', self.gotTimeSync) self.waitForDatabaseTimeout(requestName='uberZoneInterest-timeSync') diff --git a/otp/launcher/LauncherBase.py b/otp/launcher/LauncherBase.py index 0a5c5d20..c7c89ad7 100644 --- a/otp/launcher/LauncherBase.py +++ b/otp/launcher/LauncherBase.py @@ -129,7 +129,6 @@ class LauncherBase(DirectObject): if sys.platform == 'darwin': os.system('/usr/sbin/system_profiler >>' + logfile) elif sys.platform == 'linux2': - os.system('cat /proc/cpuinfo >>' + logfile) os.system('cat /proc/meminfo >>' + logfile) os.system('/sbin/ifconfig -a >>' + logfile) print '\n\nStarting %s...' % self.GameName diff --git a/parse_dcimports.bat b/parse_dcimports.bat index b3aea9fb..4730b15e 100644 --- a/parse_dcimports.bat +++ b/parse_dcimports.bat @@ -1,3 +1,3 @@ set /P PPYTHON_PATH=