mirror of
https://github.com/Rapptz/discord.py.git
synced 2025-05-14 09:50:03 +00:00
performance improvements
Replaced server member lists, channel lists, and private channel lists with dicts. This allows O(1) lookups and removes (previously it would be an O(N) operation to lookup or remove). I did pretty extensive testing and benchmarking to compare the performance of using lists vs using dicts. Iterating through lists to find an item is only faster in the average case for extremely small lists (less than 3 items). For 100 items, using a dict is about 10 times faster on average (and about 100 times faster for 1000 items). The overhead in dicts is in memory usage and initial creation time. Creating and populating a dict is about 2 to 3 times slower than creating and appending items to a list. However this cost is still tiny. For 1000 items this equates to about a 70 microsecond difference (on an i7 CPU) for populating the entire dict. The memory overhead for a dict (compared to a list) is about 25-60 KB per 1000 items (can vary depending on dict resizing). Originally I wanted to use OrderedDicts to presereve order, but in my testing OrderedDicts have about 6x the memory overhead compared to normal dicts.
This commit is contained in:
Steven Berler
Rapptz
parent
25588955e4
commit
10b0b62f50
@ -213,7 +213,7 @@ class Client:
|
||||
if isinstance(destination, (Channel, PrivateChannel, Server)):
|
||||
return destination.id
|
||||
elif isinstance(destination, User):
|
||||
found = utils.find(lambda pm: pm.user == destination, self.private_channels)
|
||||
found = self.connection.get_private_channel_by_user(destination.id)
|
||||
if found is None:
|
||||
# Couldn't find the user, so start a PM with them first.
|
||||
channel = yield from self.start_private_message(destination)
|
||||
@ -853,7 +853,7 @@ class Client:
|
||||
data = yield from r.json()
|
||||
log.debug(request_success_log.format(response=r, json=payload, data=data))
|
||||
channel = PrivateChannel(id=data['id'], user=user)
|
||||
self.private_channels.append(channel)
|
||||
self.connection.add_private_channel(channel)
|
||||
return channel
|
||||
|
||||
@asyncio.coroutine
|
||||
@ -1746,11 +1746,10 @@ class Client:
|
||||
# Invite management
|
||||
|
||||
def _fill_invite_data(self, data):
|
||||
server = self.connection._get_server(data['guild']['id'])
|
||||
server = self.connection.get_server(data['guild']['id'])
|
||||
if server is not None:
|
||||
ch_id = data['channel']['id']
|
||||
channels = getattr(server, 'channels', [])
|
||||
channel = utils.find(lambda c: c.id == ch_id, channels)
|
||||
channel = server.get_channel(ch_id)
|
||||
else:
|
||||
server = Object(id=data['guild']['id'])
|
||||
server.name = data['guild']['name']
|
||||
@ -1878,7 +1877,7 @@ class Client:
|
||||
|
||||
def generator(data):
|
||||
for invite in data:
|
||||
channel = utils.get(server.channels, id=invite['channel']['id'])
|
||||
channel = server.get_channel(invite['channel']['id'])
|
||||
invite['channel'] = channel
|
||||
invite['server'] = server
|
||||
yield Invite(**invite)
|
||||
|
||||
@ -122,13 +122,13 @@ class Message:
|
||||
if self.channel is not None:
|
||||
for mention in mentions:
|
||||
id_search = mention.get('id')
|
||||
member = utils.find(lambda m: m.id == id_search, self.server.members)
|
||||
member = self.server.get_member(id_search)
|
||||
if member is not None:
|
||||
self.mentions.append(member)
|
||||
|
||||
if self.server is not None:
|
||||
for mention in self.raw_channel_mentions:
|
||||
channel = utils.find(lambda m: m.id == mention, self.server.channels)
|
||||
channel = self.server.get_channel(mention)
|
||||
if channel is not None:
|
||||
self.channel_mentions.append(channel)
|
||||
|
||||
@ -191,6 +191,6 @@ class Message:
|
||||
|
||||
if not self.channel.is_private:
|
||||
self.server = self.channel.server
|
||||
found = utils.find(lambda m: m.id == self.author.id, self.server.members)
|
||||
found = self.server.get_member(self.author.id)
|
||||
if found is not None:
|
||||
self.author = found
|
||||
|
||||
@ -89,21 +89,47 @@ class Server(Hashable):
|
||||
'_default_role', '_default_channel', 'roles' ]
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self.channels = []
|
||||
self._channels = {}
|
||||
self.owner = None
|
||||
self.members = []
|
||||
self._members = {}
|
||||
self._from_data(kwargs)
|
||||
|
||||
@property
|
||||
def channels(self):
|
||||
return self._channels.values()
|
||||
|
||||
def get_channel(self, channel_id):
|
||||
return self._channels.get(channel_id)
|
||||
|
||||
def add_channel(self, channel):
|
||||
self._channels[channel.id] = channel
|
||||
|
||||
def remove_channel(self, channel):
|
||||
self._channels.pop(channel.id, None)
|
||||
|
||||
@property
|
||||
def members(self):
|
||||
return self._members.values()
|
||||
|
||||
def get_member(self, user_id):
|
||||
return self._members.get(user_id)
|
||||
|
||||
def add_member(self, member):
|
||||
self._members[member.id] = member
|
||||
|
||||
def remove_member(self, member):
|
||||
self._members.pop(member.id, None)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def _update_voice_state(self, data):
|
||||
user_id = data.get('user_id')
|
||||
member = utils.find(lambda m: m.id == user_id, self.members)
|
||||
member = self.get_member(user_id)
|
||||
before = copy.copy(member)
|
||||
if member is not None:
|
||||
ch_id = data.get('channel_id')
|
||||
channel = utils.find(lambda c: c.id == ch_id, self.channels)
|
||||
channel = self.get_channel(ch_id)
|
||||
member.update_voice_state(voice_channel=channel, **data)
|
||||
return before, member
|
||||
|
||||
@ -137,11 +163,11 @@ class Server(Hashable):
|
||||
if member.id == owner_id:
|
||||
self.owner = member
|
||||
|
||||
self.members.append(member)
|
||||
self.add_member(member)
|
||||
|
||||
for presence in guild.get('presences', []):
|
||||
user_id = presence['user']['id']
|
||||
member = utils.find(lambda m: m.id == user_id, self.members)
|
||||
member = self.get_member(user_id)
|
||||
if member is not None:
|
||||
member.status = presence['status']
|
||||
try:
|
||||
@ -153,10 +179,12 @@ class Server(Hashable):
|
||||
|
||||
if 'channels' in guild:
|
||||
channels = guild['channels']
|
||||
self.channels = [Channel(server=self, **c) for c in channels]
|
||||
for c in channels:
|
||||
channel = Channel(server=self, **c)
|
||||
self.add_channel(channel)
|
||||
|
||||
afk_id = guild.get('afk_channel_id')
|
||||
self.afk_channel = utils.find(lambda c: c.id == afk_id, self.channels)
|
||||
self.afk_channel = self.get_channel(afk_id)
|
||||
|
||||
for obj in guild.get('voice_states', []):
|
||||
self._update_voice_state(obj)
|
||||
|
||||
125
discord/state.py
125
discord/state.py
@ -46,20 +46,50 @@ class ConnectionState:
|
||||
|
||||
def clear(self):
|
||||
self.user = None
|
||||
self.servers = []
|
||||
self.private_channels = []
|
||||
self._servers = {}
|
||||
self._private_channels = {}
|
||||
# extra dict to look up private channels by user id
|
||||
self._private_channels_by_user = {}
|
||||
self.messages = deque(maxlen=self.max_messages)
|
||||
|
||||
@property
|
||||
def servers(self):
|
||||
return self._servers.values()
|
||||
|
||||
def get_server(self, server_id):
|
||||
return self._servers.get(server_id)
|
||||
|
||||
def add_server(self, server):
|
||||
self._servers[server.id] = server
|
||||
|
||||
def remove_server(self, server):
|
||||
self._servers.pop(server.id, None)
|
||||
|
||||
@property
|
||||
def private_channels(self):
|
||||
return self._private_channels.values()
|
||||
|
||||
def get_private_channel(self, channel_id):
|
||||
return self._private_channels.get(channel_id)
|
||||
|
||||
def get_private_channel_by_user(self, user_id):
|
||||
return self._private_channels_by_user.get(user_id)
|
||||
|
||||
def add_private_channel(self, channel):
|
||||
self._private_channels[channel.id] = channel
|
||||
self._private_channels_by_user[channel.user.id] = channel
|
||||
|
||||
def remove_private_channel(self, channel):
|
||||
self._private_channels.pop(channel.id, None)
|
||||
self._private_channels_by_user.pop(channel.user.id, None)
|
||||
|
||||
def _get_message(self, msg_id):
|
||||
return utils.find(lambda m: m.id == msg_id, self.messages)
|
||||
|
||||
def _get_server(self, guild_id):
|
||||
return utils.find(lambda g: g.id == guild_id, self.servers)
|
||||
|
||||
def _add_server(self, guild):
|
||||
server = Server(**guild)
|
||||
server.me = utils.get(server.members, id=self.user.id)
|
||||
self.servers.append(server)
|
||||
server.me = server.get_member(self.user.id)
|
||||
self.add_server(server)
|
||||
return server
|
||||
|
||||
def parse_ready(self, data):
|
||||
@ -70,7 +100,7 @@ class ConnectionState:
|
||||
self._add_server(guild)
|
||||
|
||||
for pm in data.get('private_channels'):
|
||||
self.private_channels.append(PrivateChannel(id=pm['id'],
|
||||
self.add_private_channel(PrivateChannel(id=pm['id'],
|
||||
user=User(**pm['recipient'])))
|
||||
|
||||
# we're all ready
|
||||
@ -103,12 +133,12 @@ class ConnectionState:
|
||||
older_message = message
|
||||
|
||||
def parse_presence_update(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
status = data.get('status')
|
||||
user = data['user']
|
||||
member_id = user['id']
|
||||
member = utils.find(lambda m: m.id == member_id, server.members)
|
||||
member = server.get_member(member_id)
|
||||
if member is not None:
|
||||
old_member = copy.copy(member)
|
||||
member.status = data.get('status')
|
||||
@ -128,22 +158,19 @@ class ConnectionState:
|
||||
self.user = User(**data)
|
||||
|
||||
def parse_channel_delete(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
channel_id = data.get('id')
|
||||
channel = utils.find(lambda c: c.id == channel_id, server.channels)
|
||||
try:
|
||||
server.channels.remove(channel)
|
||||
except ValueError:
|
||||
return
|
||||
else:
|
||||
channel = server.get_channel(channel_id)
|
||||
if channel is not None:
|
||||
server.remove_channel(channel)
|
||||
self.dispatch('channel_delete', channel)
|
||||
|
||||
def parse_channel_update(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
channel_id = data.get('id')
|
||||
channel = utils.find(lambda c: c.id == channel_id, server.channels)
|
||||
channel = server.get_channel(channel_id)
|
||||
if channel is not None:
|
||||
old_channel = copy.copy(channel)
|
||||
channel.update(server=server, **data)
|
||||
@ -156,38 +183,35 @@ class ConnectionState:
|
||||
recipient = User(**data.get('recipient'))
|
||||
pm_id = data.get('id')
|
||||
channel = PrivateChannel(id=pm_id, user=recipient)
|
||||
self.private_channels.append(channel)
|
||||
self.add_private_channel(channel)
|
||||
else:
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
channel = Channel(server=server, **data)
|
||||
server.channels.append(channel)
|
||||
server.add_channel(channel)
|
||||
|
||||
self.dispatch('channel_create', channel)
|
||||
|
||||
def parse_guild_member_add(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
member = Member(server=server, deaf=False, mute=False, **data)
|
||||
member.roles.append(server.default_role)
|
||||
server.members.append(member)
|
||||
server.add_member(member)
|
||||
self.dispatch('member_join', member)
|
||||
|
||||
def parse_guild_member_remove(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
user_id = data['user']['id']
|
||||
member = utils.find(lambda m: m.id == user_id, server.members)
|
||||
try:
|
||||
server.members.remove(member)
|
||||
except ValueError:
|
||||
return
|
||||
else:
|
||||
member = server.get_member(user_id)
|
||||
if member is not None:
|
||||
server.remove_member(member)
|
||||
self.dispatch('member_remove', member)
|
||||
|
||||
def parse_guild_member_update(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
user_id = data['user']['id']
|
||||
member = utils.find(lambda m: m.id == user_id, server.members)
|
||||
member = server.get_member(user_id)
|
||||
if member is not None:
|
||||
user = data['user']
|
||||
old_member = copy.copy(member)
|
||||
@ -208,7 +232,7 @@ class ConnectionState:
|
||||
# GUILD_CREATE with unavailable in the response
|
||||
# usually means that the server has become available
|
||||
# and is therefore in the cache
|
||||
server = self._get_server(data.get('id'))
|
||||
server = self.get_server(data.get('id'))
|
||||
if server is not None:
|
||||
server.unavailable = False
|
||||
self.dispatch('server_available', server)
|
||||
@ -226,14 +250,14 @@ class ConnectionState:
|
||||
self.dispatch('server_join', server)
|
||||
|
||||
def parse_guild_update(self, data):
|
||||
server = self._get_server(data.get('id'))
|
||||
server = self.get_server(data.get('id'))
|
||||
if server is not None:
|
||||
old_server = copy.copy(server)
|
||||
server._from_data(data)
|
||||
self.dispatch('server_update', old_server, server)
|
||||
|
||||
def parse_guild_delete(self, data):
|
||||
server = self._get_server(data.get('id'))
|
||||
server = self.get_server(data.get('id'))
|
||||
if server is None:
|
||||
return
|
||||
|
||||
@ -247,11 +271,7 @@ class ConnectionState:
|
||||
# do a cleanup of the messages cache
|
||||
self.messages = deque((msg for msg in self.messages if msg.server != server), maxlen=self.max_messages)
|
||||
|
||||
try:
|
||||
self.servers.remove(server)
|
||||
except ValueError:
|
||||
return
|
||||
else:
|
||||
self.remove_server(server)
|
||||
self.dispatch('server_remove', server)
|
||||
|
||||
|
||||
@ -261,7 +281,7 @@ class ConnectionState:
|
||||
# hence we don't remove it from cache or do anything
|
||||
# strange with it, the main purpose of this event
|
||||
# is mainly to dispatch to another event worth listening to for logging
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
user_id = data.get('user', {}).get('id')
|
||||
member = utils.get(server.members, id=user_id)
|
||||
@ -269,14 +289,14 @@ class ConnectionState:
|
||||
self.dispatch('member_ban', member)
|
||||
|
||||
def parse_guild_ban_remove(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
if 'user' in data:
|
||||
user = User(**data['user'])
|
||||
self.dispatch('member_unban', server, user)
|
||||
|
||||
def parse_guild_role_create(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
role_data = data.get('role', {})
|
||||
everyone = server.id == role_data.get('id')
|
||||
role = Role(everyone=everyone, **role_data)
|
||||
@ -284,7 +304,7 @@ class ConnectionState:
|
||||
self.dispatch('server_role_create', server, role)
|
||||
|
||||
def parse_guild_role_delete(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
role_id = data.get('role_id')
|
||||
role = utils.find(lambda r: r.id == role_id, server.roles)
|
||||
@ -296,7 +316,7 @@ class ConnectionState:
|
||||
self.dispatch('server_role_delete', server, role)
|
||||
|
||||
def parse_guild_role_update(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
role_id = data['role']['id']
|
||||
role = utils.find(lambda r: r.id == role_id, server.roles)
|
||||
@ -306,7 +326,7 @@ class ConnectionState:
|
||||
self.dispatch('server_role_update', old_role, role)
|
||||
|
||||
def parse_voice_state_update(self, data):
|
||||
server = self._get_server(data.get('guild_id'))
|
||||
server = self.get_server(data.get('guild_id'))
|
||||
if server is not None:
|
||||
updated_members = server._update_voice_state(data)
|
||||
self.dispatch('voice_state_update', *updated_members)
|
||||
@ -323,8 +343,7 @@ class ConnectionState:
|
||||
if is_private:
|
||||
member = channel.user
|
||||
else:
|
||||
members = channel.server.members
|
||||
member = utils.find(lambda m: m.id == user_id, members)
|
||||
member = channel.server.get_member(user_id)
|
||||
|
||||
if member is not None:
|
||||
timestamp = datetime.datetime.utcfromtimestamp(data.get('timestamp'))
|
||||
@ -335,10 +354,10 @@ class ConnectionState:
|
||||
return None
|
||||
|
||||
for server in self.servers:
|
||||
for channel in server.channels:
|
||||
if channel.id == id:
|
||||
channel = server.get_channel(id)
|
||||
if channel is not None:
|
||||
return channel
|
||||
|
||||
for pm in self.private_channels:
|
||||
if pm.id == id:
|
||||
pm = self.get_private_channel(id)
|
||||
if pm is not None:
|
||||
return pm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user