Uses SNPRINT macro where possible. Otherwise uses #define for format.

runtime/vm/os_linux.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_OS_LINUX)
 
 #include "vm/os.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 31 matching lines @@
     "Writes jitdump data for profiling with perf annotate");
 
 
 class PerfCodeObserver : public CodeObserver {
  public:
   PerfCodeObserver() : out_file_(NULL) {
     Dart_FileOpenCallback file_open = Isolate::file_open_callback();
     if (file_open == NULL) {
       return;
     }
-    const char* format = "/tmp/perf-%" Pd ".map";
     intptr_t pid = getpid();
-    intptr_t len = OS::SNPrint(NULL, 0, format, pid);
-    char* filename = new char[len + 1];
-    OS::SNPrint(filename, len + 1, format, pid);
+    char* filename = OS::SCreate(NULL, "/tmp/perf-%" Pd ".map", pid);
     out_file_ = (*file_open)(filename, true);
-    delete[] filename;
+    free(filename);
   }
 
   ~PerfCodeObserver() {
     Dart_FileCloseCallback file_close = Isolate::file_close_callback();
     if ((file_close == NULL) || (out_file_ == NULL)) {
       return;
     }
     (*file_close)(out_file_);
   }
 
   virtual bool IsActive() const {
     return FLAG_generate_perf_events_symbols && (out_file_ != NULL);
   }
 
   virtual void Notify(const char* name,
                       uword base,
                       uword prologue_offset,
                       uword size,
                       bool optimized) {
     Dart_FileWriteCallback file_write = Isolate::file_write_callback();
     if ((file_write == NULL) || (out_file_ == NULL)) {
       return;
     }
-    const char* format = "%" Px " %" Px " %s%s\n";
     const char* marker = optimized ? "*" : "";
-    intptr_t len = OS::SNPrint(NULL, 0, format, base, size, marker, name);
-    char* buffer = Thread::Current()->zone()->Alloc<char>(len + 1);
-    OS::SNPrint(buffer, len + 1, format, base, size, marker, name);
+    char* buffer = OS::SCreate(Thread::Current()->zone(),
+        "%" Px " %" Px " %s%s\n", base, size, marker, name);
     {
       MutexLocker ml(CodeObservers::mutex());
-      (*file_write)(buffer, len, out_file_);
+      (*file_write)(buffer, strlen(buffer), out_file_);
     }
   }
 
  private:
   void* out_file_;
 
   DISALLOW_COPY_AND_ASSIGN(PerfCodeObserver);
 };
 
 
 class GdbCodeObserver : public CodeObserver {
  public:
   GdbCodeObserver() { }
 
   virtual bool IsActive() const {
     return FLAG_generate_gdb_symbols;
   }
 
   virtual void Notify(const char* name,
                       uword base,
                       uword prologue_offset,
                       uword size,
                       bool optimized) {
     if (prologue_offset > 0) {
       // In order to ensure that gdb sees the first instruction of a function
       // as the prologue sequence we register two symbols for the cases when
       // the prologue sequence is not the first instruction:
       // <name>_entry is used for code preceding the prologue sequence.
       // <name> for rest of the code (first instruction is prologue sequence).
-      const char* kFormat = "%s_%s";
-      intptr_t len = OS::SNPrint(NULL, 0, kFormat, name, "entry");
-      char* pname = Thread::Current()->zone()->Alloc<char>(len + 1);
-      OS::SNPrint(pname, (len + 1), kFormat, name, "entry");
+      char* pname = OS::SCreate(Thread::Current()->zone(),
+          "%s_%s", name, "entry");
       DebugInfo::RegisterSection(pname, base, size);
       DebugInfo::RegisterSection(name,
                                  (base + prologue_offset),
                                  (size - prologue_offset));
     } else {
       DebugInfo::RegisterSection(name, base, size);
     }
   }
 
  private:
@@ skipping 105 matching lines @@
     struct jr_prefix prefix;
     uint32_t pid;
     uint32_t tid;
     uint64_t vma;
     uint64_t code_addr;
     uint64_t code_size;
     uint64_t code_index;
   };
 
   const char* GenerateCodeName(const char* name, bool optimized) {
-    const char* format = "%s%s";
     const char* marker = optimized ? "*" : "";
-    intptr_t len = OS::SNPrint(NULL, 0, format, marker, name);
-    char* buffer = Thread::Current()->zone()->Alloc<char>(len + 1);
-    OS::SNPrint(buffer, len + 1, format, marker, name);
-    return buffer;
+    return OS::SCreate(Thread::Current()->zone(), "%s%s", marker, name);
   }
 
   uint32_t GetElfMach() {
 #if defined(TARGET_ARCH_IA32)
     return kElfMachIA32;
 #elif defined(TARGET_ARCH_X64)
     return kElfMachX64;
 #elif defined(TARGET_ARCH_ARM)
     return kElfMachARM;
 #elif defined(TARGET_ARCH_ARM64)
@@ skipping 278 matching lines @@
 
 int OS::VSNPrint(char* str, size_t size, const char* format, va_list args) {
   int retval = vsnprintf(str, size, format, args);
   if (retval < 0) {
     FATAL1("Fatal error in OS::VSNPrint with format '%s'", format);
   }
   return retval;
 }
 
 
+char* OS::SCreate(Zone* zone, const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  char* buffer = VSCreate(zone, format, args);
+  va_end(args);
+  return buffer;
+}
+
+
+char* OS::VSCreate(Zone* zone, const char* format, va_list args) {
+  // Measure.
+  va_list measure_args;
+  va_copy(measure_args, args);
+  intptr_t len = VSNPrint(NULL, 0, format, measure_args);
+  va_end(measure_args);
+
+  char* buffer;
+  if (zone) {
+    buffer = zone->Alloc<char>(len + 1);
+  } else {
+    buffer = reinterpret_cast<char*>(malloc(len + 1));
+  }
+  ASSERT(buffer != NULL);
+
+  // Print.
+  va_list print_args;
+  va_copy(print_args, args);
+  VSNPrint(buffer, len + 1, format, print_args);
+  va_end(print_args);
+  return buffer;
+}
+
+
 bool OS::StringToInt64(const char* str, int64_t* value) {
   ASSERT(str != NULL && strlen(str) > 0 && value != NULL);
   int32_t base = 10;
   char* endptr;
   int i = 0;
   if (str[0] == '-') {
     i = 1;
   }
   if ((str[i] == '0') &&
       (str[i + 1] == 'x' || str[i + 1] == 'X') &&
@@ skipping 49 matching lines @@
 }
 
 
 void OS::Exit(int code) {
   exit(code);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)