valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-1524 TNonBlockingServer does not compile in Visual Studio 2010

Browse Source 
Patch: Christian Taedcke

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1294824 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roger Meier 2012-02-28 20:50:13 +00:00
parent 8b1adf42e2
commit 35f977c28e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/cpp/src/server/TNonblockingServer.cpp
View File

@ -944,12 +944,12 @@ void TNonblockingServer::handleEvent(int fd, short which) {
nConnectionsDropped_++;
nTotalConnectionsDropped_++;
if (overloadAction_ == T_OVERLOAD_CLOSE_ON_ACCEPT) {
close(clientSocket);
::close(clientSocket);
return;
} else if (overloadAction_ == T_OVERLOAD_DRAIN_TASK_QUEUE) {
if (!drainPendingTask()) {
// Nothing left to discard, so we drop connection instead.
close(clientSocket);
::close(clientSocket);
return;
}
}
@ -960,7 +960,7 @@ void TNonblockingServer::handleEvent(int fd, short which) {
if ((flags = fcntl(clientSocket, F_GETFL, 0)) < 0 ||
fcntl(clientSocket, F_SETFL, flags | O_NONBLOCK) < 0) {
GlobalOutput.perror("thriftServerEventHandler: set O_NONBLOCK (fcntl) ", errno);
close(clientSocket);
::close(clientSocket);
return;
}
@ -971,7 +971,7 @@ void TNonblockingServer::handleEvent(int fd, short which) {
// Fail fast if we could not create a TConnection object
if (clientConnection == NULL) {
GlobalOutput.printf("thriftServerEventHandler: failed TConnection factory");
close(clientSocket);
::close(clientSocket);
return;
}
@ -1059,7 +1059,7 @@ void TNonblockingServer::createAndListenOnSocket() {
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, const_cast_sockopt(&one), sizeof(one));
if (::bind(s, res->ai_addr, res->ai_addrlen) == -1) {
close(s);
::close(s);
freeaddrinfo(res0);
throw TException("TNonblockingServer::serve() bind");
}
@ -1080,7 +1080,7 @@ void TNonblockingServer::listenSocket(int s) {
int flags;
if ((flags = fcntl(s, F_GETFL, 0)) < 0 ||
fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0) {
close(s);
::close(s);
throw TException("TNonblockingServer::serve() O_NONBLOCK");
}
@ -1106,7 +1106,7 @@ void TNonblockingServer::listenSocket(int s) {
#endif
if (listen(s, LISTEN_BACKLOG) == -1) {
close(s);
::close(s);
throw TException("TNonblockingServer::serve() listen");
}
@ -1267,7 +1267,7 @@ TNonblockingIOThread::~TNonblockingIOThread() {
}
if (listenSocket_ >= 0) {
if (0 != close(listenSocket_)) {
if (0 != ::close(listenSocket_)) {
GlobalOutput.perror("TNonblockingIOThread listenSocket_ close(): ",
errno);
}
@ -1292,8 +1292,8 @@ void TNonblockingIOThread::createNotificationPipe() {
}
if(evutil_make_socket_nonblocking(notificationPipeFDs_[0])<0 ||
evutil_make_socket_nonblocking(notificationPipeFDs_[1])<0) {
close(notificationPipeFDs_[0]);
close(notificationPipeFDs_[1]);
::close(notificationPipeFDs_[0]);
::close(notificationPipeFDs_[1]);
throw TException("TNonblockingServer::createNotificationPipe() O_NONBLOCK");
}
for (int i = 0; i < 2; ++i) {
@ -1304,8 +1304,8 @@ void TNonblockingIOThread::createNotificationPipe() {
#else
if (evutil_make_socket_closeonexec(notificationPipeFDs_[i]) < 0) {
#endif
close(notificationPipeFDs_[0]);
close(notificationPipeFDs_[1]);
::close(notificationPipeFDs_[0]);
::close(notificationPipeFDs_[1]);
throw TException("TNonblockingServer::createNotificationPipe() "
"FD_CLOEXEC");
}