tcmalloc: Let DEFINE_string define char arrays.

third_party/tcmalloc/chromium/src/symbolize.cc

 // Copyright (c) 2009, 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 50 matching lines @@
 #include "base/sysinfo.h"
 
 using std::string;
 using tcmalloc::DumpProcSelfMaps;   // from sysinfo.h
 
 
 DEFINE_string(symbolize_pprof,
               EnvToString("PPROF_PATH", "pprof"),
               "Path to pprof to call for reporting function names.");
 
-// heap_profile_table_pprof may be referenced after destructors are
-// called (since that's when leak-checking is done), so we make
-// a more-permanent copy that won't ever get destroyed.
-static string* g_pprof_path = new string(FLAGS_symbolize_pprof);
-
 // Returns NULL if we're on an OS where we can't get the invocation name.
 // Using a static var is ok because we're not called from a thread.
 static char* GetProgramInvocationName() {
 #if defined(HAVE_PROGRAM_INVOCATION_NAME)
   extern char* program_invocation_name;  // gcc provides this
   return program_invocation_name;
 #elif defined(__MACH__)
   // We don't want to allocate memory for this since we may be
   // calculating it when memory is corrupted.
   static char program_invocation_name[PATH_MAX];
@@ skipping 36 matching lines @@
 int SymbolTable::Symbolize() {
 #if !defined(HAVE_UNISTD_H)  || !defined(HAVE_SYS_SOCKET_H) || !defined(HAVE_SYS_WAIT_H)
   PrintError("Perftools does not know how to call a sub-process on this O/S");
   return 0;
 #else
   const char* argv0 = GetProgramInvocationName();
   if (argv0 == NULL) {  // can't call symbolize if we can't figure out our name
     PrintError("Cannot figure out the name of this executable (argv0)");
     return 0;
   }
-  if (access(g_pprof_path->c_str(), R_OK) != 0) {
+  if (access(FLAGS_symbolize_pprof, R_OK) != 0) {
     PrintError("Cannot find 'pprof' (is PPROF_PATH set correctly?)");
     return 0;
   }
 
   // All this work is to do two-way communication.  ugh.
   int *child_in = NULL;   // file descriptors
   int *child_out = NULL;  // for now, we don't worry about child_err
   int child_fds[5][2];    // socketpair may be called up to five times below
 
   // The client program may close its stdin and/or stdout and/or stderr
@@ skipping 41 matching lines @@
       close(child_out[1]);  // child uses the 0's, parent uses the 1's
       close(0);
       close(1);
       if (dup2(child_in[0], 0) == -1) _exit(1);
       if (dup2(child_out[0], 1) == -1) _exit(2);
       // Unset vars that might cause trouble when we fork
       unsetenv("CPUPROFILE");
       unsetenv("HEAPPROFILE");
       unsetenv("HEAPCHECK");
       unsetenv("PERFTOOLS_VERBOSE");
-      execlp(g_pprof_path->c_str(), g_pprof_path->c_str(),
+      execlp(FLAGS_symbolize_pprof, FLAGS_symbolize_pprof,
              "--symbols", argv0, NULL);
       _exit(3);  // if execvp fails, it's bad news for us
     }
     default: {  // parent
       close(child_in[0]);   // child uses the 0's, parent uses the 1's
       close(child_out[0]);  // child uses the 0's, parent uses the 1's
 #ifdef HAVE_POLL_H
       // Waiting for 1ms seems to give the OS time to notice any errors.
       poll(0, 0, 1);
       // For maximum safety, we check to make sure the execlp
@@ skipping 66 matching lines @@
           num_symbols++;
         }
       }
       return num_symbols;
     }
   }
   PrintError("Unkown error (should never occur!)");
   return 0;  // shouldn't be reachable
 #endif
 }