diff --git a/README.md b/README.md index 179698e..e1976fc 100644 --- a/README.md +++ b/README.md @@ -248,29 +248,23 @@ static void Main(string[] args) ``` ini -BenchmarkDotNet=v0.11.5, OS=Windows 10.0.18362 +BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363 Intel Core i7-8700K CPU 3.70GHz (Coffee Lake), 1 CPU, 12 logical and 6 physical cores - [Host] : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 64bit RyuJIT-v4.8.4010.0 - Job-LGLQDK : .NET Core 2.2.7 (CoreCLR 4.6.28008.02, CoreFX 4.6.28008.03), 64bit RyuJIT - Job-ZHZJMS : .NET Core 3.0.0 (CoreCLR 4.700.19.46205, CoreFX 4.700.19.46214), 64bit RyuJIT +.NET Core SDK=3.1.100 + [Host] : .NET Core 3.1.0 (CoreCLR 4.700.19.56402, CoreFX 4.700.19.56404), X64 RyuJIT + Job-RQJOPV : .NET Core 3.1.0 (CoreCLR 4.700.19.56402, CoreFX 4.700.19.56404), X64 RyuJIT -Platform=AnyCpu Server=False +Platform=AnyCpu Server=False Toolchain=.NET Core 3.1 ``` -| Method | Toolchain | N | Mean | Error | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated | -|---------------------------------------- |-------------- |------- |-------------:|-------------:|-------------:|-----------:|------:|------:|-------------:| -| **JT809_0x9400_0x9401_Package_Deserialize** | **.NET Core 2.2** | **100** | **708.1 us** | **9.502 us** | **8.888 us** | **18.5547** | **-** | **-** | **118.75 KB** | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 2.2 | 100 | 579.5 us | 4.797 us | 4.487 us | 12.6953 | - | - | 83.59 KB | -| JT809_0x9400_0x9401_Package_Deserialize | .NET Core 3.0 | 100 | 625.4 us | 6.279 us | 5.874 us | 15.6250 | - | - | 100.79 KB | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 3.0 | 100 | 493.5 us | 6.747 us | 5.981 us | 12.6953 | - | - | 83.59 KB | -| **JT809_0x9400_0x9401_Package_Deserialize** | **.NET Core 2.2** | **10000** | **71,579.2 us** | **479.153 us** | **400.115 us** | **1857.1429** | **-** | **-** | **11875 KB** | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 2.2 | 10000 | 57,628.0 us | 1,132.986 us | 1,259.311 us | 1333.3333 | - | - | 8359.38 KB | -| JT809_0x9400_0x9401_Package_Deserialize | .NET Core 3.0 | 10000 | 62,621.4 us | 347.593 us | 308.132 us | 1625.0000 | - | - | 10078.74 KB | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 3.0 | 10000 | 50,368.3 us | 603.232 us | 564.264 us | 1300.0000 | - | - | 8359.38 KB | -| **JT809_0x9400_0x9401_Package_Deserialize** | **.NET Core 2.2** | **100000** | **699,234.2 us** | **4,387.105 us** | **3,889.054 us** | **19000.0000** | **-** | **-** | **118750 KB** | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 2.2 | 100000 | 553,963.3 us | 5,945.857 us | 5,561.758 us | 13000.0000 | - | - | 83593.75 KB | -| JT809_0x9400_0x9401_Package_Deserialize | .NET Core 3.0 | 100000 | 625,025.5 us | 2,921.895 us | 2,733.143 us | 16000.0000 | - | - | 100787.23 KB | -| JT809_0x9400_0x9401_Package_Serialize | .NET Core 3.0 | 100000 | 500,894.2 us | 2,459.516 us | 2,180.297 us | 13000.0000 | - | - | 83593.75 KB | +| Method | N | Mean | Error | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated | +|---------------------------------------- |------- |-------------:|-------------:|------------:|-----------:|------:|------:|-------------:| +| **JT809_0x9400_0x9401_Package_Deserialize** | **100** | **629.9 us** | **11.09 us** | **9.83 us** | **15.6250** | **-** | **-** | **100.79 KB** | +| JT809_0x9400_0x9401_Package_Serialize | 100 | 501.0 us | 8.63 us | 8.07 us | 13.1836 | - | - | 83.59 KB | +| **JT809_0x9400_0x9401_Package_Deserialize** | **10000** | **63,018.0 us** | **954.14 us** | **845.82 us** | **1625.0000** | **-** | **-** | **10078.74 KB** | +| JT809_0x9400_0x9401_Package_Serialize | 10000 | 48,890.0 us | 1,107.12 us | 1,136.93 us | 1363.6364 | - | - | 8359.38 KB | +| **JT809_0x9400_0x9401_Package_Deserialize** | **100000** | **623,675.9 us** | **10,185.67 us** | **9,527.68 us** | **16000.0000** | **-** | **-** | **100787.23 KB** | +| JT809_0x9400_0x9401_Package_Serialize | 100000 | 486,690.2 us | 6,158.00 us | 5,458.90 us | 13000.0000 | - | - | 83595.03 KB | ## JT809协议消息对照表 diff --git a/doc/808809补充协议.pdf b/doc/808809补充协议.pdf deleted file mode 100644 index 0e7ccc5..0000000 Binary files a/doc/808809补充协议.pdf and /dev/null differ diff --git a/doc/GBT-19056.pdf b/doc/GBT-19056.pdf deleted file mode 100644 index 12d9b38..0000000 Binary files a/doc/GBT-19056.pdf and /dev/null differ diff --git a/doc/JT-T809.pdf b/doc/JT-T809.pdf deleted file mode 100644 index 5b37a4b..0000000 Binary files a/doc/JT-T809.pdf and /dev/null differ diff --git a/doc/JTT415-2006.pdf b/doc/JTT415-2006.pdf deleted file mode 100644 index 21f49e6..0000000 Binary files a/doc/JTT415-2006.pdf and /dev/null differ diff --git a/doc/jt809协议解析.txt b/doc/jt809协议解析.txt deleted file mode 100644 index 7983b5e..0000000 --- a/doc/jt809协议解析.txt +++ /dev/null @@ -1,32 +0,0 @@ -5B -00 00 -00 5A 02 00 00 00 85 12 00 01 33 53 D5 01 00 00 00 00 00 27 0F D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 01 12 02 00 00 00 24 00 13 07 07 DC 0F 0F 0F 07 EF 4D 80 01 70 18 40 00 32 00 34 00 00 00 96 00 2D 00 2D 00 00 00 03 00 00 00 00 43 BF -5D - -5B -- ʶͷ -00 00 00 5A -- Unit32_t ݳ -00 00 00 85 -- Unit32_t к a -12 00 -- Unit16_t ҵ -01 33 53 D5 -- Unit32_t ¼ƽ̨룬ϼƽ̨¼ƽ̨Ψһʶ -01 00 00 -- BYTES Э汾ñʶ -00 -- BYTE ļܱʶλ b: 0 ʾIJܣ1 ʾļ -00 00 27 0F -- Unit32_t ݼܵܳףΪ 4 ֽ -D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 -- 21 Octet String ƺ -01 -- 1 BYTE ɫ JT/T415-2006 5.4.12 Ĺ涨 -12 02 --2 Uint16_t ҵͱʶ -00 00 00 24 -- 4 Uint32_t ݳ ------********************************************** ݲ********************************************----- -00 -- BYTE ֶαʶĶλϢǷʹùҲ׼ĵͼܲмܡܱʶ1-Ѽܣ0-δܡ -13 07 07 DC -- 4 BYTES ꣨dmyy) -0F 0F 0F -- 3 BYTES ʱ루hms -07 EF 4D 80 --4 Uint32_t ȣλΪ 1*10^-6 -01 70 18 40 -- 4 Uint32_t γȣλΪ 1*10^-6 -00 32 -- 2 Uint16_t ٶȣ -00 34 -- 2 Uint16_t ʻ¼ٶ -00 00 00 96 -- 4 Uint32_t ǰ -00 2D --2 Uint16_t 0-359λΪȣ -00 2D --2 Uint16_t θ߶ȣλΪףm -00 00 00 03 -- 4 Uint32_t ״̬ƱʾB31B30B29B2B1B0.嶨尴 JT/T808-2011 б 17 Ĺ涨 -00 00 00 00 --4 Uint32_t ״̬Ʊʾ0 ʶ1 ʾB31B30B29 B2B1B0. JT/T808-2011 б 18 Ĺ涨 -43 BF -- 2 Unint16_t CRC У -5D -- ʶβ \ No newline at end of file diff --git a/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj b/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj index 62aed5f..97e68b0 100644 --- a/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj +++ b/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.2;net472;netcoreapp3.0; + netcoreapp3.1 - + diff --git a/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs b/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs index 7921975..09a0f8b 100644 --- a/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs +++ b/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs @@ -87,8 +87,7 @@ namespace JT809.Protocol.Benchmark { public JT809SerializerContextConfig() { - Add(Job.Default.WithGcServer(false).With(CsProjCoreToolchain.NetCoreApp22).With(Platform.AnyCpu)); - Add(Job.Default.WithGcServer(false).With(CsProjCoreToolchain.NetCoreApp30).With(Platform.AnyCpu)); + Add(Job.Default.WithGcServer(false).With(CsProjCoreToolchain.NetCoreApp31).With(Platform.AnyCpu)); } } } diff --git a/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj b/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj index f1f5e43..beebe3e 100644 --- a/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj +++ b/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false @@ -11,8 +11,8 @@ - - + + all diff --git a/src/JT809.Protocol/JT809.Protocol.csproj b/src/JT809.Protocol/JT809.Protocol.csproj index f819cb4..4994561 100644 --- a/src/JT809.Protocol/JT809.Protocol.csproj +++ b/src/JT809.Protocol/JT809.Protocol.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT809 https://github.com/SmallChi/JT809/blob/master/LICENSE false - 2.1.2 + 2.1.3 LICENSE @@ -111,9 +111,9 @@ - - - + + +