|
@@ -76,8 +76,8 @@ private:
|
|
|
typedef boost::shared_ptr<const IOEndpoint> IOEndpointPtr;
|
|
|
protected:
|
|
|
QueryBenchMark(const bool enable_cache,
|
|
|
- const BenchQueries& queries, MessagePtr query_message,
|
|
|
- OutputBufferPtr buffer) :
|
|
|
+ const BenchQueries& queries, Message& query_message,
|
|
|
+ OutputBuffer& buffer) :
|
|
|
server_(new AuthSrv(enable_cache, xfrout_client)),
|
|
|
queries_(queries),
|
|
|
query_message_(query_message),
|
|
@@ -95,9 +95,9 @@ public:
|
|
|
for (query = queries_.begin(); query != query_end; ++query) {
|
|
|
IOMessage io_message(&(*query)[0], (*query).size(), dummy_socket,
|
|
|
*dummy_endpoint);
|
|
|
- query_message_->clear(Message::PARSE);
|
|
|
- buffer_->clear();
|
|
|
- server_->processMessage(io_message, *query_message_, *buffer_,
|
|
|
+ query_message_.clear(Message::PARSE);
|
|
|
+ buffer_.clear();
|
|
|
+ server_->processMessage(io_message, query_message_, buffer_,
|
|
|
&server);
|
|
|
}
|
|
|
|
|
@@ -107,8 +107,8 @@ protected:
|
|
|
AuthSrvPtr server_;
|
|
|
private:
|
|
|
const BenchQueries& queries_;
|
|
|
- MessagePtr query_message_;
|
|
|
- OutputBufferPtr buffer_;
|
|
|
+ Message& query_message_;
|
|
|
+ OutputBuffer& buffer_;
|
|
|
IOSocket& dummy_socket;
|
|
|
IOEndpointPtr dummy_endpoint;
|
|
|
};
|
|
@@ -118,8 +118,8 @@ public:
|
|
|
Sqlite3QueryBenchMark(const int cache_slots,
|
|
|
const char* const datasrc_file,
|
|
|
const BenchQueries& queries,
|
|
|
- MessagePtr query_message,
|
|
|
- OutputBufferPtr buffer) :
|
|
|
+ Message& query_message,
|
|
|
+ OutputBuffer& buffer) :
|
|
|
QueryBenchMark(cache_slots >= 0 ? true : false, queries,
|
|
|
query_message, buffer)
|
|
|
{
|
|
@@ -136,8 +136,8 @@ public:
|
|
|
MemoryQueryBenchMark(const char* const zone_file,
|
|
|
const char* const zone_origin,
|
|
|
const BenchQueries& queries,
|
|
|
- MessagePtr query_message,
|
|
|
- OutputBufferPtr buffer) :
|
|
|
+ Message& query_message,
|
|
|
+ OutputBuffer& buffer) :
|
|
|
QueryBenchMark(false, queries, query_message, buffer)
|
|
|
{
|
|
|
configureAuthServer(*server_,
|
|
@@ -255,8 +255,8 @@ main(int argc, char* argv[]) {
|
|
|
|
|
|
BenchQueries queries;
|
|
|
loadQueryData(query_data_file, queries, RRClass::IN());
|
|
|
- OutputBufferPtr buffer(new OutputBuffer(4096));
|
|
|
- MessagePtr message(new Message(Message::PARSE));
|
|
|
+ OutputBuffer buffer(4096);
|
|
|
+ Message message(Message::PARSE);
|
|
|
|
|
|
cout << "Parameters:" << endl;
|
|
|
cout << " Iterations: " << iteration << endl;
|