diff --git a/daemon/boardd/boardd.c b/daemon/boardd/boardd.c index 10318077d..e44a099dc 100644 --- a/daemon/boardd/boardd.c +++ b/daemon/boardd/boardd.c @@ -694,9 +694,9 @@ void session_create(struct event_base *base, evutil_socket_t fd, void setup_client(struct event_base *base, evutil_socket_t fd, - struct sockaddr *address, int socklen) + struct sockaddr *address, int socklen) { - session_create(base, fd, address, socklen); + session_start(base, fd, address, socklen); } void diff --git a/daemon/boardd/boardd.h b/daemon/boardd/boardd.h index 12a60e49f..91d362a99 100644 --- a/daemon/boardd/boardd.h +++ b/daemon/boardd/boardd.h @@ -3,8 +3,8 @@ int process_line(struct evbuffer *output, void *ctx, char *line); -void session_create(struct event_base *base, evutil_socket_t fd, - struct sockaddr *address, int socklen); +void session_start(struct event_base *base, evutil_socket_t fd, + struct sockaddr *address, int socklen); void session_init(); void session_shutdown(); diff --git a/daemon/boardd/session.cpp b/daemon/boardd/session.cpp index ce087641f..76a0103b2 100644 --- a/daemon/boardd/session.cpp +++ b/daemon/boardd/session.cpp @@ -42,22 +42,19 @@ class LineProcessJob static ThreadPool *g_threadpool; -static void -read_cb(struct bufferevent *bev, void *ctx) +static void read_cb(struct bufferevent *bev, void *ctx) { reinterpret_cast(ctx)->on_read(); } -static void -event_cb(struct bufferevent *bev, short events, void *ctx) +static void event_cb(struct bufferevent *bev, short events, void *ctx) { reinterpret_cast(ctx)->on_error(events); } } // namespace -void -session_init() +void session_init() { #ifdef BOARDD_MT fprintf(stderr, "boardd: built with mulit-threading, %d threads.\n", @@ -66,14 +63,13 @@ session_init() #endif } -void -session_shutdown() +void session_shutdown() { delete g_threadpool; } -void session_create(struct event_base *base, evutil_socket_t fd, - struct sockaddr *address, int socklen) +void session_start(struct event_base *base, evutil_socket_t fd, + struct sockaddr *address, int socklen) { new Session(process_line, base, fd, address, socklen); }