jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove locking from static disco.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2016-09-20 15:49:27 +09:00
parent 7cd1cf32ae
commit 125336aeee
2 changed files with 112 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
slixmpp/plugins/xep_0030/static.py
View File

@ -7,7 +7,6 @@
""" """
import logging import logging
import threading
from slixmpp import Iq from slixmpp import Iq
from slixmpp.exceptions import XMPPError, IqError, IqTimeout from slixmpp.exceptions import XMPPError, IqError, IqTimeout
@ -48,7 +47,6 @@ class StaticDisco(object):
self.nodes = {} self.nodes = {}
self.xmpp = xmpp self.xmpp = xmpp
self.disco = disco self.disco = disco
self.lock = threading.RLock()
def add_node(self, jid=None, node=None, ifrom=None): def add_node(self, jid=None, node=None, ifrom=None):
""" """
@ -59,48 +57,45 @@ class StaticDisco(object):
jid -- The JID that will own the new stanzas. jid -- The JID that will own the new stanzas.
node -- The node that will own the new stanzas. node -- The node that will own the new stanzas.
""" """
with self.lock: if jid is None:
if jid is None: jid = self.xmpp.boundjid.full
jid = self.xmpp.boundjid.full if node is None:
if node is None: node = ''
node = '' if ifrom is None:
if ifrom is None: ifrom = ''
ifrom = '' if isinstance(ifrom, JID):
if isinstance(ifrom, JID): ifrom = ifrom.full
ifrom = ifrom.full if (jid, node, ifrom) not in self.nodes:
if (jid, node, ifrom) not in self.nodes: self.nodes[(jid, node, ifrom)] = {'info': DiscoInfo(),
self.nodes[(jid, node, ifrom)] = {'info': DiscoInfo(), 'items': DiscoItems()}
'items': DiscoItems()} self.nodes[(jid, node, ifrom)]['info']['node'] = node
self.nodes[(jid, node, ifrom)]['info']['node'] = node self.nodes[(jid, node, ifrom)]['items']['node'] = node
self.nodes[(jid, node, ifrom)]['items']['node'] = node
def get_node(self, jid=None, node=None, ifrom=None): def get_node(self, jid=None, node=None, ifrom=None):
with self.lock: if jid is None:
if jid is None: jid = self.xmpp.boundjid.full
jid = self.xmpp.boundjid.full if node is None:
if node is None: node = ''
node = '' if ifrom is None:
if ifrom is None: ifrom = ''
ifrom = '' if isinstance(ifrom, JID):
if isinstance(ifrom, JID): ifrom = ifrom.full
ifrom = ifrom.full if (jid, node, ifrom) not in self.nodes:
if (jid, node, ifrom) not in self.nodes: self.add_node(jid, node, ifrom)
self.add_node(jid, node, ifrom) return self.nodes[(jid, node, ifrom)]
return self.nodes[(jid, node, ifrom)]
def node_exists(self, jid=None, node=None, ifrom=None): def node_exists(self, jid=None, node=None, ifrom=None):
with self.lock: if jid is None:
if jid is None: jid = self.xmpp.boundjid.full
jid = self.xmpp.boundjid.full if node is None:
if node is None: node = ''
node = '' if ifrom is None:
if ifrom is None: ifrom = ''
ifrom = '' if isinstance(ifrom, JID):
if isinstance(ifrom, JID): ifrom = ifrom.full
ifrom = ifrom.full if (jid, node, ifrom) not in self.nodes:
if (jid, node, ifrom) not in self.nodes: return False
return False return True
return True
# ================================================================= # =================================================================
# Node Handlers # Node Handlers
@ -199,14 +194,13 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if not self.node_exists(jid, node):
if not self.node_exists(jid, node): if not node:
if not node: return DiscoInfo()
return DiscoInfo()
else:
raise XMPPError(condition='item-not-found')
else: else:
return self.get_node(jid, node)['info'] raise XMPPError(condition='item-not-found')
else:
return self.get_node(jid, node)['info']
def set_info(self, jid, node, ifrom, data): def set_info(self, jid, node, ifrom, data):
""" """
@ -214,9 +208,8 @@ class StaticDisco(object):
The data parameter is a disco#info substanza. The data parameter is a disco#info substanza.
""" """
with self.lock: self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['info'] = data
self.get_node(jid, node)['info'] = data
def del_info(self, jid, node, ifrom, data): def del_info(self, jid, node, ifrom, data):
""" """
@ -224,9 +217,8 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): self.get_node(jid, node)['info'] = DiscoInfo()
self.get_node(jid, node)['info'] = DiscoInfo()
def get_items(self, jid, node, ifrom, data): def get_items(self, jid, node, ifrom, data):
""" """
@ -234,14 +226,13 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if not self.node_exists(jid, node):
if not self.node_exists(jid, node): if not node:
if not node: return DiscoItems()
return DiscoItems()
else:
raise XMPPError(condition='item-not-found')
else: else:
return self.get_node(jid, node)['items'] raise XMPPError(condition='item-not-found')
else:
return self.get_node(jid, node)['items']
def set_items(self, jid, node, ifrom, data): def set_items(self, jid, node, ifrom, data):
""" """
@ -250,10 +241,9 @@ class StaticDisco(object):
The data parameter may provide: The data parameter may provide:
items -- A set of items in tuple format. items -- A set of items in tuple format.
""" """
with self.lock: items = data.get('items', set())
items = data.get('items', set()) self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['items']['items'] = items
self.get_node(jid, node)['items']['items'] = items
def del_items(self, jid, node, ifrom, data): def del_items(self, jid, node, ifrom, data):
""" """
@ -261,9 +251,8 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): self.get_node(jid, node)['items'] = DiscoItems()
self.get_node(jid, node)['items'] = DiscoItems()
def add_identity(self, jid, node, ifrom, data): def add_identity(self, jid, node, ifrom, data):
""" """
@ -275,13 +264,12 @@ class StaticDisco(object):
name -- Optional human readable name for this identity. name -- Optional human readable name for this identity.
lang -- Optional standard xml:lang value. lang -- Optional standard xml:lang value.
""" """
with self.lock: self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['info'].add_identity(
self.get_node(jid, node)['info'].add_identity( data.get('category', ''),
data.get('category', ''), data.get('itype', ''),
data.get('itype', ''), data.get('name', None),
data.get('name', None), data.get('lang', None))
data.get('lang', None))
def set_identities(self, jid, node, ifrom, data): def set_identities(self, jid, node, ifrom, data):
""" """
@ -291,10 +279,9 @@ class StaticDisco(object):
identities -- A list of identities in tuple form: identities -- A list of identities in tuple form:
(category, type, name, lang) (category, type, name, lang)
""" """
with self.lock: identities = data.get('identities', set())
identities = data.get('identities', set()) self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['info']['identities'] = identities
self.get_node(jid, node)['info']['identities'] = identities
def del_identity(self, jid, node, ifrom, data): def del_identity(self, jid, node, ifrom, data):
""" """
@ -306,13 +293,12 @@ class StaticDisco(object):
name -- Optional human readable name for this identity. name -- Optional human readable name for this identity.
lang -- Optional, standard xml:lang value. lang -- Optional, standard xml:lang value.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): self.get_node(jid, node)['info'].del_identity(
self.get_node(jid, node)['info'].del_identity( data.get('category', ''),
data.get('category', ''), data.get('itype', ''),
data.get('itype', ''), data.get('name', None),
data.get('name', None), data.get('lang', None))
data.get('lang', None))
def del_identities(self, jid, node, ifrom, data): def del_identities(self, jid, node, ifrom, data):
""" """
@ -320,9 +306,8 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): del self.get_node(jid, node)['info']['identities']
del self.get_node(jid, node)['info']['identities']
def add_feature(self, jid, node, ifrom, data): def add_feature(self, jid, node, ifrom, data):
""" """
@ -331,10 +316,9 @@ class StaticDisco(object):
The data parameter should include: The data parameter should include:
feature -- The namespace of the supported feature. feature -- The namespace of the supported feature.
""" """
with self.lock: self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['info'].add_feature(
self.get_node(jid, node)['info'].add_feature( data.get('feature', ''))
data.get('feature', ''))
def set_features(self, jid, node, ifrom, data): def set_features(self, jid, node, ifrom, data):
""" """
@ -343,10 +327,9 @@ class StaticDisco(object):
The data parameter should include: The data parameter should include:
features -- The new set of supported features. features -- The new set of supported features.
""" """
with self.lock: features = data.get('features', set())
features = data.get('features', set()) self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['info']['features'] = features
self.get_node(jid, node)['info']['features'] = features
def del_feature(self, jid, node, ifrom, data): def del_feature(self, jid, node, ifrom, data):
""" """
@ -355,10 +338,9 @@ class StaticDisco(object):
The data parameter should include: The data parameter should include:
feature -- The namespace of the removed feature. feature -- The namespace of the removed feature.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): self.get_node(jid, node)['info'].del_feature(
self.get_node(jid, node)['info'].del_feature( data.get('feature', ''))
data.get('feature', ''))
def del_features(self, jid, node, ifrom, data): def del_features(self, jid, node, ifrom, data):
""" """
@ -366,10 +348,9 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if not self.node_exists(jid, node):
if not self.node_exists(jid, node): return
return del self.get_node(jid, node)['info']['features']
del self.get_node(jid, node)['info']['features']
def add_item(self, jid, node, ifrom, data): def add_item(self, jid, node, ifrom, data):
""" """
@ -381,12 +362,11 @@ class StaticDisco(object):
non-addressable items. non-addressable items.
name -- Optional human readable name for the item. name -- Optional human readable name for the item.
""" """
with self.lock: self.add_node(jid, node)
self.add_node(jid, node) self.get_node(jid, node)['items'].add_item(
self.get_node(jid, node)['items'].add_item( data.get('ijid', ''),
data.get('ijid', ''), node=data.get('inode', ''),
node=data.get('inode', ''), name=data.get('name', ''))
name=data.get('name', ''))
def del_item(self, jid, node, ifrom, data): def del_item(self, jid, node, ifrom, data):
""" """
@ -396,11 +376,10 @@ class StaticDisco(object):
ijid -- JID of the item to remove. ijid -- JID of the item to remove.
inode -- Optional extra identifying information. inode -- Optional extra identifying information.
""" """
with self.lock: if self.node_exists(jid, node):
if self.node_exists(jid, node): self.get_node(jid, node)['items'].del_item(
self.get_node(jid, node)['items'].del_item( data.get('ijid', ''),
data.get('ijid', ''), node=data.get('inode', None))
node=data.get('inode', None))
def cache_info(self, jid, node, ifrom, data): def cache_info(self, jid, node, ifrom, data):
""" """
@ -410,12 +389,11 @@ class StaticDisco(object):
containing the disco info to cache, or containing the disco info to cache, or
the disco#info substanza itself. the disco#info substanza itself.
""" """
with self.lock: if isinstance(data, Iq):
if isinstance(data, Iq): data = data['disco_info']
data = data['disco_info']
self.add_node(jid, node, ifrom) self.add_node(jid, node, ifrom)
self.get_node(jid, node, ifrom)['info'] = data self.get_node(jid, node, ifrom)['info'] = data
def get_cached_info(self, jid, node, ifrom, data): def get_cached_info(self, jid, node, ifrom, data):
""" """
@ -423,8 +401,7 @@ class StaticDisco(object):
The data parameter is not used. The data parameter is not used.
""" """
with self.lock: if not self.node_exists(jid, node, ifrom):
if not self.node_exists(jid, node, ifrom): return None
return None else:
else: return self.get_node(jid, node, ifrom)['info']
return self.get_node(jid, node, ifrom)['info']

