open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #959 from Bond-009/string

Browse Source 
Reduce string allocations at startup
pull/1020/head
Joshua M. Boniface 6 years ago committed by GitHub
parent aea7edf0fa 320707d44c
commit 9eba31185a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 91 additions and 122 deletions
Show Stats Download Patch File Download Diff File

161
Emby.Server.Implementations/Services/ServicePath.cs
Unescape View File

@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Services
private const char ComponentSeperator = '.'; private const char ComponentSeperator = '.';
private const string VariablePrefix = "{"; private const string VariablePrefix = "{";
readonly bool[] componentsWithSeparators; private readonly bool[] componentsWithSeparators;
private readonly string restPath; private readonly string restPath;
public bool IsWildCardPath { get; private set; } public bool IsWildCardPath { get; private set; }
@ -54,10 +54,6 @@ namespace Emby.Server.Implementations.Services
public string Description { get; private set; } public string Description { get; private set; }
public bool IsHidden { get; private set; } public bool IsHidden { get; private set; }
public int Priority { get; set; } //passed back to RouteAttribute
public IEnumerable<string> PathVariables => this.variablesNames.Where(e => !string.IsNullOrWhiteSpace(e));
public static string[] GetPathPartsForMatching(string pathInfo) public static string[] GetPathPartsForMatching(string pathInfo)
{ {
return pathInfo.ToLowerInvariant().Split(new[] { PathSeperatorChar }, StringSplitOptions.RemoveEmptyEntries); return pathInfo.ToLowerInvariant().Split(new[] { PathSeperatorChar }, StringSplitOptions.RemoveEmptyEntries);
@ -83,9 +79,12 @@ namespace Emby.Server.Implementations.Services
{ {
list.Add(hashPrefix + part); list.Add(hashPrefix + part);
var subParts = part.Split(ComponentSeperator); if (part.IndexOf(ComponentSeperator) == -1)
if (subParts.Length == 1) continue; {
continue;
}
var subParts = part.Split(ComponentSeperator);
foreach (var subPart in subParts) foreach (var subPart in subParts)
{ {
list.Add(hashPrefix + subPart); list.Add(hashPrefix + subPart);
@ -114,7 +113,7 @@ namespace Emby.Server.Implementations.Services
{ {
if (string.IsNullOrEmpty(component)) continue; if (string.IsNullOrEmpty(component)) continue;
if (StringContains(component, VariablePrefix) if (component.IndexOf(VariablePrefix, StringComparison.OrdinalIgnoreCase) != -1
&& component.IndexOf(ComponentSeperator) != -1) && component.IndexOf(ComponentSeperator) != -1)
{ {
hasSeparators.Add(true); hasSeparators.Add(true);
@ -165,7 +164,11 @@ namespace Emby.Server.Implementations.Services
for (var i = 0; i < components.Length - 1; i++) for (var i = 0; i < components.Length - 1; i++)
{ {
if (!this.isWildcard[i]) continue; if (!this.isWildcard[i])
{
continue;
}
if (this.literalsToMatch[i + 1] == null) if (this.literalsToMatch[i + 1] == null)
{ {
throw new ArgumentException( throw new ArgumentException(
@ -173,7 +176,7 @@ namespace Emby.Server.Implementations.Services
} }
} }
this.wildcardCount = this.isWildcard.Count(x => x); this.wildcardCount = this.isWildcard.Length;
this.IsWildCardPath = this.wildcardCount > 0; this.IsWildCardPath = this.wildcardCount > 0;
this.FirstMatchHashKey = !this.IsWildCardPath this.FirstMatchHashKey = !this.IsWildCardPath
@ -181,19 +184,14 @@ namespace Emby.Server.Implementations.Services
: WildCardChar + PathSeperator + firstLiteralMatch; : WildCardChar + PathSeperator + firstLiteralMatch;
this.typeDeserializer = new StringMapTypeDeserializer(createInstanceFn, getParseFn, this.RequestType); this.typeDeserializer = new StringMapTypeDeserializer(createInstanceFn, getParseFn, this.RequestType);
RegisterCaseInsenstivePropertyNameMappings();
}
private void RegisterCaseInsenstivePropertyNameMappings() _propertyNamesMap = new HashSet<string>(
{ GetSerializableProperties(RequestType).Select(x => x.Name),
foreach (var propertyInfo in GetSerializableProperties(RequestType)) StringComparer.OrdinalIgnoreCase);
{
var propertyName = propertyInfo.Name;
propertyNamesMap.Add(propertyName.ToLowerInvariant(), propertyName);
}
} }
internal static string[] IgnoreAttributesNamed = new[] { internal static string[] IgnoreAttributesNamed = new[]
{
"IgnoreDataMemberAttribute", "IgnoreDataMemberAttribute",
"JsonIgnoreAttribute" "JsonIgnoreAttribute"
}; };
@ -201,19 +199,12 @@ namespace Emby.Server.Implementations.Services
private static Type excludeType = typeof(Stream); private static Type excludeType = typeof(Stream);
internal static List<PropertyInfo> GetSerializableProperties(Type type) internal static IEnumerable<PropertyInfo> GetSerializableProperties(Type type)
{ {
var list = new List<PropertyInfo>(); foreach (var prop in GetPublicProperties(type))
var props = GetPublicProperties(type);
foreach (var prop in props)
{ {
if (prop.GetMethod == null) if (prop.GetMethod == null
{ || excludeType == prop.PropertyType)
continue;
}
if (excludeType == prop.PropertyType)
{ {
continue; continue;
} }
@ -230,23 +221,21 @@ namespace Emby.Server.Implementations.Services
if (!ignored) if (!ignored)
{ {
list.Add(prop); yield return prop;
} }
} }
// else return those properties that are not decorated with IgnoreDataMember
return list;
} }
private static List<PropertyInfo> GetPublicProperties(Type type) private static IEnumerable<PropertyInfo> GetPublicProperties(Type type)
{ {
if (type.GetTypeInfo().IsInterface) if (type.IsInterface)
{ {
var propertyInfos = new List<PropertyInfo>(); var propertyInfos = new List<PropertyInfo>();
var considered = new List<Type>()
var considered = new List<Type>(); {
type
};
var queue = new Queue<Type>(); var queue = new Queue<Type>();
considered.Add(type);
queue.Enqueue(type); queue.Enqueue(type);
while (queue.Count > 0) while (queue.Count > 0)
@ -254,15 +243,16 @@ namespace Emby.Server.Implementations.Services
var subType = queue.Dequeue(); var subType = queue.Dequeue();
foreach (var subInterface in subType.GetTypeInfo().ImplementedInterfaces) foreach (var subInterface in subType.GetTypeInfo().ImplementedInterfaces)
{ {
if (considered.Contains(subInterface)) continue; if (considered.Contains(subInterface))
{
continue;
}
considered.Add(subInterface); considered.Add(subInterface);
queue.Enqueue(subInterface); queue.Enqueue(subInterface);
} }
var typeProperties = GetTypesPublicProperties(subType); var newPropertyInfos = GetTypesPublicProperties(subType)
var newPropertyInfos = typeProperties
.Where(x => !propertyInfos.Contains(x)); .Where(x => !propertyInfos.Contains(x));
propertyInfos.InsertRange(0, newPropertyInfos); propertyInfos.InsertRange(0, newPropertyInfos);
@ -271,28 +261,22 @@ namespace Emby.Server.Implementations.Services
return propertyInfos; return propertyInfos;
} }
var list = new List<PropertyInfo>(); return GetTypesPublicProperties(type)
.Where(x => x.GetIndexParameters().Length == 0);
foreach (var t in GetTypesPublicProperties(type))
{
if (t.GetIndexParameters().Length == 0)
{
list.Add(t);
}
}
return list;
} }
private static PropertyInfo[] GetTypesPublicProperties(Type subType) private static IEnumerable<PropertyInfo> GetTypesPublicProperties(Type subType)
{ {
var pis = new List<PropertyInfo>();
foreach (var pi in subType.GetRuntimeProperties()) foreach (var pi in subType.GetRuntimeProperties())
{ {
var mi = pi.GetMethod ?? pi.SetMethod; var mi = pi.GetMethod ?? pi.SetMethod;
if (mi != null && mi.IsStatic) continue; if (mi != null && mi.IsStatic)
pis.Add(pi); {
continue;
}
yield return pi;
} }
return pis.ToArray();
} }
/// <summary> /// <summary>
@ -302,7 +286,7 @@ namespace Emby.Server.Implementations.Services
private readonly StringMapTypeDeserializer typeDeserializer; private readonly StringMapTypeDeserializer typeDeserializer;
private readonly Dictionary<string, string> propertyNamesMap = new Dictionary<string, string>(); private readonly HashSet<string> _propertyNamesMap;
public int MatchScore(string httpMethod, string[] withPathInfoParts) public int MatchScore(string httpMethod, string[] withPathInfoParts)
{ {
@ -312,13 +296,10 @@ namespace Emby.Server.Implementations.Services
return -1; return -1;
} }
var score = 0;
//Routes with least wildcard matches get the highest score //Routes with least wildcard matches get the highest score
score += Math.Max((100 - wildcardMatchCount), 1) * 1000; var score = Math.Max((100 - wildcardMatchCount), 1) * 1000
//Routes with less variable (and more literal) matches
//Routes with less variable (and more literal) matches + Math.Max((10 - VariableArgsCount), 1) * 100;
score += Math.Max((10 - VariableArgsCount), 1) * 100;
//Exact verb match is better than ANY //Exact verb match is better than ANY
if (Verbs.Length == 1 && string.Equals(httpMethod, Verbs[0], StringComparison.OrdinalIgnoreCase)) if (Verbs.Length == 1 && string.Equals(httpMethod, Verbs[0], StringComparison.OrdinalIgnoreCase))
@ -333,11 +314,6 @@ namespace Emby.Server.Implementations.Services
return score; return score;
} }
private bool StringContains(string str1, string str2)
{
return str1.IndexOf(str2, StringComparison.OrdinalIgnoreCase) != -1;
}
/// <summary> /// <summary>
/// For performance withPathInfoParts should already be a lower case string /// For performance withPathInfoParts should already be a lower case string
/// to minimize redundant matching operations. /// to minimize redundant matching operations.
@ -374,7 +350,8 @@ namespace Emby.Server.Implementations.Services
if (i < this.TotalComponentsCount - 1) if (i < this.TotalComponentsCount - 1)
{ {
// Continue to consume up until a match with the next literal // Continue to consume up until a match with the next literal
while (pathIx < withPathInfoParts.Length && !LiteralsEqual(withPathInfoParts[pathIx], this.literalsToMatch[i + 1])) while (pathIx < withPathInfoParts.Length
&& !string.Equals(withPathInfoParts[pathIx], this.literalsToMatch[i + 1], StringComparison.InvariantCultureIgnoreCase))
{ {
pathIx++; pathIx++;
wildcardMatchCount++; wildcardMatchCount++;
@ -403,10 +380,12 @@ namespace Emby.Server.Implementations.Services
continue; continue;
} }
if (withPathInfoParts.Length <= pathIx || !LiteralsEqual(withPathInfoParts[pathIx], literalToMatch)) if (withPathInfoParts.Length <= pathIx
|| !string.Equals(withPathInfoParts[pathIx], literalToMatch, StringComparison.InvariantCultureIgnoreCase))
{ {
return false; return false;
} }
pathIx++; pathIx++;
} }
} }
@ -414,35 +393,26 @@ namespace Emby.Server.Implementations.Services
return pathIx == withPathInfoParts.Length; return pathIx == withPathInfoParts.Length;
} }
private static bool LiteralsEqual(string str1, string str2)
{
// Most cases
if (string.Equals(str1, str2, StringComparison.OrdinalIgnoreCase))
{
return true;
}
// Handle turkish i
str1 = str1.ToUpperInvariant();
str2 = str2.ToUpperInvariant();
// Invariant IgnoreCase would probably be better but it's not available in PCL
return string.Equals(str1, str2, StringComparison.CurrentCultureIgnoreCase);
}
private bool ExplodeComponents(ref string[] withPathInfoParts) private bool ExplodeComponents(ref string[] withPathInfoParts)
{ {
var totalComponents = new List<string>(); var totalComponents = new List<string>();
for (var i = 0; i < withPathInfoParts.Length; i++) for (var i = 0; i < withPathInfoParts.Length; i++)
{ {
var component = withPathInfoParts[i]; var component = withPathInfoParts[i];
if (string.IsNullOrEmpty(component)) continue; if (string.IsNullOrEmpty(component))
{
continue;
}
if (this.PathComponentsCount != this.TotalComponentsCount if (this.PathComponentsCount != this.TotalComponentsCount
&& this.componentsWithSeparators[i]) && this.componentsWithSeparators[i])
{ {
var subComponents = component.Split(ComponentSeperator); var subComponents = component.Split(ComponentSeperator);
if (subComponents.Length < 2) return false; if (subComponents.Length < 2)
{
return false;
}
totalComponents.AddRange(subComponents); totalComponents.AddRange(subComponents);
} }
else else
@ -483,7 +453,7 @@ namespace Emby.Server.Implementations.Services
continue; continue;
} }
if (!this.propertyNamesMap.TryGetValue(variableName.ToLowerInvariant(), out var propertyNameOnRequest)) if (!this._propertyNamesMap.Contains(variableName))
{ {
if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase)) if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
{ {
@ -507,6 +477,7 @@ namespace Emby.Server.Implementations.Services
{ {
sb.Append(PathSeperatorChar + requestComponents[j]); sb.Append(PathSeperatorChar + requestComponents[j]);
} }
value = sb.ToString(); value = sb.ToString();
} }
else else
@ -517,13 +488,13 @@ namespace Emby.Server.Implementations.Services
var stopLiteral = i == this.TotalComponentsCount - 1 ? null : this.literalsToMatch[i + 1]; var stopLiteral = i == this.TotalComponentsCount - 1 ? null : this.literalsToMatch[i + 1];
if (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
{ {
var sb = new StringBuilder(); var sb = new StringBuilder(value);
sb.Append(value);
pathIx++; pathIx++;
while (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase)) while (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
{ {
sb.Append(PathSeperatorChar + requestComponents[pathIx++]); sb.Append(PathSeperatorChar + requestComponents[pathIx++]);
} }
value = sb.ToString(); value = sb.ToString();
} }
else else
@ -538,7 +509,7 @@ namespace Emby.Server.Implementations.Services
pathIx++; pathIx++;
} }
requestKeyValuesMap[propertyNameOnRequest] = value; requestKeyValuesMap[variableName] = value;
} }
if (queryStringAndFormData != null) if (queryStringAndFormData != null)

52
Emby.Server.Implementations/Services/StringMapTypeDeserializer.cs
Unescape View File

@ -11,15 +11,16 @@ namespace Emby.Server.Implementations.Services
{ {
internal class PropertySerializerEntry internal class PropertySerializerEntry
{ {
public PropertySerializerEntry(Action<object, object> propertySetFn, Func<string, object> propertyParseStringFn) public PropertySerializerEntry(Action<object, object> propertySetFn, Func<string, object> propertyParseStringFn, Type propertyType)
{ {
PropertySetFn = propertySetFn; PropertySetFn = propertySetFn;
PropertyParseStringFn = propertyParseStringFn; PropertyParseStringFn = propertyParseStringFn;
PropertyType = PropertyType;
} }
public Action<object, object> PropertySetFn; public Action<object, object> PropertySetFn { get; private set; }
public Func<string, object> PropertyParseStringFn; public Func<string, object> PropertyParseStringFn { get; private set; }
public Type PropertyType; public Type PropertyType { get; private set; }
} }
private readonly Type type; private readonly Type type;
@ -29,7 +30,9 @@ namespace Emby.Server.Implementations.Services
public Func<string, object> GetParseFn(Type propertyType) public Func<string, object> GetParseFn(Type propertyType)
{ {
if (propertyType == typeof(string)) if (propertyType == typeof(string))
{
return s => s; return s => s;
}
return _GetParseFn(propertyType); return _GetParseFn(propertyType);
} }
@ -48,7 +51,7 @@ namespace Emby.Server.Implementations.Services
var propertySetFn = TypeAccessor.GetSetPropertyMethod(type, propertyInfo); var propertySetFn = TypeAccessor.GetSetPropertyMethod(type, propertyInfo);
var propertyType = propertyInfo.PropertyType; var propertyType = propertyInfo.PropertyType;
var propertyParseStringFn = GetParseFn(propertyType); var propertyParseStringFn = GetParseFn(propertyType);
var propertySerializer = new PropertySerializerEntry(propertySetFn, propertyParseStringFn) { PropertyType = propertyType }; var propertySerializer = new PropertySerializerEntry(propertySetFn, propertyParseStringFn, propertyType);
propertySetterMap[propertyInfo.Name] = propertySerializer; propertySetterMap[propertyInfo.Name] = propertySerializer;
} }
@ -56,34 +59,21 @@ namespace Emby.Server.Implementations.Services
public object PopulateFromMap(object instance, IDictionary<string, string> keyValuePairs) public object PopulateFromMap(object instance, IDictionary<string, string> keyValuePairs)
{ {
string propertyName = null;
string propertyTextValue = null;
PropertySerializerEntry propertySerializerEntry = null; PropertySerializerEntry propertySerializerEntry = null;
if (instance == null) if (instance == null)
{
instance = _CreateInstanceFn(type); instance = _CreateInstanceFn(type);
}
foreach (var pair in keyValuePairs) foreach (var pair in keyValuePairs)
{ {
propertyName = pair.Key; string propertyName = pair.Key;
propertyTextValue = pair.Value; string propertyTextValue = pair.Value;
if (string.IsNullOrEmpty(propertyTextValue))
{
continue;
}
if (!propertySetterMap.TryGetValue(propertyName, out propertySerializerEntry)) if (string.IsNullOrEmpty(propertyTextValue)
{ || !propertySetterMap.TryGetValue(propertyName, out propertySerializerEntry)
if (propertyName == "v") || propertySerializerEntry.PropertySetFn == null)
{
continue;
}
continue;
}
if (propertySerializerEntry.PropertySetFn == null)
{ {
continue; continue;
} }
@ -99,6 +89,7 @@ namespace Emby.Server.Implementations.Services
{ {
continue; continue;
} }
propertySerializerEntry.PropertySetFn(instance, value); propertySerializerEntry.PropertySetFn(instance, value);
} }
@ -107,7 +98,11 @@ namespace Emby.Server.Implementations.Services
public static string LeftPart(string strVal, char needle) public static string LeftPart(string strVal, char needle)
{ {
if (strVal == null) return null; if (strVal == null)
{
return null;
}
var pos = strVal.IndexOf(needle); var pos = strVal.IndexOf(needle);
return pos == -1 return pos == -1
? strVal ? strVal
@ -119,7 +114,10 @@ namespace Emby.Server.Implementations.Services
{ {
public static Action<object, object> GetSetPropertyMethod(Type type, PropertyInfo propertyInfo) public static Action<object, object> GetSetPropertyMethod(Type type, PropertyInfo propertyInfo)
{ {
if (!propertyInfo.CanWrite || propertyInfo.GetIndexParameters().Length > 0) return null; if (!propertyInfo.CanWrite || propertyInfo.GetIndexParameters().Length > 0)
{
return null;
}
var setMethodInfo = propertyInfo.SetMethod; var setMethodInfo = propertyInfo.SetMethod;
return (instance, value) => setMethodInfo.Invoke(instance, new[] { value }); return (instance, value) => setMethodInfo.Invoke(instance, new[] { value });

Write Preview
Loading…
Cancel
Save