Remove `sfi' abbreviations (a follow-up to r6902).

src/cpu-profiler.h

 // Copyright 2010 the V8 project authors. 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
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 28 matching lines @@
 
 // Forward declarations.
 class CodeEntry;
 class CodeMap;
 class CpuProfile;
 class CpuProfilesCollection;
 class HashMap;
 class ProfileGenerator;
 class TokenEnumerator;
 
-#define CODE_EVENTS_TYPE_LIST(V)                \
-  V(CODE_CREATION, CodeCreateEventRecord)       \
-  V(CODE_MOVE,     CodeMoveEventRecord)         \
-  V(CODE_DELETE,   CodeDeleteEventRecord)       \
-  V(SFI_MOVE,      SFIMoveEventRecord)
+#define CODE_EVENTS_TYPE_LIST(V)                                \
+  V(CODE_CREATION, CodeCreateEventRecord)                       \
+  V(CODE_MOVE,     CodeMoveEventRecord)                         \
+  V(CODE_DELETE,   CodeDeleteEventRecord)                       \
+  V(SHARED_FUNC_MOVE,      SharedFunctionMoveEventRecord)
 
 
 class CodeEventRecord {
  public:
 #define DECLARE_TYPE(type, ignore) type,
   enum Type {
     NONE = 0,
     CODE_EVENTS_TYPE_LIST(DECLARE_TYPE)
     NUMBER_OF_TYPES
   };
 #undef DECLARE_TYPE
 
   Type type;
   unsigned order;
 };
 
 
 class CodeCreateEventRecord : public CodeEventRecord {
  public:
   Address start;
   CodeEntry* entry;
   unsigned size;
-  Address sfi_address;
+  Address shared;
 
   INLINE(void UpdateCodeMap(CodeMap* code_map));
 };
 
 
 class CodeMoveEventRecord : public CodeEventRecord {
  public:
   Address from;
   Address to;
 
   INLINE(void UpdateCodeMap(CodeMap* code_map));
 };
 
 
 class CodeDeleteEventRecord : public CodeEventRecord {
  public:
   Address start;
 
   INLINE(void UpdateCodeMap(CodeMap* code_map));
 };
 
 
-class SFIMoveEventRecord : public CodeEventRecord {
+class SharedFunctionMoveEventRecord : public CodeEventRecord {
  public:
   Address from;
   Address to;
 
   INLINE(void UpdateCodeMap(CodeMap* code_map));
 };
 
 
 class TickSampleEventRecord BASE_EMBEDDED {
  public:
@@ skipping 32 matching lines @@
   INLINE(bool running()) { return running_; }
 
   // Events adding methods. Called by VM threads.
   void CallbackCreateEvent(Logger::LogEventsAndTags tag,
                            const char* prefix, String* name,
                            Address start);
   void CodeCreateEvent(Logger::LogEventsAndTags tag,
                        String* name,
                        String* resource_name, int line_number,
                        Address start, unsigned size,
-                       Address sfi_address);
+                       Address shared);
   void CodeCreateEvent(Logger::LogEventsAndTags tag,
                        const char* name,
                        Address start, unsigned size);
   void CodeCreateEvent(Logger::LogEventsAndTags tag,
                        int args_count,
                        Address start, unsigned size);
   void CodeMoveEvent(Address from, Address to);
   void CodeDeleteEvent(Address from);
-  void SFIMoveEvent(Address from, Address to);
+  void SharedFunctionMoveEvent(Address from, Address to);

[Vitaly Repeshko, 2011/03/09 19:22:24]

Let's make it "SharedFunctionInfoMoveEvent" to avoid any ambiguities in the
interface.

[mnaganov (inactive), 2011/03/10 12:02:03]

Done.

   void RegExpCodeCreateEvent(Logger::LogEventsAndTags tag,
                              const char* prefix, String* name,
                              Address start, unsigned size);
   // Puts current stack into tick sample events buffer.
   void AddCurrentStack();
 
   // Tick sample events are filled directly in the buffer of the circular
   // queue (because the structure is of fixed width, but usually not all
   // stack frame entries are filled.) This method returns a pointer to the
   // next record of the buffer.
@@ skipping 72 matching lines @@
                               SharedFunctionInfo *shared,
                               String* source, int line);
   static void CodeCreateEvent(Logger::LogEventsAndTags tag,
                               Code* code, int args_count);
   static void CodeMovingGCEvent() {}
   static void CodeMoveEvent(Address from, Address to);
   static void CodeDeleteEvent(Address from);
   static void GetterCallbackEvent(String* name, Address entry_point);
   static void RegExpCodeCreateEvent(Code* code, String* source);
   static void SetterCallbackEvent(String* name, Address entry_point);
-  static void SFIMoveEvent(Address from, Address to);
+  static void SharedFunctionMoveEvent(Address from, Address to);
 
   static INLINE(bool is_profiling()) {
     return NoBarrier_Load(&is_profiling_);
   }
 
  private:
   CpuProfiler();
   ~CpuProfiler();
   void StartCollectingProfile(const char* title);
   void StartCollectingProfile(String* title);
@@ skipping 17 matching lines @@
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CpuProfiler);
 };
 
 } }  // namespace v8::internal
 
 
 #endif  // V8_CPU_PROFILER_H_