From: bert hubert Date: Thu, 28 May 2015 11:55:38 +0000 (+0200) Subject: Merge branch 'redistro' of github.com:ahupowerdns/pdns into redistro X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~79^2~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2550%2Fhead;p=thirdparty%2Fpdns.git Merge branch 'redistro' of github.com:ahupowerdns/pdns into redistro Conflicts: pdns/distributor.hh --- 2af8277d6a05e3120abaa2bc08ca97ea0dfc9941 diff --cc pdns/distributor.hh index b842bf9a3c,ba3ce0e248..f50e65fabf --- a/pdns/distributor.hh +++ b/pdns/distributor.hh @@@ -52,11 -61,16 +52,10 @@@ template &)) =0; //!< Submit a question to the Distributor - virtual void getQueueSizes(int &questions, int &answers) =0; //!< Returns length of question queue - - virtual int getNumBusy() =0; - + typedef std::function callback_t; + virtual int question(Question *, callback_t callback) =0; //!< Submit a question to the Distributor + virtual int getQueueSize() =0; //!< Returns length of question queue virtual bool isOverloaded() =0; -- -private: }; template class SingleThreadDistributor