Created
July 13, 2016 09:28
-
-
Save therealkenc/617e54d75df42b81a050fbdc0730960e to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp | |
| index 9c04cae..d75b9fb 100644 | |
| --- a/src/mongo/util/net/sock.cpp | |
| +++ b/src/mongo/util/net/sock.cpp | |
| @@ -131,7 +131,7 @@ void disableNagle(int sock) { | |
| if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&x, sizeof(x))) | |
| error() << "SO_KEEPALIVE failed: " << errnoWithDescription() << endl; | |
| -#ifdef __linux__ | |
| +#if 0 | |
| socklen_t len = sizeof(x); | |
| if (getsockopt(sock, level, TCP_KEEPIDLE, (char*)&x, &len)) | |
| error() << "can't get TCP_KEEPIDLE: " << errnoWithDescription() << endl; | |
| diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript | |
| index 5fddaf5..578ac1c 100644 | |
| --- a/src/third_party/wiredtiger/SConscript | |
| +++ b/src/third_party/wiredtiger/SConscript | |
| @@ -36,10 +36,10 @@ if conf.CheckFunc("fallocate"): | |
| conf.env.Append(CPPDEFINES=[ | |
| "HAVE_FALLOCATE" | |
| ]) | |
| -if conf.CheckFunc("sync_file_range"): | |
| - conf.env.Append(CPPDEFINES=[ | |
| - "HAVE_SYNC_FILE_RANGE" | |
| - ]) | |
| +#if conf.CheckFunc("sync_file_range"): | |
| +# conf.env.Append(CPPDEFINES=[ | |
| +# "HAVE_SYNC_FILE_RANGE" | |
| +# ]) | |
| if conf.CheckCHeader('x86intrin.h'): | |
| conf.env.Append(CPPDEFINES=[ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment