BIND 10 trac826, updated. 39670a9a69f67847fb4e2b33866a1e15374f9288 [trac826] add libbench & co (src/lib fully ported?)
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 5 15:04:09 UTC 2011
The branch, trac826 has been updated
via 39670a9a69f67847fb4e2b33866a1e15374f9288 (commit)
from bb716290447c9f45ecb29dd979ce114669a1c65f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 39670a9a69f67847fb4e2b33866a1e15374f9288
Author: Francis Dupont <fdupont at isc.org>
Date: Thu May 5 17:03:11 2011 +0200
[trac826] add libbench & co (src/lib fully ported?)
-----------------------------------------------------------------------
Summary of changes:
src/lib/bench/benchmark.h | 23 ++++++++++
src/lib/bench/benchmark_util.cc | 3 +
src/lib/bench/example/search_bench.cc | 9 ++++
src/lib/bench/tests/benchmark_unittest.cc | 21 +++++++++
src/lib/bench/tests/loadquery_unittest.cc | 4 ++
src/lib/dns/benchmarks/rdatarender_bench.cc | 7 +++
win32build/VS2008/bind10.sln | 47 +++++++++++++++++++-
.../libbench.vcproj} | 16 +++---
.../libbench_example.vcproj} | 24 +++++-----
.../libbench_tests.vcproj} | 28 ++++++-----
.../libdns++_benchmarks.vcproj} | 26 +++++------
win32build/VS2010/bind10.sln | 47 +++++++++++++++++++-
.../libbench.vcxproj} | 13 +++---
.../libbench.vcxproj.filters} | 6 +-
.../libbench.vcxproj.user} | 0
.../libbench_example.vcxproj} | 30 ++++++------
.../libbench_example.vcxproj.filters} | 14 +++---
.../libbench_example.vcxproj.user} | 0
.../libbench_tests.vcxproj} | 23 +++++-----
.../libbench_tests.vcxproj.filters} | 7 ++-
.../libbench_tests.vcxproj.user} | 0
.../libdns++_benchmarks.vcxproj} | 30 ++++++------
.../libdns++_benchmarks.vcxproj.filters} | 14 +++---
.../libdns++_benchmarks.vcxproj.user} | 0
win32build/config.h | 1 -
25 files changed, 277 insertions(+), 116 deletions(-)
delete mode 100644 src/lib/bench/NO_PORT_ON_WINDOWS
copy win32build/VS2008/{libutil_unittests/libutil_unittests.vcproj => libbench/libbench.vcproj} (82%)
copy win32build/VS2008/{liblog_compiler/liblog_compiler.vcproj => libbench_example/libbench_example.vcproj} (79%)
copy win32build/VS2008/{libcryptolink_tests/libcryptolink_tests.vcproj => libbench_tests/libbench_tests.vcproj} (76%)
copy win32build/VS2008/{liblog_compiler/liblog_compiler.vcproj => libdns++_benchmarks/libdns++_benchmarks.vcproj} (77%)
copy win32build/VS2010/{libexceptions/libexceptions.vcxproj => libbench/libbench.vcxproj} (84%)
copy win32build/VS2010/{libutil_unittests/libutil_unittests.vcxproj.filters => libbench/libbench.vcxproj.filters} (80%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libbench/libbench.vcxproj.user} (100%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj => libbench_example/libbench_example.vcxproj} (75%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj.filters => libbench_example/libbench_example.vcxproj.filters} (90%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libbench_example/libbench_example.vcxproj.user} (100%)
copy win32build/VS2010/{libcryptolink_tests/libcryptolink_tests.vcxproj => libbench_tests/libbench_tests.vcxproj} (74%)
copy win32build/VS2010/{libcc_tests/libcc_tests.vcxproj.filters => libbench_tests/libbench_tests.vcxproj.filters} (74%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libbench_tests/libbench_tests.vcxproj.user} (100%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj => libdns++_benchmarks/libdns++_benchmarks.vcxproj} (73%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj.filters => libdns++_benchmarks/libdns++_benchmarks.vcxproj.filters} (90%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libdns++_benchmarks/libdns++_benchmarks.vcxproj.user} (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/bench/NO_PORT_ON_WINDOWS b/src/lib/bench/NO_PORT_ON_WINDOWS
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/bench/benchmark.h b/src/lib/bench/benchmark.h
index f9a7aac..7ac52ad 100644
--- a/src/lib/bench/benchmark.h
+++ b/src/lib/bench/benchmark.h
@@ -17,6 +17,7 @@
#ifdef _WIN32
#include <time.h>
+#define gettimeofday(tv, tz) win32_gettimeofday(tv)
#else
#include <sys/time.h>
#endif
@@ -27,6 +28,28 @@
namespace isc {
namespace bench {
+#ifdef _WIN32
+static void
+win32_gettimeofday(struct timeval *tv)
+{
+ SYSTEMTIME epoch = { 1970, 1, 4, 1, 0, 0, 0, 0 };
+ FILETIME temp;
+ SystemTimeToFileTime(&epoch, &temp);
+ ULARGE_INTEGER t;
+ t.LowPart = temp.dwLowDateTime;
+ t.HighPart = temp.dwHighDateTime;
+ FILETIME now;
+ GetSystemTimeAsFileTime(&now);
+ ULARGE_INTEGER n;
+ n.LowPart = now.dwLowDateTime;
+ n.HighPart = now.dwHighDateTime;
+ n.QuadPart -= t.QuadPart;
+ tv->tv_sec = (long) (n.QuadPart / 10000000);
+ n.QuadPart -= tv->tv_sec * 10000000;
+ tv->tv_usec = (long) (n.QuadPart / 10);
+}
+#endif
+
/// \brief Templated micro benchmark framework.
///
/// "Premature optimization is the root of all evil."
diff --git a/src/lib/bench/benchmark_util.cc b/src/lib/bench/benchmark_util.cc
index c67a851..cd7ddad 100644
--- a/src/lib/bench/benchmark_util.cc
+++ b/src/lib/bench/benchmark_util.cc
@@ -104,6 +104,9 @@ loadQueryData(istream& input, BenchQueries& queries, const RRClass& qclass,
buffer.getLength());
queries.push_back(query_data);
} catch (const Exception& error) {
+#ifdef _MSC_VER
+ error;
+#endif
if (strict) {
isc_throw(BenchMarkError,
"failed to parse/create query around line " <<
diff --git a/src/lib/bench/example/search_bench.cc b/src/lib/bench/example/search_bench.cc
index 851d815..117a5d9 100644
--- a/src/lib/bench/example/search_bench.cc
+++ b/src/lib/bench/example/search_bench.cc
@@ -12,7 +12,16 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
+#ifdef _WIN32
+#include <getopt.h>
+#include <winsock2.h> // for timeval
+#include <process.h> // for getpid
+#define getpid _getpid
+#else
#include <unistd.h> // for getpid
+#endif
#include <cassert>
#include <cstdlib> // for rand
diff --git a/src/lib/bench/tests/benchmark_unittest.cc b/src/lib/bench/tests/benchmark_unittest.cc
index 7bb8a60..7a26830 100644
--- a/src/lib/bench/tests/benchmark_unittest.cc
+++ b/src/lib/bench/tests/benchmark_unittest.cc
@@ -12,8 +12,18 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
#include <time.h> // for nanosleep
+#ifdef _WIN32
+#include <winsock2.h>
+
+struct timespec {
+ DWORD tv_sec; // seconds (was time_t)
+ long tv_nsec; // nanoseconds
+};
+#endif
+
#include <bench/benchmark.h>
#include <gtest/gtest.h>
@@ -32,13 +42,20 @@ public:
setup_completed_(false), teardown_completed_(false)
{}
unsigned int run() {
+#ifdef _WIN32
+ Sleep((sleep_time_.tv_sec * 1000) + (sleep_time_.tv_nsec / 1000));
+#else
nanosleep(&sleep_time_, NULL);
+#endif
return (sub_iterations_);
}
const int sub_iterations_;
const struct timespec sleep_time_;
bool setup_completed_;
bool teardown_completed_;
+private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ TestBenchMark& operator=(TestBenchMark const&);
};
}
@@ -82,7 +99,11 @@ TEST(BenchMarkTest, run) {
// risk of overlooking possible bugs.
struct timeval check_begin, check_end;
gettimeofday(&check_begin, NULL);
+#ifdef _WIN32
+ Sleep((sleep_timespec.tv_sec * 1000) + (sleep_timespec.tv_nsec / 1000));
+#else
nanosleep(&sleep_timespec, 0);
+#endif
gettimeofday(&check_end, NULL);
check_end.tv_sec -= check_begin.tv_sec;
if (check_end.tv_usec >= check_begin.tv_usec) {
diff --git a/src/lib/bench/tests/loadquery_unittest.cc b/src/lib/bench/tests/loadquery_unittest.cc
index 93130d2..c6380c2 100644
--- a/src/lib/bench/tests/loadquery_unittest.cc
+++ b/src/lib/bench/tests/loadquery_unittest.cc
@@ -61,6 +61,8 @@ public:
}
private:
stringstream& stream_;
+ // silence MSVC warning C4512: assignment operator could not be generated
+ QueryInserter& operator=(QueryInserter const&);
};
class QueryChecker {
@@ -103,6 +105,8 @@ private:
const vector<QueryParam>* expected_;
vector<QueryParam>::const_iterator iter_;
const RRClass rrclass_;
+ // silence MSVC warning C4512: assignment operator could not be generated
+ QueryChecker& operator=(QueryChecker const&);
};
TEST_F(LoadQueryTest, load) {
diff --git a/src/lib/dns/benchmarks/rdatarender_bench.cc b/src/lib/dns/benchmarks/rdatarender_bench.cc
index d1fb0f2..ffe1c87 100644
--- a/src/lib/dns/benchmarks/rdatarender_bench.cc
+++ b/src/lib/dns/benchmarks/rdatarender_bench.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <iostream>
#include <fstream>
#include <string>
@@ -19,6 +21,11 @@
#include <boost/shared_ptr.hpp>
+#ifdef _WIN32
+#include <getopt.h>
+#include <winsock2.h>
+#endif
+
#include <bench/benchmark.h>
#include <util/buffer.h>
diff --git a/win32build/VS2008/bind10.sln b/win32build/VS2008/bind10.sln
index 9259fe1..cc80652 100755
--- a/win32build/VS2008/bind10.sln
+++ b/win32build/VS2008/bind10.sln
@@ -20,21 +20,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
{0131E967-F93E-4E63-9561-47C94411FBEC} = {0131E967-F93E-4E63-9561-47C94411FBEC}
{CF7DB86A-D67D-4829-B63A-598E5BFC81BC} = {CF7DB86A-D67D-4829-B63A-598E5BFC81BC}
+ {42347681-5872-4D67-9E6B-CD0AA822DEE4} = {42347681-5872-4D67-9E6B-CD0AA822DEE4}
{C49C6288-0381-4F7F-AD11-6E122095A876} = {C49C6288-0381-4F7F-AD11-6E122095A876}
{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
{B18D03AA-EC46-4AAD-90BA-A6ED843DB7FB} = {B18D03AA-EC46-4AAD-90BA-A6ED843DB7FB}
{93F88AB1-78D9-41B1-A534-66D64D4B5C54} = {93F88AB1-78D9-41B1-A534-66D64D4B5C54}
+ {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA} = {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}
{07413DBE-6012-422E-8531-2F7579C2C800} = {07413DBE-6012-422E-8531-2F7579C2C800}
{2BE3E9BE-0536-42F4-8932-827C6C172109} = {2BE3E9BE-0536-42F4-8932-827C6C172109}
{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
{38F600CA-1FAF-4BF2-A4D5-B82569C156BC} = {38F600CA-1FAF-4BF2-A4D5-B82569C156BC}
{AB83FDCD-7D87-4866-A490-75DFAB68B361} = {AB83FDCD-7D87-4866-A490-75DFAB68B361}
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
{AA3B87DA-D863-46D6-9B6C-CFEC091BAC10} = {AA3B87DA-D863-46D6-9B6C-CFEC091BAC10}
{F25691DE-F8D2-4CFC-8053-67539BD53AD4} = {F25691DE-F8D2-4CFC-8053-67539BD53AD4}
{965D13E1-0E6C-46BF-AFDB-ABFBAFFAA2F4} = {965D13E1-0E6C-46BF-AFDB-ABFBAFFAA2F4}
{99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
{593ECCEC-BB6C-449A-911A-6214460AE993} = {593ECCEC-BB6C-449A-911A-6214460AE993}
+ {5E884AFC-FB00-4045-A339-113F36D12C86} = {5E884AFC-FB00-4045-A339-113F36D12C86}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexceptions", "libexceptions\libexceptions.vcproj", "{1D545AC8-59EA-48C7-A006-C92F0C19633C}"
@@ -114,7 +118,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfgclient_tests", "libcf
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog", "liblog\liblog.vcproj", "{9494C92C-AF42-4897-B488-B5B416C2D392}"
ProjectSection(ProjectDependencies) = postProject
- {99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_tests", "liblog_tests\liblog_tests.vcproj", "{9437FF4D-3CCE-45F1-A248-6B713FBF0A5D}"
@@ -240,6 +244,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libserver_common_tests", "l
{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench", "libbench\libbench.vcproj", "{490FACD4-B54B-40A7-A39F-2EB60B307CEC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {99678BE6-B8EB-4740-9E67-C90C84158785} = {99678BE6-B8EB-4740-9E67-C90C84158785}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench_tests", "libbench_tests\libbench_tests.vcproj", "{42347681-5872-4D67-9E6B-CD0AA822DEE4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+ {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+ {1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC} = {490FACD4-B54B-40A7-A39F-2EB60B307CEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench_example", "libbench_example\libbench_example.vcproj", "{5E884AFC-FB00-4045-A339-113F36D12C86}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_benchmarks", "libdns++_benchmarks\libdns++_benchmarks.vcproj", "{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
+ {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+ {1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -378,6 +407,22 @@ Global
{AA3B87DA-D863-46D6-9B6C-CFEC091BAC10}.Debug|Win32.Build.0 = Debug|Win32
{AA3B87DA-D863-46D6-9B6C-CFEC091BAC10}.Release|Win32.ActiveCfg = Release|Win32
{AA3B87DA-D863-46D6-9B6C-CFEC091BAC10}.Release|Win32.Build.0 = Release|Win32
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC}.Debug|Win32.Build.0 = Debug|Win32
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC}.Release|Win32.ActiveCfg = Release|Win32
+ {490FACD4-B54B-40A7-A39F-2EB60B307CEC}.Release|Win32.Build.0 = Release|Win32
+ {42347681-5872-4D67-9E6B-CD0AA822DEE4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {42347681-5872-4D67-9E6B-CD0AA822DEE4}.Debug|Win32.Build.0 = Debug|Win32
+ {42347681-5872-4D67-9E6B-CD0AA822DEE4}.Release|Win32.ActiveCfg = Release|Win32
+ {42347681-5872-4D67-9E6B-CD0AA822DEE4}.Release|Win32.Build.0 = Release|Win32
+ {5E884AFC-FB00-4045-A339-113F36D12C86}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5E884AFC-FB00-4045-A339-113F36D12C86}.Debug|Win32.Build.0 = Debug|Win32
+ {5E884AFC-FB00-4045-A339-113F36D12C86}.Release|Win32.ActiveCfg = Release|Win32
+ {5E884AFC-FB00-4045-A339-113F36D12C86}.Release|Win32.Build.0 = Release|Win32
+ {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Debug|Win32.Build.0 = Debug|Win32
+ {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.ActiveCfg = Release|Win32
+ {9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2008/libbench/libbench.vcproj b/win32build/VS2008/libbench/libbench.vcproj
new file mode 100755
index 0000000..caec83c
--- /dev/null
+++ b/win32build/VS2008/libbench/libbench.vcproj
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libbench"
+ ProjectGUID="{490FACD4-B54B-40A7-A39F-2EB60B307CEC}"
+ RootNamespace="libbench"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\bench\benchmark_util.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\bench\benchmark.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\bench\benchmark_util.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libbench_example/libbench_example.vcproj b/win32build/VS2008/libbench_example/libbench_example.vcproj
new file mode 100755
index 0000000..ee0b41b
--- /dev/null
+++ b/win32build/VS2008/libbench_example/libbench_example.vcproj
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libbench_example"
+ ProjectGUID="{5E884AFC-FB00-4045-A339-113F36D12C86}"
+ RootNamespace="libbench_example"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libexceptions.lib"
+ OutputFile="$(OutDir)\search_bench.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\libexceptions\Debug"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libexceptions.lib"
+ OutputFile="$(OutDir)\search_bench.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\libexceptions\Release"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\getopt.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\bench\example\search_bench.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\getopt.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libbench_tests/libbench_tests.vcproj b/win32build/VS2008/libbench_tests/libbench_tests.vcproj
new file mode 100755
index 0000000..3b6e2f2
--- /dev/null
+++ b/win32build/VS2008/libbench_tests/libbench_tests.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libbench_tests"
+ ProjectGUID="{42347681-5872-4D67-9E6B-CD0AA822DEE4}"
+ RootNamespace="libbench_tests"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata\""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libbench.lib gtestd.lib ws2_32.lib"
+ OutputFile="$(OutDir)\run_unittests.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug";..\libbench\Debug;..\..\..\..\gtest\md9\Debug"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="TEST_DATA_DIR=\"c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata\""
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib libbench.lib gtest.lib ws2_32.lib"
+ OutputFile="$(OutDir)\run_unittests.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release";..\libbench\Release;..\..\..\..\gtest\md9\Release"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\bench\tests\benchmark_unittest.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\bench\tests\loadquery_unittest.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\bench\tests\run_unittests.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj b/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj
new file mode 100755
index 0000000..5ac286a
--- /dev/null
+++ b/win32build/VS2008/libdns++_benchmarks/libdns++_benchmarks.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libdns++_benchmarks"
+ ProjectGUID="{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}"
+ RootNamespace="libdns_benchmarks"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib ws2_32.lib"
+ OutputFile="$(OutDir)\rdatarender_bench.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\libexceptions\Debug;..\libutil\Debug;"..\libdns++\Debug""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;"C:\Program Files\boost\boost_1_44""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libdns++.lib ws2_32.lib"
+ OutputFile="$(OutDir)\rdatarender_bench.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\libexceptions\Release;..\libutil\Release;"..\libdns++\Release""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\getopt.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\dns\benchmarks\rdatarender_bench.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\getopt.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 6aa586e..6db7a90 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -18,17 +18,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
{55BCB364-62B0-4F93-8B88-38F3349B22C8} = {55BCB364-62B0-4F93-8B88-38F3349B22C8}
{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
{8412D26C-6C2B-4FCC-ABB4-E9509E833951} = {8412D26C-6C2B-4FCC-ABB4-E9509E833951}
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2} = {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}
{2C518972-FF5F-4D33-9D3E-5BCC6357EDD7} = {2C518972-FF5F-4D33-9D3E-5BCC6357EDD7}
{F8616086-9CE9-4F32-BC97-8494EADAEC6F} = {F8616086-9CE9-4F32-BC97-8494EADAEC6F}
+ {6280D58A-5E05-45D1-8B79-DF677C114CD4} = {6280D58A-5E05-45D1-8B79-DF677C114CD4}
{6AC4F7A4-9BDC-415F-81DB-6332CACA38B3} = {6AC4F7A4-9BDC-415F-81DB-6332CACA38B3}
{B5D971AD-D95B-4A15-9E31-38AEF4F69627} = {B5D971AD-D95B-4A15-9E31-38AEF4F69627}
{13D541BC-8365-42F7-840F-A117CA0413DD} = {13D541BC-8365-42F7-840F-A117CA0413DD}
{813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
+ {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D} = {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}
{2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4} = {2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4}
{65B0B6D2-94CE-4A21-85E7-A047C79044F9} = {65B0B6D2-94CE-4A21-85E7-A047C79044F9}
{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
{7EB244E7-D381-4CF4-A2D4-739B81F77588} = {7EB244E7-D381-4CF4-A2D4-739B81F77588}
{66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF} = {66C9A5EC-514B-4BDC-AC74-ED4CB465CAAF}
+ {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE} = {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}
{9C5774EF-E833-4150-8B7A-B6082D879775} = {9C5774EF-E833-4150-8B7A-B6082D879775}
{7B80F6F0-E0CD-40D3-87B7-95C2EA2581BA} = {7B80F6F0-E0CD-40D3-87B7-95C2EA2581BA}
{CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
@@ -117,7 +121,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfgclient_tests", "libcf
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog", "liblog\liblog.vcxproj", "{AEF3DFFE-B566-4E6A-B299-B59B81022C06}"
ProjectSection(ProjectDependencies) = postProject
- {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2} = {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_tests", "liblog_tests\liblog_tests.vcxproj", "{9F69DE07-D285-4B5C-8528-DF975C59ED3B}"
@@ -234,6 +238,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libserver_common", "libserv
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libserver_common_tests", "libserver_common_tests\libserver_common_tests.vcxproj", "{D09B618B-D0E4-468D-A4BD-E204B4344C18}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench", "libbench\libbench.vcxproj", "{DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench_tests", "libbench_tests\libbench_tests.vcxproj", "{FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+ {8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2} = {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}
+ {F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbench_example", "libbench_example\libbench_example.vcxproj", "{6280D58A-5E05-45D1-8B79-DF677C114CD4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_benchmarks", "libdns++_benchmarks\libdns++_benchmarks.vcxproj", "{C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+ {8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+ {F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -372,6 +401,22 @@ Global
{D09B618B-D0E4-468D-A4BD-E204B4344C18}.Debug|Win32.Build.0 = Debug|Win32
{D09B618B-D0E4-468D-A4BD-E204B4344C18}.Release|Win32.ActiveCfg = Release|Win32
{D09B618B-D0E4-468D-A4BD-E204B4344C18}.Release|Win32.Build.0 = Release|Win32
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}.Debug|Win32.Build.0 = Debug|Win32
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}.Release|Win32.ActiveCfg = Release|Win32
+ {DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}.Release|Win32.Build.0 = Release|Win32
+ {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}.Debug|Win32.Build.0 = Debug|Win32
+ {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}.Release|Win32.ActiveCfg = Release|Win32
+ {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}.Release|Win32.Build.0 = Release|Win32
+ {6280D58A-5E05-45D1-8B79-DF677C114CD4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6280D58A-5E05-45D1-8B79-DF677C114CD4}.Debug|Win32.Build.0 = Debug|Win32
+ {6280D58A-5E05-45D1-8B79-DF677C114CD4}.Release|Win32.ActiveCfg = Release|Win32
+ {6280D58A-5E05-45D1-8B79-DF677C114CD4}.Release|Win32.Build.0 = Release|Win32
+ {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Debug|Win32.Build.0 = Debug|Win32
+ {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Release|Win32.ActiveCfg = Release|Win32
+ {C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2010/libbench/libbench.vcxproj b/win32build/VS2010/libbench/libbench.vcxproj
new file mode 100755
index 0000000..5ec75d7
--- /dev/null
+++ b/win32build/VS2010/libbench/libbench.vcxproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\bench\benchmark.h" />
+ <ClInclude Include="..\..\..\src\lib\bench\benchmark_util.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\bench\benchmark_util.cc" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{DC86E86E-BB80-4C93-8A1F-E409C1FA38D2}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libbench</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench/libbench.vcxproj.filters b/win32build/VS2010/libbench/libbench.vcxproj.filters
new file mode 100755
index 0000000..67b195d
--- /dev/null
+++ b/win32build/VS2010/libbench/libbench.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\bench\benchmark.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\bench\benchmark_util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\bench\benchmark_util.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench/libbench.vcxproj.user b/win32build/VS2010/libbench/libbench.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libbench/libbench.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_example/libbench_example.vcxproj b/win32build/VS2010/libbench_example/libbench_example.vcxproj
new file mode 100755
index 0000000..54f0656
--- /dev/null
+++ b/win32build/VS2010/libbench_example/libbench_example.vcxproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{6280D58A-5E05-45D1-8B79-DF677C114CD4}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libbench_example</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>search_bench</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>search_bench</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libexceptions.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)search_bench$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\libexceptions\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libexceptions.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)search_bench$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\libexceptions\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\getopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\bench\example\search_bench.cc" />
+ <ClCompile Include="..\..\getopt.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_example/libbench_example.vcxproj.filters b/win32build/VS2010/libbench_example/libbench_example.vcxproj.filters
new file mode 100755
index 0000000..44f72e6
--- /dev/null
+++ b/win32build/VS2010/libbench_example/libbench_example.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\getopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\bench\example\search_bench.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_example/libbench_example.vcxproj.user b/win32build/VS2010/libbench_example/libbench_example.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libbench_example/libbench_example.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_tests/libbench_tests.vcxproj b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj
new file mode 100755
index 0000000..8dfd308
--- /dev/null
+++ b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libbench_tests</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libdns++.lib;libbench.lib;gtestd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libexceptions\Debug;..\libutil\Debug;..\libdns++\Debug;..\libbench\Debug;..\..\..\..\gtest\md10\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libdns++.lib;libbench.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libexceptions\Release;..\libutil\Release;..\libdns++\Release;..\libbench\Release;..\..\..\..\gtest\md10\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\bench\tests\benchmark_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\bench\tests\loadquery_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\bench\tests\run_unittests.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.filters b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.filters
new file mode 100755
index 0000000..262b326
--- /dev/null
+++ b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\bench\tests\benchmark_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\bench\tests\loadquery_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\bench\tests\run_unittests.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.user b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj
new file mode 100755
index 0000000..e89c584
--- /dev/null
+++ b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libdns_benchmarks</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>rdatarender_bench</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>rdatarender_bench</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OutputFile>$(OutDir)rdatarender_bench$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libdns++.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libexceptions\Debug;..\libutil\Debug;..\libdns++\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)rdatarender_bench$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libdns++.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libexceptions\Release;..\libutil\Release;..\libdns++\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\getopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\dns\benchmarks\rdatarender_bench.cc" />
+ <ClCompile Include="..\..\getopt.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.filters b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.filters
new file mode 100755
index 0000000..aaa5ae7
--- /dev/null
+++ b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\getopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\dns\benchmarks\rdatarender_bench.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.user b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libdns++_benchmarks/libdns++_benchmarks.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/config.h b/win32build/config.h
index ce23ee2..81246f6 100644
--- a/win32build/config.h
+++ b/win32build/config.h
@@ -46,7 +46,6 @@
#define strncasecmp _strnicmp
#define unlink _unlink
-#define getpid _getpid
#define srandom srand
#define random() rand()
typedef unsigned int uid_t;
More information about the bind10-changes
mailing list