quasar
/
Quasar
mirror of https://github.com/quasar/Quasar.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Performance and clean-up for both SafeQuickLZ 

Slightly improved performance for the SafeQuickLZ on the server and
client, code clean-up, and consistency improvements.
This commit is contained in:
yankejustin 2015-04-07 13:23:09 -04:00
parent 295daca123
commit d5cb5b9c92
2 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Client/Core/Compression/SafeQuickLZ.cs
View File

@ -71,6 +71,9 @@ namespace xClient.Core.Compression
public byte[] Compress(byte[] source, int Offset, int Length, int level)
{
if (Length == 0)
return new byte[0];
int src = Offset;
int dst = DEFAULT_HEADERLEN + CWORD_LEN;
uint cword_val = 0x80000000;
@ -84,16 +87,17 @@ namespace xClient.Core.Compression
int last_matchstart = (Length - UNCONDITIONAL_MATCHLEN - UNCOMPRESSED_END - 1);
int lits = 0;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
if (level == 1)
hashtable = new int[HASH_VALUES, QLZ_POINTERS_1];
else
hashtable = new int[HASH_VALUES, QLZ_POINTERS_3];
if (Length == 0)
return new byte[0];
switch (level)
{
case 1:
hashtable = new int[HASH_VALUES, QLZ_POINTERS_1];
break;
case 3:
hashtable = new int[HASH_VALUES, QLZ_POINTERS_3];
break;
default:
throw new ArgumentException("C# version only supports level 1 and 3");
}
if (src <= last_matchstart)
fetch = source[src] | (source[src + 1] << 8) | (source[src + 2] << 16);
@ -106,7 +110,7 @@ namespace xClient.Core.Compression
{
d2 = new byte[Length + DEFAULT_HEADERLEN];
WriteHeader(d2, level, false, Length, Length + DEFAULT_HEADERLEN);
System.Array.Copy(source, 0, d2, DEFAULT_HEADERLEN, Length);
Array.Copy(source, 0, d2, DEFAULT_HEADERLEN, Length);
return d2;
}
@ -293,7 +297,7 @@ namespace xClient.Core.Compression
FastWrite(destination, cword_ptr, (int)((cword_val >> 1) | 0x80000000), CWORD_LEN);
WriteHeader(destination, level, true, Length, dst);
d2 = new byte[dst];
System.Array.Copy(destination, d2, dst);
Array.Copy(destination, d2, dst);
return d2;
}
@ -306,7 +310,11 @@ namespace xClient.Core.Compression
public byte[] Decompress(byte[] source, int Offset, int Length)
{
int level;
int level = (source[Offset] >> 2) & 0x3;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
int size = SizeDecompressed(source, Offset);
int src = HeaderLen(source, Offset) + Offset;
int dst = 0;
@ -319,15 +327,10 @@ namespace xClient.Core.Compression
int hash;
uint fetch = 0;
level = (source[Offset] >> 2) & 0x3;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
if ((source[Offset] & 1) != 1)
{
byte[] d2 = new byte[size];
System.Array.Copy(source, HeaderLen(source, Offset), d2, Offset, size);
Array.Copy(source, HeaderLen(source, Offset), d2, Offset, size);
return d2;
}
@ -482,4 +485,4 @@ namespace xClient.Core.Compression
}
}
}
}
}

43
Server/Core/Compression/SafeQuickLZ.cs
View File

@ -71,6 +71,9 @@ namespace xServer.Core.Compression
public byte[] Compress(byte[] source, int Offset, int Length, int level)
{
if (Length == 0)
return new byte[0];
int src = Offset;
int dst = DEFAULT_HEADERLEN + CWORD_LEN;
uint cword_val = 0x80000000;
@ -84,16 +87,17 @@ namespace xServer.Core.Compression
int last_matchstart = (Length - UNCONDITIONAL_MATCHLEN - UNCOMPRESSED_END - 1);
int lits = 0;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
if (level == 1)
hashtable = new int[HASH_VALUES, QLZ_POINTERS_1];
else
hashtable = new int[HASH_VALUES, QLZ_POINTERS_3];
if (Length == 0)
return new byte[0];
switch (level)
{
case 1:
hashtable = new int[HASH_VALUES, QLZ_POINTERS_1];
break;
case 3:
hashtable = new int[HASH_VALUES, QLZ_POINTERS_3];
break;
default:
throw new ArgumentException("C# version only supports level 1 and 3");
}
if (src <= last_matchstart)
fetch = source[src] | (source[src + 1] << 8) | (source[src + 2] << 16);
@ -106,7 +110,7 @@ namespace xServer.Core.Compression
{
d2 = new byte[Length + DEFAULT_HEADERLEN];
WriteHeader(d2, level, false, Length, Length + DEFAULT_HEADERLEN);
System.Array.Copy(source, 0, d2, DEFAULT_HEADERLEN, Length);
Array.Copy(source, 0, d2, DEFAULT_HEADERLEN, Length);
return d2;
}
@ -293,7 +297,7 @@ namespace xServer.Core.Compression
FastWrite(destination, cword_ptr, (int)((cword_val >> 1) | 0x80000000), CWORD_LEN);
WriteHeader(destination, level, true, Length, dst);
d2 = new byte[dst];
System.Array.Copy(destination, d2, dst);
Array.Copy(destination, d2, dst);
return d2;
}
@ -306,7 +310,11 @@ namespace xServer.Core.Compression
public byte[] Decompress(byte[] source, int Offset, int Length)
{
int level;
int level = (source[Offset] >> 2) & 0x3;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
int size = SizeDecompressed(source, Offset);
int src = HeaderLen(source, Offset) + Offset;
int dst = 0;
@ -319,15 +327,10 @@ namespace xServer.Core.Compression
int hash;
uint fetch = 0;
level = (source[Offset] >> 2) & 0x3;
if (level != 1 && level != 3)
throw new ArgumentException("C# version only supports level 1 and 3");
if ((source[Offset] & 1) != 1)
{
byte[] d2 = new byte[size];
System.Array.Copy(source, HeaderLen(source, Offset), d2, Offset, size);
Array.Copy(source, HeaderLen(source, Offset), d2, Offset, size);
return d2;
}
@ -482,4 +485,4 @@ namespace xServer.Core.Compression
}
}
}
}
}