EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove _streamLock

Browse Source
This commit is contained in:
Giuseppe Guerra at an airport 2017-08-12 08:49:55 +02:00
parent e40acd335b
commit b24b4ee88d
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
objects/osuToken.py
View File

@ -88,7 +88,6 @@ class token:
# Locks # Locks
self.processingLock = threading.Lock() # Acquired while there's an incoming packet from this user self.processingLock = threading.Lock() # Acquired while there's an incoming packet from this user
self._bufferLock = threading.Lock() # Acquired while writing to packets buffer self._bufferLock = threading.Lock() # Acquired while writing to packets buffer
self._streamsLock = threading.Lock() # Acquired while joining/leaving streams
self._spectatorLock = threading.Lock() # Acquired while starting/stopping spectating self._spectatorLock = threading.Lock() # Acquired while starting/stopping spectating
self._multiplayerLock = threading.Lock()# Acquired while joining/leaving streams self._multiplayerLock = threading.Lock()# Acquired while joining/leaving streams
@ -511,13 +510,9 @@ class token:
:param name: stream name :param name: stream name
:return: :return:
""" """
try: glob.streams.join(name, token=self.token)
self._streamsLock.acquire() if name not in self.streams:
glob.streams.join(name, token=self.token) self.streams.append(name)
if name not in self.streams:
self.streams.append(name)
finally:
self._streamsLock.release()
def leaveStream(self, name): def leaveStream(self, name):
""" """
@ -526,13 +521,9 @@ class token:
:param name: stream name :param name: stream name
:return: :return:
""" """
try: glob.streams.leave(name, token=self.token)
self._streamsLock.acquire() if name in self.streams:
glob.streams.leave(name, token=self.token) self.streams.remove(name)
if name in self.streams:
self.streams.remove(name)
finally:
self._streamsLock.release()
def leaveAllStreams(self): def leaveAllStreams(self):
""" """