Unverified Commit fb27ff31 authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #310 from knowledge4igor/code_improvements_3

Code improvements
parents 447cedbe e7917e04
......@@ -67,10 +67,9 @@ private:
throw std::runtime_error("Must call setHandler() prior to serve()");
listener.setHandler(handler_);
listener.bind();
if (listener.bind()) {
CALL_MEMBER_FN(listener, method)();
}
CALL_MEMBER_FN(listener, method)();
#undef CALL_MEMBER_FN
}
......
......@@ -31,7 +31,7 @@ class Listener {
public:
struct Load {
typedef std::chrono::system_clock::time_point TimePoint;
using TimePoint = std::chrono::system_clock::time_point;
double global;
std::vector<double> workers;
......@@ -49,8 +49,8 @@ public:
int backlog = Const::MaxBacklog);
void setHandler(const std::shared_ptr<Handler>& handler);
bool bind();
bool bind(const Address& adress);
void bind();
void bind(const Address& address);
bool isBound() const;
......
......@@ -150,12 +150,12 @@ Listener::pinWorker(size_t worker, const CpuSet& set)
#endif
}
bool
void
Listener::bind() {
return bind(addr_);
bind(addr_);
}
bool
void
Listener::bind(const Address& address) {
if (!handler_)
throw std::runtime_error("Call setHandler before calling bind()");
......@@ -201,12 +201,10 @@ Listener::bind(const Address& address) {
listen_fd = fd;
g_listen_fd = fd;
transport_.reset(new Transport(handler_));
transport_ = std::make_shared<Transport>(handler_);
reactor_.init(Aio::AsyncContext(workers_));
transportKey = reactor_.addHandler(transport_);
return true;
}
bool
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment