GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 09:19:23 +01:00
Code Issues Projects Releases Wiki Activity

classes.Protocol: use a lock with updateTS to ensure thread-safety

Browse Source 
Closes #274.
This commit is contained in:
James Lu 2016-07-12 22:08:01 -07:00
parent 6598d56400
commit 58d71b0907
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
classes.py
View File

@ -1131,6 +1131,9 @@ class Protocol():
self.casemapping = 'rfc1459' self.casemapping = 'rfc1459'
self.hook_map = {} self.hook_map = {}
# Lock for updateTS to make sure only one thread can change the channel TS at one time.
self.ts_lock = threading.Lock()
def parseArgs(self, args): def parseArgs(self, args):
"""Parses a string of RFC1459-style arguments split into a list, where ":" may """Parses a string of RFC1459-style arguments split into a list, where ":" may
be used for multi-word arguments that last until the end of a line. be used for multi-word arguments that last until the end of a line.
@ -1187,47 +1190,50 @@ class Protocol():
channel) channel)
self.irc.applyModes(channel, modes) self.irc.applyModes(channel, modes)
our_ts = self.irc.channels[channel].ts # Use a lock so only one thread can change a channel's TS at once: this prevents race
assert type(our_ts) == int, "Wrong type for our_ts (expected int, got %s)" % type(our_ts) # conditions from desyncing the channel list.
assert type(their_ts) == int, "Wrong type for their_ts (expected int, got %s)" % type(their_ts) with self.ts_lock:
our_ts = self.irc.channels[channel].ts
assert type(our_ts) == int, "Wrong type for our_ts (expected int, got %s)" % type(our_ts)
assert type(their_ts) == int, "Wrong type for their_ts (expected int, got %s)" % type(their_ts)
# Check if we're the mode sender based on the UID / SID given. # Check if we're the mode sender based on the UID / SID given.
our_mode = self.irc.isInternalClient(sender) or self.irc.isInternalServer(sender) our_mode = self.irc.isInternalClient(sender) or self.irc.isInternalServer(sender)
log.debug("(%s/%s) is the mode origin us? %s", log.debug("(%s/%s) is the mode origin us? %s",
self.irc.name, channel, our_mode) self.irc.name, channel, our_mode)
if their_ts < our_ts: if their_ts < our_ts:
# Their TS is older than ours. We should clear our stored modes for the channel and # Their TS is older than ours. We should clear our stored modes for the channel and
# apply the ones in the queue to be set. This is regardless of whether we're sending # apply the ones in the queue to be set. This is regardless of whether we're sending
# outgoing modes or receiving some - both are handled the same with a "received" TS, # outgoing modes or receiving some - both are handled the same with a "received" TS,
# and comparing it with the one we have. # and comparing it with the one we have.
log.debug("(%s/%s) received TS of %s is lower than our %s; mode query %s", log.debug("(%s/%s) received TS of %s is lower than our %s; mode query %s",
self.irc.name, channel, their_ts, our_ts, modes) self.irc.name, channel, their_ts, our_ts, modes)
# Update the channel TS to theirs regardless of whether the mode setting passes. # Update the channel TS to theirs regardless of whether the mode setting passes.
log.debug('(%s) Setting channel TS of %s to %s from %s', log.debug('(%s) Setting channel TS of %s to %s from %s',
self.irc.name, channel, their_ts, our_ts) self.irc.name, channel, their_ts, our_ts)
self.irc.channels[channel].ts = their_ts self.irc.channels[channel].ts = their_ts
_clear() _clear()
if not our_mode: if not our_mode:
_apply()
elif their_ts == our_ts:
log.debug("(%s/%s) remote TS of %s is equal to our %s; mode query %s",
self.irc.name, channel, their_ts, our_ts, modes)
# Their TS is equal to ours. Merge modes.
_apply() _apply()
elif their_ts == our_ts: elif their_ts > our_ts:
log.debug("(%s/%s) remote TS of %s is equal to our %s; mode query %s", log.debug("(%s/%s) remote TS of %s is higher than our %s; mode query %s",
self.irc.name, channel, their_ts, our_ts, modes) self.irc.name, channel, their_ts, our_ts, modes)
# Their TS is equal to ours. Merge modes. # Their TS is younger than ours. Clear the state and replace the modes for the channel
_apply() # with the ones being set, if we're the one setting modes.
_clear()
elif their_ts > our_ts: if our_mode:
log.debug("(%s/%s) remote TS of %s is higher than our %s; mode query %s", _apply()
self.irc.name, channel, their_ts, our_ts, modes)
# Their TS is younger than ours. Clear the state and replace the modes for the channel
# with the ones being set, if we're the one setting modes.
_clear()
if our_mode:
_apply()
def _getSid(self, sname): def _getSid(self, sname):
"""Returns the SID of a server with the given name, if present.""" """Returns the SID of a server with the given name, if present."""