Unify specification of file open, close, and write callbacks.

runtime/vm/code_observers.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/code_observers.h"
 
 #include "vm/dart.h"
 #include "vm/debuginfo.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 39 matching lines @@
   for (intptr_t i = 0; i < observers_length_; i++) {
     if (observers_[i]->IsActive()) return true;
   }
   return false;
 }
 
 
 class PerfCodeObserver : public CodeObserver {
  public:
   virtual bool IsActive() const {
-    return Dart::perf_events_writer() != NULL;
+    return Dart::perf_events_file() != NULL;
   }
 
   virtual void Notify(const char* name,
                       uword base,
                       uword prologue_offset,
                       uword size,
                       bool optimized) {
-    Dart_FileWriterFunction perf_events_writer = Dart::perf_events_writer();
-    ASSERT(perf_events_writer != NULL);
-
     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 = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
     OS::SNPrint(buffer, len + 1, format, base, size, marker, name);
-    (*perf_events_writer)(buffer, len);
+    Dart_FileWriteCallback file_write = Isolate::file_write_callback();
+    ASSERT(file_write != NULL);
+    void* file = Dart::perf_events_file();
+    ASSERT(file != NULL);
+    (*file_write)(buffer, len, file);
   }
 };
 
 
 class PprofCodeObserver : public CodeObserver {
  public:
   virtual bool IsActive() const {
     return Dart::pprof_symbol_generator() != NULL;
   }
 
@@ skipping 46 matching lines @@
   Register(new PerfCodeObserver);
   Register(new PprofCodeObserver);
   Register(new GdbCodeObserver);
 #if defined(DART_VTUNE_SUPPORT)
   Register(new VTuneCodeObserver);
 #endif
 }
 
 
 }  // namespace dart