oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Listen: pass EventLoop to listen_global_init()

Browse Source 
Don't use global variables.
This commit is contained in:
Max Kellermann 2014-01-29 18:32:28 +01:00
parent a137f817f5
commit aeaf64b467
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Listen.cxx
View File

@ -44,12 +44,12 @@ static constexpr Domain listen_domain("listen");
class ClientListener final : public ServerSocket { class ClientListener final : public ServerSocket {
public: public:
ClientListener():ServerSocket(*main_loop) {} ClientListener(EventLoop &_loop):ServerSocket(_loop) {}
private: private:
virtual void OnAccept(int fd, const sockaddr &address, virtual void OnAccept(int fd, const sockaddr &address,
size_t address_length, int uid) { size_t address_length, int uid) {
client_new(*main_loop, *instance->partition, client_new(GetEventLoop(), *instance->partition,
fd, &address, address_length, uid); fd, &address, address_length, uid);
} }
}; };
@ -101,16 +101,14 @@ listen_systemd_activation(Error &error_r)
} }
bool bool
listen_global_init(Error &error) listen_global_init(EventLoop &loop, Error &error)
{ {
assert(main_loop != nullptr);
int port = config_get_positive(CONF_PORT, DEFAULT_PORT); int port = config_get_positive(CONF_PORT, DEFAULT_PORT);
const struct config_param *param = const struct config_param *param =
config_get_next_param(CONF_BIND_TO_ADDRESS, nullptr); config_get_next_param(CONF_BIND_TO_ADDRESS, nullptr);
bool success; bool success;
listen_socket = new ClientListener(); listen_socket = new ClientListener(loop);
if (listen_systemd_activation(error)) if (listen_systemd_activation(error))
return true; return true;

3
src/Listen.hxx
View File

@ -20,12 +20,13 @@
#ifndef MPD_LISTEN_HXX #ifndef MPD_LISTEN_HXX
#define MPD_LISTEN_HXX #define MPD_LISTEN_HXX
class EventLoop;
class Error; class Error;
extern int listen_port; extern int listen_port;
bool bool
listen_global_init(Error &error); listen_global_init(EventLoop &loop, Error &error);
void listen_global_finish(void); void listen_global_finish(void);

2
src/Main.cxx
View File

@ -413,7 +413,7 @@ int mpd_main(int argc, char *argv[])
const unsigned max_clients = config_get_positive(CONF_MAX_CONN, 10); const unsigned max_clients = config_get_positive(CONF_MAX_CONN, 10);
instance->client_list = new ClientList(max_clients); instance->client_list = new ClientList(max_clients);
if (!listen_global_init(error)) { if (!listen_global_init(*main_loop, error)) {
LogError(error); LogError(error);
return EXIT_FAILURE; return EXIT_FAILURE;
} }