Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use unpack_from, instead of unpack, if multiple items are contained in the same buffer 

* Use xrange() instead of range() when looping over its items
  - xrange() is faster and more lightweight as iterable

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7198 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2009-04-27 15:17:43 +00:00 committed by Git SVN Gateway
parent 227ecdb1f8
commit 57aefa7a85
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/masterserver/protocol.py
View File

@ -139,18 +139,23 @@ class BinaryProtocol(Protocol):
message += self.encodeSingle(game)
return message
def decodeSingle(self, data, game = Game(None)):
def decodeSingle(self, data, game = Game(None), offset = None):
decData = {}
if offset != None:
unpack = lambda buffer: self.gameFormat.unpack_from(buffer, offset)
else:
unpack = self.gameFormat.unpack
if parse_version('2.0') <= parse_version(self.version) < parse_version('2.2'):
(decData['name'], game.size, game.flags, decData['host'], game.maxPlayers, game.currentPlayers,
game.user1, game.user2, game.user3, game.user4) = self.gameFormat.unpack(data)
game.user1, game.user2, game.user3, game.user4) = unpack(data)
elif parse_version('2.2') <= parse_version(self.version):
(decData['name'], game.size, game.flags, decData['host'], game.maxPlayers, game.currentPlayers,
game.user1, game.user2, game.user3, game.user4,
game.misc, game.extra, decData['multiplayer-version'], game.modlist, game.lobbyVersion,
game.game_version_major, game.game_version_minor, game.private, game.pure, game.Mods, game.future1,
game.future2, game.future3, game.future4) = self.gameFormat.unpack(data)
game.future2, game.future3, game.future4) = unpack(data)
# Workaround the fact that the 2.0.x versions don't perform
# endian swapping
@ -169,7 +174,5 @@ class BinaryProtocol(Protocol):
return game
def decodeMultiple(self, data):
countMsg = data[:self.countFormat.size]
data = data[self.countFormat.size:]
count = self.countFormat.unpack(countMsg)
return [self.decodeSingle(data[size * i: size * i + size]) for i in range(count)]
(count,) = self.countFormat.unpack_from(data)
return [self.decodeSingle(data, offset=(size * i + self.countFormat.size)) for i in xrange(count)]