yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed back to select as default

Browse source
This commit is contained in:
yhirose 2019-10-03 12:51:29 -04:00
parent 6d8302313c
commit 1f86e41d97
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
httplib.h
View file

@ -101,7 +101,7 @@ typedef int ssize_t;
#endif // strcasecmp #endif // strcasecmp
typedef SOCKET socket_t; typedef SOCKET socket_t;
#ifndef CPPHTTPLIB_USE_SELECT #ifdef CPPHTTPLIB_USE_POLL
#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout) #define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
#endif #endif
@ -111,7 +111,7 @@ typedef SOCKET socket_t;
#include <cstring> #include <cstring>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef CPPHTTPLIB_USE_SELECT #ifdef CPPHTTPLIB_USE_POLL
#include <poll.h> #include <poll.h>
#endif #endif
#include <pthread.h> #include <pthread.h>
@ -1032,7 +1032,15 @@ inline int close_socket(socket_t sock) {
} }
inline int select_read(socket_t sock, time_t sec, time_t usec) { inline int select_read(socket_t sock, time_t sec, time_t usec) {
#ifdef CPPHTTPLIB_USE_SELECT #ifdef CPPHTTPLIB_USE_POLL
struct pollfd pfd_read;
pfd_read.fd = sock;
pfd_read.events = POLLIN;
auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
return poll(&pfd_read, 1, timeout);
#else
fd_set fds; fd_set fds;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
@ -1042,19 +1050,26 @@ inline int select_read(socket_t sock, time_t sec, time_t usec) {
tv.tv_usec = static_cast<long>(usec); tv.tv_usec = static_cast<long>(usec);
return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv); return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv);
#else
struct pollfd pfd_read;
pfd_read.fd = sock;
pfd_read.events = POLLIN;
auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
return poll(&pfd_read, 1, timeout);
#endif #endif
} }
inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) { inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) {
#ifdef CPPHTTPLIB_USE_SELECT #ifdef CPPHTTPLIB_USE_POLL
struct pollfd pfd_read;
pfd_read.fd = sock;
pfd_read.events = POLLIN | POLLOUT;
auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
if (poll(&pfd_read, 1, timeout) > 0 &&
pfd_read.revents & (POLLIN | POLLOUT)) {
int error = 0;
socklen_t len = sizeof(error);
return getsockopt(sock, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&error), &len) >= 0 &&
!error;
}
return false;
#else
fd_set fdsr; fd_set fdsr;
FD_ZERO(&fdsr); FD_ZERO(&fdsr);
FD_SET(sock, &fdsr); FD_SET(sock, &fdsr);
@ -1074,21 +1089,6 @@ inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) {
!error; !error;
} }
return false; return false;
#else
struct pollfd pfd_read;
pfd_read.fd = sock;
pfd_read.events = POLLIN | POLLOUT;
auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
if (poll(&pfd_read, 1, timeout) > 0 &&
pfd_read.revents & (POLLIN | POLLOUT)) {
int error = 0;
socklen_t len = sizeof(error);
return getsockopt(sock, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&error), &len) >= 0 &&
!error;
}
return false;
#endif #endif
} }