alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

remove mutex from mono startup

Browse Source
This commit is contained in:
Luke Pulverenti
2013-10-07 23:06:12 -04:00
parent a90908f0f7
commit 9663252d10
3 changed files with 20 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@@ -44,13 +44,11 @@ namespace MediaBrowser.Server.Implementations.Session
/// <value>The configuration manager.</value>
private readonly IServerConfigurationManager _configurationManager;
private object _sessionLock = new object();
/// <summary>
/// The _active connections
/// </summary>
private readonly Dictionary<string, SessionInfo> _activeConnections =
new Dictionary<string, SessionInfo>(StringComparer.OrdinalIgnoreCase);
private readonly ConcurrentDictionary<string, SessionInfo> _activeConnections =
new ConcurrentDictionary<string, SessionInfo>(StringComparer.OrdinalIgnoreCase);
/// <summary>
/// Occurs when [playback start].
@@ -86,7 +84,7 @@ namespace MediaBrowser.Server.Implementations.Session
/// <value>All connections.</value>
public IEnumerable<SessionInfo> Sessions
{
get { return _activeConnections.Values.ToList().OrderByDescending(c => c.LastActivityDate); }
get { return _activeConnections.Values.OrderByDescending(c => c.LastActivityDate).ToList(); }
}
/// <summary>
@@ -195,28 +193,18 @@ namespace MediaBrowser.Server.Implementations.Session
{
var key = clientType + deviceId + appVersion;
lock (_sessionLock)
var connection = _activeConnections.GetOrAdd(key, keyName => new SessionInfo
{
SessionInfo connection;
Client = clientType,
DeviceId = deviceId,
ApplicationVersion = appVersion,
Id = Guid.NewGuid()
});
if (!_activeConnections.TryGetValue(key, out connection))
{
connection = new SessionInfo
{
Client = clientType,
DeviceId = deviceId,
ApplicationVersion = appVersion,
Id = Guid.NewGuid()
};
connection.DeviceName = deviceName;
connection.User = user;
_activeConnections[key] = connection;
}
connection.DeviceName = deviceName;
connection.User = user;
return connection;
}
return connection;
}
/// <summary>
@@ -589,4 +577,4 @@ namespace MediaBrowser.Server.Implementations.Session
return Task.WhenAll(tasks);
}
}
}
}