Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start work on win

Browse Source
This commit is contained in:
tqchen 2014-11-23 21:34:15 -08:00
parent d2f151ef5a
commit 78ca72b9c7
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/utils/socket.h
View File

@ -26,8 +26,8 @@ namespace utils {
#if defined(_WIN32) #if defined(_WIN32)
typedef int ssize_t; typedef int ssize_t;
#else #else
typedef int SOCKET; typedef int sock_t;
const int INVALID_SOCKET = -1; const int INVALID_sock_t = -1;
#endif #endif
/*! \brief data structure for network address */ /*! \brief data structure for network address */
@ -74,18 +74,18 @@ struct SockAddr {
class TCPSocket { class TCPSocket {
public: public:
/*! \brief the file descriptor of socket */ /*! \brief the file descriptor of socket */
SOCKET sockfd; sock_t sockfd;
// constructor // constructor
TCPSocket(void) : sockfd(INVALID_SOCKET) { TCPSocket(void) : sockfd(INVALID_sock_t) {
} }
explicit TCPSocket(SOCKET sockfd) : sockfd(sockfd) { explicit TCPSocket(sock_t sockfd) : sockfd(sockfd) {
} }
~TCPSocket(void) { ~TCPSocket(void) {
// do nothing in destructor // do nothing in destructor
// user need to take care of close // user need to take care of close
} }
// default conversion to int // default conversion to int
inline operator SOCKET() const { inline operator sock_t() const {
return sockfd; return sockfd;
} }
/*! /*!
@ -94,7 +94,7 @@ class TCPSocket {
*/ */
inline void Create(int af = PF_INET) { inline void Create(int af = PF_INET) {
sockfd = socket(PF_INET, SOCK_STREAM, 0); sockfd = socket(PF_INET, SOCK_STREAM, 0);
if (sockfd == INVALID_SOCKET) { if (sockfd == INVALID_sock_t) {
SockError("Create"); SockError("Create");
} }
} }
@ -118,7 +118,7 @@ class TCPSocket {
#ifdef _WIN32 #ifdef _WIN32
u_long mode = non_block ? 1 : 0; u_long mode = non_block ? 1 : 0;
if (ioctlsocket(sockfd, FIONBIO, &mode) != NO_ERROR) { if (ioctlsocket(sockfd, FIONBIO, &mode) != NO_ERROR) {
SockError("SetNonBlock", WSAGetLastError()); SockError("SetNonBlock");
} }
#else #else
int flag = fcntl(sockfd, F_GETFL, 0); int flag = fcntl(sockfd, F_GETFL, 0);
@ -144,8 +144,8 @@ class TCPSocket {
} }
/*! \brief get a new connection */ /*! \brief get a new connection */
TCPSocket Accept(void) { TCPSocket Accept(void) {
SOCKET newfd = accept(sockfd, NULL, NULL); sock_t newfd = accept(sockfd, NULL, NULL);
if (newfd == INVALID_SOCKET) { if (newfd == INVALID_sock_t) {
SockError("Accept"); SockError("Accept");
} }
return TCPSocket(newfd); return TCPSocket(newfd);
@ -195,7 +195,7 @@ class TCPSocket {
#else #else
close(sockfd); close(sockfd);
#endif #endif
sockfd = INVALID_SOCKET; sockfd = INVALID_sock_t;
} else { } else {
Error("TCPSocket::Close double close the socket or close without create"); Error("TCPSocket::Close double close the socket or close without create");
} }
@ -280,8 +280,7 @@ class TCPSocket {
// report an socket error // report an socket error
inline static void SockError(const char *msg) { inline static void SockError(const char *msg) {
int errsv = errno; int errsv = errno;
char buf[256]; Error("Socket %s Error:%s", msg, strerror(errsv));
Error("Socket %s Error:%s", msg, strerror_r(errsv, buf, sizeof(buf)));
} }
}; };
/*! \brief helper data structure to perform select */ /*! \brief helper data structure to perform select */
@ -294,7 +293,7 @@ struct SelectHelper {
* \brief add file descriptor to watch for read * \brief add file descriptor to watch for read
* \param fd file descriptor to be watched * \param fd file descriptor to be watched
*/ */
inline void WatchRead(int fd) { inline void WatchRead(sock_t fd) {
read_fds.push_back(fd); read_fds.push_back(fd);
if (fd > maxfd) maxfd = fd; if (fd > maxfd) maxfd = fd;
} }
@ -302,7 +301,7 @@ struct SelectHelper {
* \brief add file descriptor to watch for write * \brief add file descriptor to watch for write
* \param fd file descriptor to be watched * \param fd file descriptor to be watched
*/ */
inline void WatchWrite(int fd) { inline void WatchWrite(sock_t fd) {
write_fds.push_back(fd); write_fds.push_back(fd);
if (fd > maxfd) maxfd = fd; if (fd > maxfd) maxfd = fd;
} }
@ -310,14 +309,14 @@ struct SelectHelper {
* \brief Check if the descriptor is ready for read * \brief Check if the descriptor is ready for read
* \param fd file descriptor to check status * \param fd file descriptor to check status
*/ */
inline bool CheckRead(int fd) const { inline bool CheckRead(sock_t fd) const {
return FD_ISSET(fd, &read_set); return FD_ISSET(fd, &read_set);
} }
/*! /*!
* \brief Check if the descriptor is ready for write * \brief Check if the descriptor is ready for write
* \param fd file descriptor to check status * \param fd file descriptor to check status
*/ */
inline bool CheckWrite(int fd) const { inline bool CheckWrite(sock_t fd) const {
return FD_ISSET(fd, &write_set); return FD_ISSET(fd, &write_set);
} }
/*! /*!
@ -353,8 +352,7 @@ struct SelectHelper {
} }
if (ret == -1) { if (ret == -1) {
int errsv = errno; int errsv = errno;
char buf[256]; Error("Select Error: %s", strerror(errsv));
Error("Select Error: %s", strerror_r(errsv, buf, sizeof(buf)));
} }
return ret; return ret;
} }