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

third_party/tcmalloc/chromium/src/tests/sampler_test.cc

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 69 matching lines @@
 
 #undef LOG   // defined in base/logging.h
 // Ideally, we'd put the newline at the end, but this hack puts the
 // newline at the end of the previous log message, which is good enough :-)
 #define LOG(level)  std::cerr << "\n"
 
 static std::string StringPrintf(const char* format, ...) {
   char buf[256];   // should be big enough for all logging
   va_list ap;
   va_start(ap, format);
-  vsnprintf(buf, sizeof(buf), format, ap);
+  perftools_vsnprintf(buf, sizeof(buf), format, ap);
   va_end(ap);
   return buf;
 }
 
 namespace {
 template<typename T> class scoped_array {
  public:
   scoped_array(T* p) : p_(p) { }
   ~scoped_array() { delete[] p_; }
   const T* get() const { return p_; }
@@ skipping 539 matching lines @@
 
 
 // It's not really a test, but it's good to know
 TEST(Sample, size_of_class) {
   tcmalloc::Sampler sampler;
   sampler.Init(1);
   LOG(INFO) << "Size of Sampler class is: " << sizeof(tcmalloc::Sampler);
   LOG(INFO) << "Size of Sampler object is: " << sizeof(sampler);
 }
 
+// Make sure sampling is enabled, or the tests won't work right.
+DECLARE_int64(tcmalloc_sample_parameter);
+
 int main(int argc, char **argv) {
+  if (FLAGS_tcmalloc_sample_parameter == 0)
+    FLAGS_tcmalloc_sample_parameter = 524288;
   return RUN_ALL_TESTS();
 }