RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 07:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add thread safety for external operations on MultiplayerRoom

Browse Source
This commit is contained in:
Dean Herbert 2020-12-08 15:46:11 +09:00
parent 327799c263
commit 5a231cef15
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
View File

@ -9,8 +9,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
[Serializable]
public class MultiplayerRoom
{
private object writeLock = new object();
public long RoomID { get; set; }
public MultiplayerRoomState State { get; set; }
@ -31,22 +29,34 @@ namespace osu.Game.Online.RealtimeMultiplayer
public MultiplayerRoomUser Join(int userId)
{
var user = new MultiplayerRoomUser(userId);
lock (writeLock) users.Add(user);
PerformUpdate(_ => users.Add(user));
return user;
}
public MultiplayerRoomUser Leave(int userId)
{
lock (writeLock)
MultiplayerRoomUser user = null;
PerformUpdate(_ =>
{
var user = users.Find(u => u.UserID == userId);
user = users.Find(u => u.UserID == userId);
if (user == null)
return null;
if (user != null)
users.Remove(user);
});
users.Remove(user);
return user;
}
return user;
}
private object writeLock = new object();
/// <summary>
/// Perform an update on this room in a thread-safe manner.
/// </summary>
/// <param name="action">The action to perform.</param>
public void PerformUpdate(Action<MultiplayerRoom> action)
{
lock (writeLock) action(this);
}
}
}