CXX-480 Backport server r2.8.0-rc5..r3.0.0-rc6 changes

Author: acmorrow

SConstruct

@@ -6,6 +6,7 @@ import imp
 import os
 import platform as py_platform
 import re
+import shlex
 import shutil
 import stat
 import sys
@@ -217,6 +218,10 @@ add_option("use-sasl-client", "Support SASL authentication in the client library
 
 add_option('build-fast-and-loose', "NEVER for production builds", 0, False)
 
+add_option( "boost-lib-search-suffixes",
+            "Comma delimited sequence of boost library suffixes to search",
+            1, False )
+
 add_option('disable-warnings-as-errors', "Don't add -Werror to compiler command line", 0, False)
 
 add_option('propagate-shell-environment',
@@ -236,6 +241,10 @@ add_option('mongo-orchestration-host',
 add_option('mongo-orchestration-port',
            "Host mongo-orchestration is running on",
            1, False, default='8889' )
+
+add_option('variables-help',
+           "Print the help text for SCons variables", 0, False)
+
 if darwin:
     osx_version_choices = ['10.6', '10.7', '10.8', '10.9', '10.10']
 
@@ -281,6 +290,64 @@ add_option('cache-dir',
            "Specify the directory to use for caching objects if --cache is in use",
            1, False, default="$BUILD_DIR/scons/cache")
 
+# Setup the command-line variables
+def variable_shlex_converter(val):
+    return shlex.split(val)
+
+env_vars = Variables()
+
+env_vars.Add('ARFLAGS',
+    help='Sets flags for the archiver',
+    converter=variable_shlex_converter)
+
+env_vars.Add('CCFLAGS',
+    help='Sets flags for the C and C++ compiler',
+    converter=variable_shlex_converter)
+
+env_vars.Add('CFLAGS',
+    help='Sets flags for the C compiler',
+    converter=variable_shlex_converter)
+
+env_vars.Add('CPPDEFINES',
+    help='Sets pre-processor definitions for C and C++',
+    converter=variable_shlex_converter)
+
+env_vars.Add('CPPPATH',
+    help='Adds paths to the preprocessor search path',
+    converter=variable_shlex_converter)
+
+env_vars.Add('CXXFLAGS',
+    help='Sets flags for the C++ compiler',
+    converter=variable_shlex_converter)
+
+env_vars.Add('LIBPATH',
+    help='Adds paths to the linker search path',
+    converter=variable_shlex_converter)
+
+env_vars.Add('LIBS',
+    help='Adds extra libraries to link against',
+    converter=variable_shlex_converter)
+
+env_vars.Add('LINKFLAGS',
+    help='Sets flags for the linker',
+    converter=variable_shlex_converter)
+
+env_vars.Add('SHCCFLAGS',
+    help='Sets flags for the C and C++ compiler when building shared libraries',
+    converter=variable_shlex_converter)
+
+env_vars.Add('SHCFLAGS',
+    help='Sets flags for the C compiler when building shared libraries',
+    converter=variable_shlex_converter)
+
+env_vars.Add('SHCXXFLAGS',
+    help='Sets flags for the C++ compiler when building shared libraries',
+    converter=variable_shlex_converter)
+
+env_vars.Add('SHLINKFLAGS',
+    help='Sets flags for the linker when building shared libraries',
+    converter=variable_shlex_converter)
+
 # don't run configure if user calls --help
 if GetOption('help'):
     Return()
@@ -433,9 +500,36 @@ if windows:
             msvc_script = None
         envDict['MSVC_USE_SCRIPT'] = msvc_script
 
-env = Environment(**envDict)
+env = Environment(variables=env_vars, **envDict)
 del envDict
 
+if has_option('variables-help'):
+    print env_vars.GenerateHelpText(env)
+    Exit(0)
+
+unknown_vars = env_vars.UnknownVariables()
+if unknown_vars:
+    print "Unknown variables specified: {0}".format(", ".join(unknown_vars.keys()))
+    Exit(1)
+
+
+# Add any scons options that conflict with scons variables here.
+# The first item in each tuple is the option name and the second
+# is the variable name
+variable_conflicts = [
+    ('libpath', 'LIBPATH'),
+    ('cpppath', 'CPPPATH'),
+    ('extrapath', 'CPPPATH'),
+    ('extrapath', 'LIBPATH'),
+    ('extralib', 'LIBS')
+]
+
+for (opt_name, var_name) in variable_conflicts:
+    if has_option(opt_name) and var_name in env:
+        print("Both option \"--{0}\" and variable {1} were specified".
+            format(opt_name, var_name))
+        Exit(1)
+
 if has_option("cache"):
     EnsureSConsVersion( 2, 3, 0 )
     if has_option("release"):
@@ -524,8 +618,6 @@ if has_option( "cc" ):
         exit(1)
     env["CC"] = get_option( "cc" )
 
-env["LIBPATH"] = []
-
 if has_option( "libpath" ):
     env["LIBPATH"] = [get_option( "libpath" )]
 
@@ -843,6 +935,14 @@ except OSError:
 
 env.Prepend(CPPPATH=['$VARIANT_DIR/third_party/gtest-1.7.0/include'])
 
+boostSuffixList = ["-mt", ""]
+if get_option("boost-lib-search-suffixes") is not None:
+    boostSuffixList = get_option("boost-lib-search-suffixes")
+    if boostSuffixList == "":
+        boostSuffixList = []
+    else:
+        boostSuffixList = boostSuffixList.split(',')
+
 env.Append( CPPPATH=['$EXTRACPPPATH'],
             LIBPATH=['$EXTRALIBPATH'] )
 
@@ -1643,10 +1743,10 @@ def doConfigure(myenv):
         print( "Could not find boost headers in include search path" )
         Exit(1)
 
-    if not windows:
+    if (not windows) and boostSuffixList:
         # We don't do this for windows because we rely on autolib.
         for b in boostLibs:
-            boostCandidates = ["boost_" + b + "-mt", "boost_" + b]
+            boostCandidates = ["boost_" + b + suffix for suffix in boostSuffixList]
             if not conf.CheckLib(boostCandidates, language="C++"):
                 print( "can't find boost")
                 Exit(1)

src/mongo/base/compare_numbers.h

@@ -0,0 +1,91 @@
+/*    Copyright 2015 MongoDB Inc.
+ *
+ *    This program is free software: you can redistribute it and/or  modify
+ *    it under the terms of the GNU Affero General Public License, version 3,
+ *    as published by the Free Software Foundation.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *    As a special exception, the copyright holders give permission to link the
+ *    code of portions of this program with the OpenSSL library under certain
+ *    conditions as described in each individual source file and distribute
+ *    linked combinations including the program with the OpenSSL library. You
+ *    must comply with the GNU Affero General Public License in all respects
+ *    for all of the code used other than as permitted herein. If you modify
+ *    file(s) with this exception, you may extend this exception to your
+ *    version of the file(s), but you are not obligated to do so. If you do not
+ *    wish to do so, delete this exception statement from your version. If you
+ *    delete this exception statement from all source files in the program,
+ *    then also delete it in the license file.
+ */
+
+#pragma once
+
+#include "mongo/platform/float_utils.h"
+
+namespace mongo {
+
+    /**
+     * These functions compare numbers using the same rules as BSON. Care is taken to always give
+     * numerically correct results when comparing different types. Returns are always -1, 0, or 1 to
+     * ensure it is safe to negate the result to invert the direction of the comparison.
+     */
+
+    inline int compareInts(int lhs, int rhs) {
+        return lhs == rhs ? 0 : lhs < rhs ? -1 : 1;
+    }
+
+    inline int compareLongs(long long lhs, long long rhs) {
+        return lhs == rhs ? 0 : lhs < rhs ? -1 : 1;
+    }
+
+    inline int compareDoubles(double lhs, double rhs) {
+        if (lhs == rhs) return 0;
+        if (lhs < rhs) return -1;
+        if (lhs > rhs) return 1;
+
+        // If none of the above cases returned, lhs or rhs must be NaN.
+        if (isNaN(lhs)) return isNaN(rhs) ? 0 : -1;
+        return 1;
+    }
+
+    // This is the tricky one. Needs to support the following cases:
+    // * Doubles with a fractional component.
+    // * Longs that can't be precisely represented as a double.
+    // * Doubles outside of the range of Longs (including +/- Inf).
+    // * NaN (defined by us as less than all Longs)
+    // * Return value is always -1, 0, or 1 to ensure it is safe to negate.
+    inline int compareLongToDouble(long long lhs, double rhs) {
+        // All Longs are > NaN
+        if (isNaN(rhs)) return 1;
+
+        // Ints with magnitude <= 2**53 can be precisely represented as doubles.
+        // Additionally, doubles outside of this range can't have a fractional component.
+        static const long long kEndOfPreciseDoubles = 1ll << 53;
+        if (lhs <= kEndOfPreciseDoubles && lhs >= -kEndOfPreciseDoubles) {
+            return compareDoubles(lhs, rhs);
+        }
+
+        // Large magnitude doubles (including +/- Inf) are strictly > or < all Longs.
+        static const double kBoundOfLongRange = -static_cast<double>(LLONG_MIN); // positive 2**63
+        if (rhs >= kBoundOfLongRange) return -1; // Can't be represented in a Long.
+        if (rhs < -kBoundOfLongRange) return 1; // Can be represented in a Long.
+
+        // Remaining Doubles can have their integer component precisely represented as long longs.
+        // If they have a fractional component, they must be strictly > or < lhs even after
+        // truncation of the fractional component since low-magnitude lhs were handled above.
+        return compareLongs(lhs, rhs);
+    }
+
+    inline int compareDoubleToLong(double lhs, long long rhs) {
+        // Only implement the real logic once.
+        return -compareLongToDouble(rhs, lhs);
+    }
+
+} // namespace mongo