hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed quite a few issues in TcpServer

Browse Source
This commit is contained in:
hyung-hwan
2018-06-26 15:27:52 +00:00
parent d7bdc63690
commit b2f9abef77
4 changed files with 108 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qse/include/qse/si/TcpServer.hpp
View File

@ -43,7 +43,6 @@ class TcpServer: public Uncopyable, public Types
{ {
public: public:
TcpServer () QSE_CPP_NOEXCEPT; TcpServer () QSE_CPP_NOEXCEPT;
TcpServer (const SocketAddress& address) QSE_CPP_NOEXCEPT;
virtual ~TcpServer () QSE_CPP_NOEXCEPT; virtual ~TcpServer () QSE_CPP_NOEXCEPT;
enum enum
@ -55,8 +54,7 @@ public:
ERR_EXCEPTION = 4 ERR_EXCEPTION = 4
}; };
virtual int start (const qse_mchar_t* addrs) QSE_CPP_NOEXCEPT; virtual int start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT;
virtual int start (const qse_wchar_t* addrs) QSE_CPP_NOEXCEPT;
virtual int stop () QSE_CPP_NOEXCEPT; virtual int stop () QSE_CPP_NOEXCEPT;
ErrorCode getErrorCode () const QSE_CPP_NOEXCEPT { return this->errcode; } ErrorCode getErrorCode () const QSE_CPP_NOEXCEPT { return this->errcode; }
@ -76,16 +74,6 @@ public:
this->stop_requested = req; this->stop_requested = req;
} }
const SocketAddress& getBindingAddress () const QSE_CPP_NOEXCEPT
{
return this->binding_address;
}
void setBindingAddress (const SocketAddress& address) QSE_CPP_NOEXCEPT
{
QSE_ASSERT (this->server_serving == false);
this->binding_address = address;
}
qse_size_t getMaxConnections () const QSE_CPP_NOEXCEPT qse_size_t getMaxConnections () const QSE_CPP_NOEXCEPT
{ {
return this->max_connections; return this->max_connections;
@ -133,7 +121,7 @@ protected:
Client (TcpServer* server); Client (TcpServer* server);
int run (); int main ();
int stop () QSE_CPP_NOEXCEPT; int stop () QSE_CPP_NOEXCEPT;
private: private:
@ -160,7 +148,6 @@ protected:
} listener; } listener;
ErrorCode errcode; ErrorCode errcode;
SocketAddress binding_address;
bool stop_requested; bool stop_requested;
bool server_serving; bool server_serving;
qse_size_t max_connections; qse_size_t max_connections;

91
qse/lib/si/TcpServer.cpp
View File

