From 027192e80ee2ea090505dc0c41dbb989be3de4d3 Mon Sep 17 00:00:00 2001 From: Jens Geyer Date: Mon, 29 Dec 2014 00:54:36 +0100 Subject: [PATCH] - Setup for Visual Studio 2022 - Referenzdaten PerfTest Delphi und netstd - "custom build" added to version info - workaround for some strange LNK error in go validation code --- compiler/cpp/compiler.vcxproj | 13 +- compiler/cpp/compiler.vcxproj.filters | 15 +++ .../cpp/src/thrift/generate/t_go_generator.cc | 2 +- compiler/cpp/src/thrift/main.cc | 2 +- lib/delphi/Thrift.groupproj | 120 ++++++++++++++++++ .../testsuite/client/Performance/Referenz.txt | 21 +++ test/netstd/Referenz.txt | 20 +++ test/netstd/ThriftTest.sln | 18 ++- 8 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 lib/delphi/Thrift.groupproj create mode 100644 lib/delphi/test/testsuite/client/Performance/Referenz.txt create mode 100644 test/netstd/Referenz.txt diff --git a/compiler/cpp/compiler.vcxproj b/compiler/cpp/compiler.vcxproj index dcf876bb42e..fe145a416be 100644 --- a/compiler/cpp/compiler.vcxproj +++ b/compiler/cpp/compiler.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,8 +23,11 @@ + + + @@ -53,6 +56,8 @@ + + @@ -98,29 +103,34 @@ {89975A1A-F799-4556-98B8-64E30AB39A90} Win32Proj compiler + 10.0 Application true MultiByte + v143 Application true MultiByte + v143 Application false true MultiByte + v143 Application false true MultiByte + v143 @@ -143,6 +153,7 @@ $(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath) thrift $(ExecutablePath);C:\Program Files (x86)\Git\bin + E:\D\TOOLS\Thrift\ true diff --git a/compiler/cpp/compiler.vcxproj.filters b/compiler/cpp/compiler.vcxproj.filters index 54fd991f4e7..6d78bedec4f 100644 --- a/compiler/cpp/compiler.vcxproj.filters +++ b/compiler/cpp/compiler.vcxproj.filters @@ -11,6 +11,15 @@ generate + + generate + + + generate + + + generate + generate @@ -92,6 +101,12 @@ + + generate + + + generate + generate diff --git a/compiler/cpp/src/thrift/generate/t_go_generator.cc b/compiler/cpp/src/thrift/generate/t_go_generator.cc index 65574dd0a40..dd38c302bab 100644 --- a/compiler/cpp/src/thrift/generate/t_go_generator.cc +++ b/compiler/cpp/src/thrift/generate/t_go_generator.cc @@ -1190,7 +1190,7 @@ void t_go_generator::generate_go_struct(t_struct* tstruct, bool is_exception) { std::string tstruct_name(publicize(tstruct->get_name(), false)); f_types_ << "func (p *" << tstruct_name << ") Validate() error {" << '\n'; indent_up(); - go_validator_generator(this).generate_struct_validator(f_types_, tstruct); + //go_validator_generator(this).generate_struct_validator(f_types_, tstruct); -- causes LNK2019 in VC f_types_ << indent() << "return nil" << '\n'; indent_down(); f_types_ << "}" << '\n' << '\n'; diff --git a/compiler/cpp/src/thrift/main.cc b/compiler/cpp/src/thrift/main.cc index 5177076adf7..643bfdd4b8a 100644 --- a/compiler/cpp/src/thrift/main.cc +++ b/compiler/cpp/src/thrift/main.cc @@ -656,7 +656,7 @@ void error_unsupported_namespace_decl(const char* old_form, const char* new_form * Prints the version number */ void version() { - printf("Thrift version %s\n", THRIFT_VERSION); + printf("Thrift version %s (custom build)\n", THRIFT_VERSION); } /** diff --git a/lib/delphi/Thrift.groupproj b/lib/delphi/Thrift.groupproj new file mode 100644 index 00000000000..f41f293eff9 --- /dev/null +++ b/lib/delphi/Thrift.groupproj @@ -0,0 +1,120 @@ + + + {86AE16E4-18D4-4C07-B06C-491E22A26C74} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/delphi/test/testsuite/client/Performance/Referenz.txt b/lib/delphi/test/testsuite/client/Performance/Referenz.txt new file mode 100644 index 00000000000..53cb154f619 --- /dev/null +++ b/lib/delphi/test/testsuite/client/Performance/Referenz.txt @@ -0,0 +1,21 @@ +Delphi TestClient 0.14.0 +Setting up for ProtocolPeformanceTest ... +RunTest(binary): write = 2650 msec +RunTest(binary): read = 3135 msec +RunTest(compact): write = 2807 msec +RunTest(compact): read = 3053 msec +RunTest(JSON): write = 13251 msec +RunTest(JSON): read = 18759 msec +RunTest(binary + buffered): write = 2635 msec +RunTest(binary + buffered): read = 3109 msec +RunTest(compact + buffered): write = 2788 msec +RunTest(compact + buffered): read = 3069 msec +RunTest(JSON + buffered): write = 13604 msec +RunTest(JSON + buffered): read = 21537 msec +RunTest(binary + framed): write = 3019 msec +RunTest(binary + framed): read = 3573 msec +RunTest(compact + framed): write = 3201 msec +RunTest(compact + framed): read = 3504 msec +RunTest(JSON + framed): write = 15093 msec +RunTest(JSON + framed): read = 21548 msec +Hit ENTER ... \ No newline at end of file diff --git a/test/netstd/Referenz.txt b/test/netstd/Referenz.txt new file mode 100644 index 00000000000..58088e4c93d --- /dev/null +++ b/test/netstd/Referenz.txt @@ -0,0 +1,20 @@ +E:\D\TPCPP\Thrift\wc-XE-all\wc-JensG-haxe\test\netstd\Client\bin\Release\netcoreapp3.1>Client.exe --performance +Setting up for ProtocolPeformanceTestAsync ... +RunTestAsync(TBinaryProtocol): write = 1982 msec +RunTestAsync(TBinaryProtocol): read = 4995 msec +RunTestAsync(TCompactProtocol): write = 1240 msec +RunTestAsync(TCompactProtocol): read = 3964 msec +RunTestAsync(TJsonProtocol): write = 5206 msec +RunTestAsync(TJsonProtocol): read = 23249 msec +RunTestAsync(TBinaryProtocol + TBufferedTransport): write = 1990 msec +RunTestAsync(TBinaryProtocol + TBufferedTransport): read = 5777 msec +RunTestAsync(TCompactProtocol + TBufferedTransport): write = 1453 msec +RunTestAsync(TCompactProtocol + TBufferedTransport): read = 4761 msec +RunTestAsync(TJsonProtocol + TBufferedTransport): write = 8859 msec +RunTestAsync(TJsonProtocol + TBufferedTransport): read = 30925 msec +RunTestAsync(TBinaryProtocol + TFramedTransport): write = 2042 msec +RunTestAsync(TBinaryProtocol + TFramedTransport): read = 5726 msec +RunTestAsync(TCompactProtocol + TFramedTransport): write = 1480 msec +RunTestAsync(TCompactProtocol + TFramedTransport): read = 4818 msec +RunTestAsync(TJsonProtocol + TFramedTransport): write = 8612 msec +RunTestAsync(TJsonProtocol + TFramedTransport): read = 30810 msec diff --git a/test/netstd/ThriftTest.sln b/test/netstd/ThriftTest.sln index 7e101d9e0e1..67cf458cb0f 100644 --- a/test/netstd/ThriftTest.sln +++ b/test/netstd/ThriftTest.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30104.148 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift", "..\..\lib\netstd\Thrift\Thrift.csproj", "{C20EA2A9-7660-47DE-9A49-D1EF12FB2895}" EndProject @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Tests", "..\..\lib\n EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Benchmarks", "..\..\lib\netstd\Benchmarks\Thrift.Benchmarks\Thrift.Benchmarks.csproj", "{66946544-8DE7-45E9-8D0E-93EADA028D44}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Interfaces", "..\..\tutorial\netstd\Interfaces\Interfaces.csproj", "{A360CB0A-7EBF-460C-AF10-3048DC205215}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -111,6 +113,18 @@ Global {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x64.Build.0 = Release|Any CPU {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.ActiveCfg = Release|Any CPU {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.Build.0 = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x64.ActiveCfg = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x64.Build.0 = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x86.ActiveCfg = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x86.Build.0 = Debug|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|Any CPU.Build.0 = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x64.ActiveCfg = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x64.Build.0 = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x86.ActiveCfg = Release|Any CPU + {A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE