cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #849 from Bond-009/span

Browse Source 
Less string allocations
This commit is contained in:
Joshua M. Boniface 2019-02-27 00:30:31 -05:00 committed by GitHub
commit 42d4834f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Jellyfin.Server/SocketSharp/RequestMono.cs
View File

@ -11,7 +11,7 @@ namespace Jellyfin.Server.SocketSharp
{ {
public partial class WebSocketSharpRequest : IHttpRequest public partial class WebSocketSharpRequest : IHttpRequest
{ {
internal static string GetParameter(string header, string attr) internal static string GetParameter(ReadOnlySpan<char> header, string attr)
{ {
int ap = header.IndexOf(attr, StringComparison.Ordinal); int ap = header.IndexOf(attr, StringComparison.Ordinal);
if (ap == -1) if (ap == -1)
@ -31,13 +31,14 @@ namespace Jellyfin.Server.SocketSharp
ending = ' '; ending = ' ';
} }
int end = header.IndexOf(ending, ap + 1); var slice = header.Slice(ap + 1);
int end = slice.IndexOf(ending);
if (end == -1) if (end == -1)
{ {
return ending == '"' ? null : header.Substring(ap); return ending == '"' ? null : header.Slice(ap).ToString();
} }
return header.Substring(ap + 1, end - ap - 1); return slice.Slice(0, end - ap - 1).ToString();
} }
private async Task LoadMultiPart(WebROCollection form) private async Task LoadMultiPart(WebROCollection form)
@ -394,7 +395,7 @@ namespace Jellyfin.Server.SocketSharp
} }
var elem = new Element(); var elem = new Element();
string header; ReadOnlySpan<char> header;
while ((header = ReadHeaders()) != null) while ((header = ReadHeaders()) != null)
{ {
if (header.StartsWith("Content-Disposition:", StringComparison.OrdinalIgnoreCase)) if (header.StartsWith("Content-Disposition:", StringComparison.OrdinalIgnoreCase))
@ -404,7 +405,7 @@ namespace Jellyfin.Server.SocketSharp
} }
else if (header.StartsWith("Content-Type:", StringComparison.OrdinalIgnoreCase)) else if (header.StartsWith("Content-Type:", StringComparison.OrdinalIgnoreCase))
{ {
elem.ContentType = header.Substring("Content-Type:".Length).Trim(); elem.ContentType = header.Slice("Content-Type:".Length).Trim().ToString();
elem.Encoding = GetEncoding(elem.ContentType); elem.Encoding = GetEncoding(elem.ContentType);
} }
} }
@ -452,7 +453,7 @@ namespace Jellyfin.Server.SocketSharp
return sb.ToString(); return sb.ToString();
} }
private static string GetContentDispositionAttribute(string l, string name) private static string GetContentDispositionAttribute(ReadOnlySpan<char> l, string name)
{ {
int idx = l.IndexOf(name + "=\"", StringComparison.Ordinal); int idx = l.IndexOf(name + "=\"", StringComparison.Ordinal);
if (idx < 0) if (idx < 0)
@ -461,7 +462,7 @@ namespace Jellyfin.Server.SocketSharp
} }
int begin = idx + name.Length + "=\"".Length; int begin = idx + name.Length + "=\"".Length;
int end = l.IndexOf('"', begin); int end = l.Slice(begin).IndexOf('"');
if (end < 0) if (end < 0)
{ {
return null; return null;
@ -472,10 +473,10 @@ namespace Jellyfin.Server.SocketSharp
return string.Empty; return string.Empty;
} }
return l.Substring(begin, end - begin); return l.Slice(begin, end - begin).ToString();
} }
private string GetContentDispositionAttributeWithEncoding(string l, string name) private string GetContentDispositionAttributeWithEncoding(ReadOnlySpan<char> l, string name)
{ {
int idx = l.IndexOf(name + "=\"", StringComparison.Ordinal); int idx = l.IndexOf(name + "=\"", StringComparison.Ordinal);
if (idx < 0) if (idx < 0)
@ -484,7 +485,7 @@ namespace Jellyfin.Server.SocketSharp
} }
int begin = idx + name.Length + "=\"".Length; int begin = idx + name.Length + "=\"".Length;
int end = l.IndexOf('"', begin); int end = l.Slice(begin).IndexOf('"');
if (end < 0) if (end < 0)
{ {
return null; return null;
@ -495,7 +496,7 @@ namespace Jellyfin.Server.SocketSharp
return string.Empty; return string.Empty;
} }
string temp = l.Substring(begin, end - begin); ReadOnlySpan<char> temp = l.Slice(begin, end - begin);
byte[] source = new byte[temp.Length]; byte[] source = new byte[temp.Length];
for (int i = temp.Length - 1; i >= 0; i--) for (int i = temp.Length - 1; i >= 0; i--)
{ {

66
Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
View File

@ -57,18 +57,37 @@ namespace Jellyfin.Server.SocketSharp
public string XRealIp => string.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"]; public string XRealIp => string.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
private string remoteIp; private string remoteIp;
public string RemoteIp => public string RemoteIp
remoteIp ?? {
(remoteIp = CheckBadChars(XForwardedFor) ?? get
NormalizeIp(CheckBadChars(XRealIp) ?? {
(request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.Address.ToString()) : null))); if (remoteIp != null)
{
return remoteIp;
}
var temp = CheckBadChars(XForwardedFor);
if (temp.Length != 0)
{
return remoteIp = temp.ToString();
}
temp = CheckBadChars(XRealIp);
if (temp.Length != 0)
{
return remoteIp = NormalizeIp(temp).ToString();
}
return remoteIp = NormalizeIp(request.RemoteEndPoint?.Address.ToString()).ToString();
}
}
private static readonly char[] HttpTrimCharacters = new char[] { (char)0x09, (char)0xA, (char)0xB, (char)0xC, (char)0xD, (char)0x20 }; private static readonly char[] HttpTrimCharacters = new char[] { (char)0x09, (char)0xA, (char)0xB, (char)0xC, (char)0xD, (char)0x20 };
// CheckBadChars - throws on invalid chars to be not found in header name/value // CheckBadChars - throws on invalid chars to be not found in header name/value
internal static string CheckBadChars(string name) internal static ReadOnlySpan<char> CheckBadChars(ReadOnlySpan<char> name)
{ {
if (name == null || name.Length == 0) if (name.Length == 0)
{ {
return name; return name;
} }
@ -99,7 +118,7 @@ namespace Jellyfin.Server.SocketSharp
} }
else if (c == 127 || (c < ' ' && c != '\t')) else if (c == 127 || (c < ' ' && c != '\t'))
{ {
throw new ArgumentException("net_WebHeaderInvalidControlChars"); throw new ArgumentException("net_WebHeaderInvalidControlChars", nameof(name));
} }
break; break;
@ -113,7 +132,7 @@ namespace Jellyfin.Server.SocketSharp
break; break;
} }
throw new ArgumentException("net_WebHeaderInvalidCRLFChars"); throw new ArgumentException("net_WebHeaderInvalidCRLFChars", nameof(name));
} }
case 2: case 2:
@ -124,14 +143,14 @@ namespace Jellyfin.Server.SocketSharp
break; break;
} }
throw new ArgumentException("net_WebHeaderInvalidCRLFChars"); throw new ArgumentException("net_WebHeaderInvalidCRLFChars", nameof(name));
} }
} }
} }
if (crlf != 0) if (crlf != 0)
{ {
throw new ArgumentException("net_WebHeaderInvalidCRLFChars"); throw new ArgumentException("net_WebHeaderInvalidCRLFChars", nameof(name));
} }
return name; return name;
@ -150,16 +169,16 @@ namespace Jellyfin.Server.SocketSharp
return false; return false;
} }
private string NormalizeIp(string ip) private ReadOnlySpan<char> NormalizeIp(ReadOnlySpan<char> ip)
{ {
if (!string.IsNullOrWhiteSpace(ip)) if (ip.Length != 0 && !ip.IsWhiteSpace())
{ {
// Handle ipv4 mapped to ipv6 // Handle ipv4 mapped to ipv6
const string srch = "::ffff:"; const string srch = "::ffff:";
var index = ip.IndexOf(srch, StringComparison.OrdinalIgnoreCase); var index = ip.IndexOf(srch, StringComparison.OrdinalIgnoreCase);
if (index == 0) if (index == 0)
{ {
ip = ip.Substring(srch.Length); ip = ip.Slice(srch.Length);
} }
} }
@ -302,17 +321,6 @@ namespace Jellyfin.Server.SocketSharp
return null; return null;
} }
public static string LeftPart(string strVal, char needle)
{
if (strVal == null)
{
return null;
}
var pos = strVal.IndexOf(needle, StringComparison.Ordinal);
return pos == -1 ? strVal : strVal.Substring(0, pos);
}
public static ReadOnlySpan<char> LeftPart(ReadOnlySpan<char> strVal, char needle) public static ReadOnlySpan<char> LeftPart(ReadOnlySpan<char> strVal, char needle)
{ {
if (strVal == null) if (strVal == null)
@ -350,7 +358,7 @@ namespace Jellyfin.Server.SocketSharp
} }
this.pathInfo = System.Net.WebUtility.UrlDecode(pathInfo); this.pathInfo = System.Net.WebUtility.UrlDecode(pathInfo);
this.pathInfo = NormalizePathInfo(pathInfo, mode); this.pathInfo = NormalizePathInfo(pathInfo, mode).ToString();
} }
return this.pathInfo; return this.pathInfo;
@ -517,14 +525,14 @@ namespace Jellyfin.Server.SocketSharp
} }
} }
public static string NormalizePathInfo(string pathInfo, string handlerPath) public static ReadOnlySpan<char> NormalizePathInfo(string pathInfo, string handlerPath)
{ {
if (handlerPath != null) if (handlerPath != null)
{ {
var trimmed = pathInfo.TrimStart('/'); var trimmed = pathInfo.AsSpan().TrimStart('/');
if (trimmed.StartsWith(handlerPath, StringComparison.OrdinalIgnoreCase)) if (trimmed.StartsWith(handlerPath, StringComparison.OrdinalIgnoreCase))
{ {
return trimmed.Substring(handlerPath.Length); return trimmed.Slice(handlerPath.Length).ToString();
} }
} }