Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

third_party/tcmalloc/chromium/src/sampler.cc

Index: third_party/tcmalloc/chromium/src/sampler.cc
===================================================================
--- third_party/tcmalloc/chromium/src/sampler.cc	(revision 88335)
+++ third_party/tcmalloc/chromium/src/sampler.cc	(working copy)
@@ -35,14 +35,15 @@
 #include "sampler.h"
 
 #include <algorithm>  // For min()
-#include <cmath>
+#include <math.h>
+#include "base/commandlineflags.h"
 
 using std::min;
 
 // The approximate gap in bytes between sampling actions.
 // I.e., we take one sample approximately once every
 // tcmalloc_sample_parameter bytes of allocation
-// i.e. about once every 512KB.
+// i.e. about once every 512KB if value is 1<<19.
 #ifdef NO_TCMALLOC_SAMPLES
 DEFINE_int64(tcmalloc_sample_parameter, 0,
              "Unused: code is compiled with NO_TCMALLOC_SAMPLES");
@@ -50,8 +51,7 @@
 DEFINE_int64(tcmalloc_sample_parameter,
              EnvToInt64("TCMALLOC_SAMPLE_PARAMETER", 0),
              "The approximate gap in bytes between sampling actions. "
-             "This must be between 1 and 1<<58.");
-// Note: there are other places in this file where the number 19 occurs.
+             "This must be between 1 and 2^58.");
 #endif
 
 namespace tcmalloc {