[DEV] try implement poll interface
This commit is contained in:
parent
dd3db3eea6
commit
cb68691ca0
144
enet/Tcp.cpp
144
enet/Tcp.cpp
@ -196,18 +196,142 @@ int32_t enet::Tcp::read(void* _data, int32_t _maxLen) {
|
||||
ENET_ERROR("Can not read on unlink connection");
|
||||
return -1;
|
||||
}
|
||||
int32_t size = ::read(m_socketIdClient, _data, _maxLen);
|
||||
if ( size != 0
|
||||
&& errno == 2) {
|
||||
// simply the socket en empty
|
||||
} else if (errno != 0) {
|
||||
ENET_ERROR("PB when reading data on the FD : request=" << _maxLen << " have=" << size << ", erno=" << errno << "," << strerror(errno));
|
||||
m_status = status::error;
|
||||
return -1;
|
||||
}
|
||||
return size;
|
||||
#if 1
|
||||
int32_t size = ::read(m_socketIdClient, _data, _maxLen);
|
||||
if ( size != 0
|
||||
&& errno == 2) {
|
||||
// simply the socket en empty
|
||||
} else if (errno != 0) {
|
||||
ENET_ERROR("PB when reading data on the FD : request=" << _maxLen << " have=" << size << ", erno=" << errno << "," << strerror(errno));
|
||||
m_status = status::error;
|
||||
return -1;
|
||||
}
|
||||
return size;
|
||||
#else
|
||||
//Initialize the pollfd structure
|
||||
memset(m_fds, 0 , sizeof(m_fds));
|
||||
//Set up the initial listening socket
|
||||
m_fds[0].fd = m_socketId;
|
||||
m_fds[0].events = POLLIN;
|
||||
int nfds = 1
|
||||
// Initialize the timeout to 3 minutes. If no activity after 3 minutes this program will end. timeout value is based on milliseconds.
|
||||
int timeout = (3 * 60 * 1000);
|
||||
//Loop waiting for incoming connects or for incoming data on any of the connected sockets.
|
||||
do {
|
||||
// Call poll() and wait 3 minutes for it to complete.
|
||||
ENET_INFO("Waiting on poll()...");
|
||||
int rc = poll(m_fds, nfds, timeout);
|
||||
// Check to see if the poll call failed.
|
||||
if (rc < 0) {
|
||||
ENET_ERROR(" poll() failed");
|
||||
break;
|
||||
}
|
||||
// Check to see if the 3 minute time out expired.
|
||||
if (rc == 0) {
|
||||
ENET_ERROR(" poll() timed out. End program.\n");
|
||||
break;
|
||||
}
|
||||
// One or more descriptors are readable. Need to determine which ones they are.
|
||||
int current_size = nfds;
|
||||
for (int32_t iii iii=0; iii<current_size; ++iii) {
|
||||
// Loop through to find the descriptors that returned POLLIN and determine whether it's the listening or the active connection.
|
||||
if(m_fds[iii].revents == 0) {
|
||||
continue;
|
||||
}
|
||||
// If revents is not POLLIN, it's an unexpected result, log and end the server.
|
||||
if(m_fds[iii].revents != POLLIN) {
|
||||
printf(" Error! revents = %d\n", m_fds[iii].revents);
|
||||
bool end_server = true; // TODO: dsfsdfsdf
|
||||
break;
|
||||
}
|
||||
if (m_fds[iii].fd == m_socketId) {
|
||||
// Listening descriptor is readable.
|
||||
ENET_INFO(" Listening socket is readable");
|
||||
// Accept all incoming connections that are queued up on the listening socket before we loop back and call poll again.
|
||||
do {
|
||||
// Accept each incoming connection. If accept fails with EWOULDBLOCK, then we have accepted all of them.
|
||||
// Any other failure on accept will cause us to end the server.
|
||||
new_sd = accept(listen_sd, nullptr, nullptr);
|
||||
if (new_sd < 0) {
|
||||
if (errno != EWOULDBLOCK) {
|
||||
ENET_ERROR(" accept() failed");
|
||||
end_server = TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Add the new incoming connection to the pollfd structure
|
||||
ENET_ERROR(" New incoming connection - %d", new_sd);
|
||||
m_fds[nfds].fd = new_sd;
|
||||
m_fds[nfds].events = POLLIN;
|
||||
nfds++;
|
||||
// Loop back up and accept another incoming connection
|
||||
} while (new_sd != -1);
|
||||
} else {
|
||||
// This is not the listening socket, therefore an existing connection must be readable
|
||||
ENET_INFO(" Descriptor %d is readable", fds[iii].fd);
|
||||
close_conn = FALSE;
|
||||
// Receive all incoming data on this socket before we loop back and call poll again.
|
||||
do {
|
||||
// Receive data on this connection until the recv fails with EWOULDBLOCK.
|
||||
// If any other failure occurs, we will close the connection.
|
||||
rc = recv(m_fds[iii].fd, buffer, sizeof(buffer), 0);
|
||||
if (rc < 0) {
|
||||
if (errno != EWOULDBLOCK) {
|
||||
perror(" recv() failed");
|
||||
close_conn = TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Check to see if the connection has been closed by the client
|
||||
if (rc == 0) {
|
||||
ENET_ERROR(" Connection closed");
|
||||
close_conn = TRUE;
|
||||
break;
|
||||
}
|
||||
// Data was received
|
||||
len = rc;
|
||||
ENET_INFO(" %d bytes received", len);
|
||||
// Echo the data back to the client
|
||||
rc = send(m_fds[i].fd, buffer, len, 0);
|
||||
if (rc < 0) {
|
||||
ENET_ERRO(" send() failed");
|
||||
close_conn = TRUE;
|
||||
break;
|
||||
}
|
||||
} while(TRUE);
|
||||
// If the close_conn flag was turned on, we need to clean up this active connection.
|
||||
// This clean up process includes removing the descriptor.
|
||||
if (close_conn) {
|
||||
close(m_fds[i].fd);
|
||||
m_fds[i].fd = -1;
|
||||
compress_array = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
// If the compress_array flag was turned on, we need to squeeze together the array and decrement the number of file descriptors.
|
||||
// We do not need to move back the events and revents fields because the events will always be POLLIN in this case, and revents is output.
|
||||
if (compress_array) {
|
||||
compress_array = FALSE;
|
||||
for (int32_t iii=0; iii<nfds; ++iii) {
|
||||
if (m_fds[i].fd == -1) {
|
||||
for(int32_t jjj = iii; jjj < nfds; ++jjj) {
|
||||
m_fds[jjj].fd = fds[jjj+1].fd;
|
||||
}
|
||||
nfds--;
|
||||
}
|
||||
}
|
||||
}
|
||||
} while (end_server == FALSE);
|
||||
// Clean up all of the sockets that are open
|
||||
for (int32_t iii=0; iii<nfds; ++iii) {
|
||||
if(m_fds[iii].fd >= 0) {
|
||||
close(m_fds[iii].fd);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
int32_t enet::Tcp::write(const void* _data, int32_t _len) {
|
||||
if (m_status != status::link) {
|
||||
ENET_ERROR("Can not write on unlink connection");
|
||||
|
@ -10,6 +10,7 @@ namespace enet {
|
||||
private:
|
||||
int32_t m_socketId; //!< socket linux interface generic
|
||||
int32_t m_socketIdClient;
|
||||
struct pollfd m_fds[1];
|
||||
public:
|
||||
Tcp();
|
||||
virtual ~Tcp();
|
||||
|
Loading…
x
Reference in New Issue
Block a user