24
slixmpp/plugins/xep_0115/static.py
View File

@ -124,23 +124,19 @@ class StaticCaps(object):
return None return None
def cache_caps(self, jid, node, ifrom, data): def cache_caps(self, jid, node, ifrom, data):
with self.static.lock: verstring = data.get('verstring', None)
verstring = data.get('verstring', None) info = data.get('info', None)
info = data.get('info', None) if not verstring or not info:
if not verstring or not info: return
return self.ver_cache[verstring] = info
self.ver_cache[verstring] = info
def assign_verstring(self, jid, node, ifrom, data): def assign_verstring(self, jid, node, ifrom, data):
with self.static.lock: if isinstance(jid, JID):
if isinstance(jid, JID): jid = jid.full
jid = jid.full self.jid_vers[jid] = data.get('verstring', None)
self.jid_vers[jid] = data.get('verstring', None)
def get_verstring(self, jid, node, ifrom, data): def get_verstring(self, jid, node, ifrom, data):
with self.static.lock: return self.jid_vers.get(jid, None)
return self.jid_vers.get(jid, None)
def get_caps(self, jid, node, ifrom, data): def get_caps(self, jid, node, ifrom, data):
with self.static.lock: return self.ver_cache.get(data.get('verstring', None), None)
return self.ver_cache.get(data.get('verstring', None), None)