@ -57,7 +57,7 @@ public:
Socket* psck; Socket* psck;
}; };
int TcpServer::Client::run () int TcpServer::Client::main ()
{ {
// blockAllSignals is called inside run because // blockAllSignals is called inside run because
// Client is instantiated in the TcpServer thread. // Client is instantiated in the TcpServer thread.
@ -95,15 +95,6 @@ TcpServer::TcpServer () QSE_CPP_NOEXCEPT:
{ {
} }
TcpServer::TcpServer (const SocketAddress& address) QSE_CPP_NOEXCEPT:
binding_address(address),
stop_requested(false),
server_serving(false),
max_connections(0),
thread_stack_size (0)
{
}
TcpServer::~TcpServer () QSE_CPP_NOEXCEPT TcpServer::~TcpServer () QSE_CPP_NOEXCEPT
{ {
// QSE_ASSERT (this->server_serving == false); // QSE_ASSERT (this->server_serving == false);
@ -174,7 +165,7 @@ int TcpServer::setup_listeners (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
QSE_MEMSET (&ev, 0, QSE_SIZEOF(ev)); QSE_MEMSET (&ev, 0, QSE_SIZEOF(ev));
ev.events = EPOLLIN | EPOLLHUP | EPOLLERR; ev.events = EPOLLIN | EPOLLHUP | EPOLLERR;
ev.data.fd = pfd[0]; ev.data.ptr = QSE_NULL;
if (::epoll_ctl(ep_fd, EPOLL_CTL_ADD, pfd[0], &ev) <= -1) if (::epoll_ctl(ep_fd, EPOLL_CTL_ADD, pfd[0], &ev) <= -1)
{ {
this->setErrorCode (syserr_to_errnum(errno)); this->setErrorCode (syserr_to_errnum(errno));
@ -208,7 +199,7 @@ int TcpServer::setup_listeners (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
goto next_segment; goto next_segment;
} }
if (lsck->open(sockaddr.getFamily(), QSE_SOCK_STREAM, Socket::T_CLOEXEC | Socket::T_NONBLOCK) <= -1) if (lsck->open(sockaddr.getFamily(), QSE_SOCK_STREAM, 0, Socket::T_CLOEXEC | Socket::T_NONBLOCK) <= -1)
{ {
/* TODO: logging */ /* TODO: logging */
goto next_segment; goto next_segment;
@ -226,7 +217,7 @@ int TcpServer::setup_listeners (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
QSE_MEMSET (&ev, 0, QSE_SIZEOF(ev)); QSE_MEMSET (&ev, 0, QSE_SIZEOF(ev));
ev.events = EPOLLIN | EPOLLHUP | EPOLLERR; ev.events = EPOLLIN | EPOLLHUP | EPOLLERR;
ev.data.fd = lsck->getHandle(); ev.data.ptr = lsck;
if (::epoll_ctl(ep_fd, EPOLL_CTL_ADD, lsck->getHandle(), &ev) <= -1) if (::epoll_ctl(ep_fd, EPOLL_CTL_ADD, lsck->getHandle(), &ev) <= -1)
{ {
/* TODO: logging */ /* TODO: logging */
@ -262,6 +253,9 @@ oops:
int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
{ {
struct epoll_event ev_buf[128];
int xret = 0;
this->server_serving = true; this->server_serving = true;
this->setStopRequested (false); this->setStopRequested (false);
@ -280,7 +274,40 @@ int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
while (!this->isStopRequested()) while (!this->isStopRequested())
{ {
int n;
n = ::epoll_wait (this->listener.ep_fd, ev_buf, QSE_COUNTOF(ev_buf), -1);
this->delete_dead_clients (); this->delete_dead_clients ();
if (n <= -1)
{
if (this->isStopRequested()) break;
if (errno == EINTR) continue;
this->setErrorCode (syserr_to_errnum(errno));
xret = -1;
break;
}
while (n > 0)
{
struct epoll_event* evp;
--n;
evp = &ev_buf[n];
if (!evp->events /*& (POLLIN | POLLHUP | POLLERR) */) continue;
if (evp->data.ptr == NULL)
{
char tmp[128];
while (::read(this->listener.mux_pipe[0], tmp, QSE_SIZEOF(tmp)) > 0) /* nothing */;
}
else
{
/* the reset should be the listener's socket */
Listener* lsck = (Listener*)evp->data.ptr;
if (this->max_connections > 0 && this->max_connections <= this->client_list.getSize()) if (this->max_connections > 0 && this->max_connections <= this->client_list.getSize())
{ {
@ -304,25 +331,27 @@ int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
// memory alloc failed. accept the connection and close it. // memory alloc failed. accept the connection and close it.
Socket s; Socket s;
SocketAddress sa; SocketAddress sa;
if (socket.accept(&s, &sa, Socket::T_CLOEXEC) >= 0) s.close(); if (lsck->accept(&s, &sa, Socket::T_CLOEXEC) >= 0) s.close();
continue; continue;
} }
if (socket.accept(&client->socket, &client->address, Socket::T_CLOEXEC) <= -1) if (lsck->accept(&client->socket, &client->address, Socket::T_CLOEXEC) <= -1)
{ {
// can't do much if accept fails if (this->isStopRequested()) break; /* normal termination requested */
// don't "delete client" here as i want it to be reused Socket::ErrorCode lerr = lsck->getErrorCode();
// in the next iteration after "continue" if (lerr == Socket::E_EINTR || lerr == Socket::E_EAGAIN) continue;
/* TODO: logging */
continue; this->setErrorCode (lerr);
xret = -1;
break;
} }
client->setStackSize (this->thread_stack_size); client->setStackSize (this->thread_stack_size);
#if defined(_WIN32) #if defined(_WIN32)
if (client->start(Thread::DETACHED) == -1) if (client->start(Thread::DETACHED) <= -1)
#else #else
if (client->start(0) == -1) if (client->start(0) <= -1)
#endif #endif
{ {
delete client; delete client;
@ -333,6 +362,8 @@ int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
this->client_list.append (client); this->client_list.append (client);
client = QSE_NULL; client = QSE_NULL;
} }
}
}
this->delete_all_clients (); this->delete_all_clients ();
if (client != QSE_NULL) delete client; if (client != QSE_NULL) delete client;
@ -345,18 +376,30 @@ int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
this->setErrorCode (E_EEXCEPT); this->setErrorCode (E_EEXCEPT);
this->server_serving = false; this->server_serving = false;
this->setStopRequested (false); this->setStopRequested (false);
this->free_all_listeners ();
return -1; return -1;
} }
this->server_serving = false; this->server_serving = false;
this->setStopRequested (false); this->setStopRequested (false);
return 0; this->free_all_listeners ();
return xret;
} }
int TcpServer::stop () QSE_CPP_NOEXCEPT int TcpServer::stop () QSE_CPP_NOEXCEPT
{ {
if (server_serving) setStopRequested (true); if (this->server_serving)
{
// TODO: mutex
if (this->listener.mux_pipe[1] >= 0)
{
::write (this->listener.mux_pipe[1], "Q", 1);
}
// TODO: mutex
this->setStopRequested (true);
}
return 0; return 0;
} }

8
qse/samples/si/tcpsvr01.cpp
View File

@ -20,6 +20,7 @@ class ClientHandler
public: public:
int operator() (QSE::Socket* sck, QSE::SocketAddress* addr) int operator() (QSE::Socket* sck, QSE::SocketAddress* addr)
{ {
qse_printf (QSE_T("XXXXXXXXXXXXXXXXXXXXXXXXXX\n"));p
return 0; return 0;
} }
}; };
@ -27,13 +28,8 @@ public:
static int test1 (void) static int test1 (void)
{ {
QSE::TcpServerF<ClientHandler> server; QSE::TcpServerF<ClientHandler> server;
QSE::SocketAddress addr;
addr.set ("0.0.0.0:9998");
server.setThreadStackSize (256000); server.setThreadStackSize (256000);
server.setBindingAddress (addr); server.start (QSE_T("0.0.0.0:9998"));
server.start ();
return 0; return 0;
} }