diff options
| author | Eric Milkie <milkie@10gen.com> | 2011-12-21 14:44:46 -0500 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-05-16 08:54:32 -0400 |
| commit | dfbf91e16a8686cac7b58756e4fc63c88d874ec6 (patch) | |
| tree | e4ba9083582b92895324408995789864e2863304 | |
| parent | dbd87d09fd95c10d37bcc8b875e7770043fe219d (diff) | |
| download | mongo-dfbf91e16a8686cac7b58756e4fc63c88d874ec6.tar.gz | |
backport - fix handling of socket timeouts on Windows SERVER-4758
| -rw-r--r-- | util/net/sock.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/util/net/sock.cpp b/util/net/sock.cpp index ac565c3d234..a032e50b646 100644 --- a/util/net/sock.cpp +++ b/util/net/sock.cpp @@ -52,10 +52,18 @@ namespace mongo { tv.tv_usec = (int)((long long)(secs*1000*1000) % (1000*1000)); bool report = logLevel > 3; // solaris doesn't provide these DEV report = true; - bool ok = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, sizeof(tv) ) == 0; - if( report && !ok ) log() << "unabled to set SO_RCVTIMEO" << endl; - ok = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *) &tv, sizeof(tv) ) == 0; - DEV if( report && !ok ) log() << "unabled to set SO_RCVTIMEO" << endl; +#if defined(_WIN32) + tv.tv_sec *= 1000; // Windows timeout is a DWORD, in milliseconds. + int status = setsockopt( sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv.tv_sec, sizeof(DWORD) ) == 0; + if( report && (status == SOCKET_ERROR) ) log() << "unable to set SO_RCVTIMEO" << endl; + status = setsockopt( sock, SOL_SOCKET, SO_SNDTIMEO, (char *) &tv.tv_sec, sizeof(DWORD) ) == 0; + DEV if( report && (status == SOCKET_ERROR) ) log() << "unable to set SO_SNDTIMEO" << endl; +#else + bool ok = setsockopt( sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, sizeof(tv) ) == 0; + if( report && !ok ) log() << "unable to set SO_RCVTIMEO" << endl; + ok = setsockopt( sock, SOL_SOCKET, SO_SNDTIMEO, (char *) &tv, sizeof(tv) ) == 0; + DEV if( report && !ok ) log() << "unable to set SO_SNDTIMEO" << endl; +#endif } #if defined(_WIN32) @@ -755,15 +763,7 @@ namespace mongo { } void Socket::setTimeout( double secs ) { - struct timeval tv; - tv.tv_sec = (int)secs; - tv.tv_usec = (int)((long long)(secs*1000*1000) % (1000*1000)); - bool report = logLevel > 3; // solaris doesn't provide these - DEV report = true; - bool ok = setsockopt(_fd, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, sizeof(tv) ) == 0; - if( report && !ok ) log() << "unabled to set SO_RCVTIMEO" << endl; - ok = setsockopt(_fd, SOL_SOCKET, SO_SNDTIMEO, (char *) &tv, sizeof(tv) ) == 0; - DEV if( report && !ok ) log() << "unabled to set SO_RCVTIMEO" << endl; + setSockTimeouts( _fd, secs ); } #if defined(_WIN32) |