Move heap and CPU profilers into a dedicated directory.

Drive-by: remove unnecessary includes.
Review URL: https://codereview.chromium.org/1356223004

Cr-Commit-Position: refs/heads/master@{#30987}

diff --git a/BUILD.gn b/BUILD.gn
index 1d4f3b7..9dfdaa3 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -624,8 +624,6 @@ source_set("v8_base") {
     "src/allocation.h",
     "src/allocation-site-scopes.cc",
     "src/allocation-site-scopes.h",
-    "src/allocation-tracker.cc",
-    "src/allocation-tracker.h",
     "src/api.cc",
     "src/api.h",
     "src/api-natives.cc",
@@ -671,8 +669,6 @@ source_set("v8_base") {
     "src/char-predicates-inl.h",
     "src/char-predicates.h",
     "src/checks.h",
-    "src/circular-queue-inl.h",
-    "src/circular-queue.h",
     "src/code-factory.cc",
     "src/code-factory.h",
     "src/code-stubs.cc",
@@ -864,9 +860,6 @@ source_set("v8_base") {
     "src/conversions.h",
     "src/counters.cc",
     "src/counters.h",
-    "src/cpu-profiler-inl.h",
-    "src/cpu-profiler.cc",
-    "src/cpu-profiler.h",
     "src/date.cc",
     "src/date.h",
     "src/dateparser-inl.h",
@@ -939,11 +932,6 @@ source_set("v8_base") {
     "src/handles.cc",
     "src/handles.h",
     "src/hashmap.h",
-    "src/heap-profiler.cc",
-    "src/heap-profiler.h",
-    "src/heap-snapshot-generator-inl.h",
-    "src/heap-snapshot-generator.cc",
-    "src/heap-snapshot-generator.h",
     "src/heap/array-buffer-tracker.cc",
     "src/heap/array-buffer-tracker.h",
     "src/heap/gc-idle-time-handler.cc",
@@ -1117,9 +1105,25 @@ source_set("v8_base") {
     "src/preparser.h",
     "src/prettyprinter.cc",
     "src/prettyprinter.h",
-    "src/profile-generator-inl.h",
-    "src/profile-generator.cc",
-    "src/profile-generator.h",
+    "src/profiler/allocation-tracker.cc",
+    "src/profiler/allocation-tracker.h",
+    "src/profiler/circular-queue-inl.h",
+    "src/profiler/circular-queue.h",
+    "src/profiler/cpu-profiler-inl.h",
+    "src/profiler/cpu-profiler.cc",
+    "src/profiler/cpu-profiler.h",
+    "src/profiler/heap-profiler.cc",
+    "src/profiler/heap-profiler.h",
+    "src/profiler/heap-snapshot-generator-inl.h",
+    "src/profiler/heap-snapshot-generator.cc",
+    "src/profiler/heap-snapshot-generator.h",
+    "src/profiler/profile-generator-inl.h",
+    "src/profiler/profile-generator.cc",
+    "src/profiler/profile-generator.h",
+    "src/profiler/sampler.cc",
+    "src/profiler/sampler.h",
+    "src/profiler/unbound-queue-inl.h",
+    "src/profiler/unbound-queue.h",
     "src/property-details.h",
     "src/property.cc",
     "src/property.h",
@@ -1179,8 +1183,6 @@ source_set("v8_base") {
     "src/runtime/runtime.h",
     "src/safepoint-table.cc",
     "src/safepoint-table.h",
-    "src/sampler.cc",
-    "src/sampler.h",
     "src/scanner-character-streams.cc",
     "src/scanner-character-streams.h",
     "src/scanner.cc",
@@ -1232,8 +1234,6 @@ source_set("v8_base") {
     "src/typing-reset.h",
     "src/typing.cc",
     "src/typing.h",
-    "src/unbound-queue-inl.h",
-    "src/unbound-queue.h",
     "src/unicode-inl.h",
     "src/unicode.cc",
     "src/unicode.h",

diff --git a/src/api.cc b/src/api.cc
index 1d9cd48..3799ed3 100644 (file)
--- a/src/api.cc
+++ b/src/api.cc
@@ -27,26 +27,26 @@
 #include "src/contexts.h"
 #include "src/conversions-inl.h"
 #include "src/counters.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/execution.h"
 #include "src/global-handles.h"
-#include "src/heap-profiler.h"
-#include "src/heap-snapshot-generator-inl.h"
 #include "src/icu_util.h"
 #include "src/isolate-inl.h"
 #include "src/json-parser.h"
 #include "src/messages.h"
 #include "src/parser.h"
 #include "src/pending-compilation-error-handler.h"
-#include "src/profile-generator-inl.h"
+#include "src/profiler/cpu-profiler.h"
+#include "src/profiler/heap-profiler.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
+#include "src/profiler/profile-generator-inl.h"
+#include "src/profiler/sampler.h"
 #include "src/property.h"
 #include "src/property-details.h"
 #include "src/prototype.h"
 #include "src/runtime/runtime.h"
 #include "src/runtime-profiler.h"
-#include "src/sampler.h"
 #include "src/scanner-character-streams.h"
 #include "src/simulator.h"
 #include "src/snapshot/natives.h"

diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index b163061..bee45d7 100644 (file)
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -7,10 +7,10 @@
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
index 8c93299..49802ba 100644 (file)
--- a/src/arm/macro-assembler-arm.cc
+++ b/src/arm/macro-assembler-arm.cc
@@ -10,7 +10,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/runtime/runtime.h"
 

diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc
index 11e99b0..2919275 100644 (file)
--- a/src/arm64/lithium-codegen-arm64.cc
+++ b/src/arm64/lithium-codegen-arm64.cc
@@ -8,10 +8,10 @@
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc
index c046849..5e8abe7 100644 (file)
--- a/src/arm64/macro-assembler-arm64.cc
+++ b/src/arm64/macro-assembler-arm64.cc
@@ -8,7 +8,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/runtime/runtime.h"
 

diff --git a/src/assembler.cc b/src/assembler.cc
index c81cdc2..dd05a07 100644 (file)
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -44,12 +44,12 @@
 #include "src/builtins.h"
 #include "src/codegen.h"
 #include "src/counters.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/execution.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"

diff --git a/src/builtins.cc b/src/builtins.cc
index 87f1037..0742f08 100644 (file)
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -9,15 +9,14 @@
 #include "src/arguments.h"
 #include "src/base/once.h"
 #include "src/bootstrapper.h"
-#include "src/cpu-profiler.h"
 #include "src/elements.h"
 #include "src/frames-inl.h"
 #include "src/gdb-jit.h"
-#include "src/heap-profiler.h"
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/prototype.h"
 #include "src/vm-state-inl.h"
 

diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index d9df19e..5c8c763 100644 (file)
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -7,13 +7,13 @@
 #include <sstream>
 
 #include "src/bootstrapper.h"
-#include "src/cpu-profiler.h"
 #include "src/factory.h"
 #include "src/gdb-jit.h"
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic.h"
 #include "src/macro-assembler.h"
 #include "src/parser.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/codegen.cc b/src/codegen.cc
index f1c254e..fd039d0 100644 (file)
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -9,10 +9,10 @@
 #endif
 #include "src/bootstrapper.h"
 #include "src/compiler.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/parser.h"
 #include "src/prettyprinter.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/rewriter.h"
 #include "src/runtime/runtime.h"
 

diff --git a/src/compiler.cc b/src/compiler.cc
index 8b499c5..1901cf3 100644 (file)
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -11,7 +11,6 @@
 #include "src/codegen.h"
 #include "src/compilation-cache.h"
 #include "src/compiler/pipeline.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/debug/liveedit.h"
 #include "src/deoptimizer.h"
@@ -25,6 +24,7 @@
 #include "src/messages.h"
 #include "src/parser.h"
 #include "src/prettyprinter.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/rewriter.h"
 #include "src/runtime-profiler.h"
 #include "src/scanner-character-streams.h"

diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index b1f1576..fdca98e 100644 (file)
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -6,13 +6,13 @@
 
 #include "src/accessors.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/disasm.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
 #include "src/macro-assembler.h"
 #include "src/prettyprinter.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/v8.h"
 
 

diff --git a/src/heap/heap-inl.h b/src/heap/heap-inl.h
index 3f06764..cff69b1 100644 (file)
--- a/src/heap/heap-inl.h
+++ b/src/heap/heap-inl.h
@@ -14,7 +14,6 @@
 #include "src/heap/spaces-inl.h"
 #include "src/heap/store-buffer.h"
 #include "src/heap/store-buffer-inl.h"
-#include "src/heap-profiler.h"
 #include "src/isolate.h"
 #include "src/list-inl.h"
 #include "src/log.h"

diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 7fc7e95..83a1cb1 100644 (file)
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -13,7 +13,6 @@
 #include "src/codegen.h"
 #include "src/compilation-cache.h"
 #include "src/conversions.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
@@ -30,8 +29,8 @@
 #include "src/heap/scavenge-job.h"
 #include "src/heap/scavenger-inl.h"
 #include "src/heap/store-buffer.h"
-#include "src/heap-profiler.h"
 #include "src/interpreter/interpreter.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/runtime-profiler.h"
 #include "src/scopeinfo.h"
 #include "src/snapshot/natives.h"

diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index bf49e28..bf2849f 100644 (file)
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -9,7 +9,6 @@
 #include "src/base/sys-info.h"
 #include "src/code-stubs.h"
 #include "src/compilation-cache.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/execution.h"
 #include "src/frames-inl.h"
@@ -24,9 +23,9 @@
 #include "src/heap/objects-visiting-inl.h"
 #include "src/heap/slots-buffer.h"
 #include "src/heap/spaces-inl.h"
-#include "src/heap-profiler.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/v8.h"
 
 namespace v8 {

diff --git a/src/heap/scavenger.cc b/src/heap/scavenger.cc
index 4017f15..74ed665 100644 (file)
--- a/src/heap/scavenger.cc
+++ b/src/heap/scavenger.cc
@@ -5,12 +5,12 @@
 #include "src/heap/scavenger.h"
 
 #include "src/contexts.h"
-#include "src/cpu-profiler.h"
 #include "src/heap/heap.h"
 #include "src/heap/objects-visiting-inl.h"
 #include "src/heap/scavenger-inl.h"
 #include "src/isolate.h"
 #include "src/log.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/heap/spaces-inl.h b/src/heap/spaces-inl.h
index 8dca9b1..a12ed6f 100644 (file)
--- a/src/heap/spaces-inl.h
+++ b/src/heap/spaces-inl.h
@@ -6,9 +6,9 @@
 #define V8_HEAP_SPACES_INL_H_
 
 #include "src/heap/spaces.h"
-#include "src/heap-profiler.h"
 #include "src/isolate.h"
 #include "src/msan.h"
+#include "src/profiler/heap-profiler.h"
 #include "src/v8memory.h"
 
 namespace v8 {

diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
index 99c0938..6d33f6d 100644 (file)
--- a/src/ia32/lithium-codegen-ia32.cc
+++ b/src/ia32/lithium-codegen-ia32.cc
@@ -8,13 +8,13 @@
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/hydrogen-osr.h"
 #include "src/ia32/frames-ia32.h"
 #include "src/ia32/lithium-codegen-ia32.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index 9b0b0cf..0ad5d77 100644 (file)
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -8,7 +8,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/ia32/frames-ia32.h"
 #include "src/ia32/macro-assembler-ia32.h"

diff --git a/src/ic/handler-compiler.cc b/src/ic/handler-compiler.cc
index c7f1f24..77e0fb5 100644 (file)
--- a/src/ic/handler-compiler.cc
+++ b/src/ic/handler-compiler.cc
@@ -4,11 +4,11 @@
 
 #include "src/ic/handler-compiler.h"
 
-#include "src/cpu-profiler.h"
 #include "src/ic/call-optimization.h"
 #include "src/ic/ic.h"
 #include "src/ic/ic-inl.h"
 #include "src/isolate-inl.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/ic/ic-compiler.cc b/src/ic/ic-compiler.cc
index 875d987..20e4fed 100644 (file)
--- a/src/ic/ic-compiler.cc
+++ b/src/ic/ic-compiler.cc
@@ -4,9 +4,9 @@
 
 #include "src/ic/ic-compiler.h"
 
-#include "src/cpu-profiler.h"
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic-inl.h"
+#include "src/profiler/cpu-profiler.h"
 
 
 namespace v8 {

diff --git a/src/isolate.cc b/src/isolate.cc
index bc48b4e..3fff6b2 100644 (file)
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -18,11 +18,9 @@
 #include "src/codegen.h"
 #include "src/compilation-cache.h"
 #include "src/compilation-statistics.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
-#include "src/heap-profiler.h"
 #include "src/hydrogen.h"
 #include "src/ic/stub-cache.h"
 #include "src/interpreter/interpreter.h"
@@ -30,10 +28,11 @@
 #include "src/lithium-allocator.h"
 #include "src/log.h"
 #include "src/messages.h"
+#include "src/profiler/cpu-profiler.h"
+#include "src/profiler/sampler.h"
 #include "src/prototype.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/runtime-profiler.h"
-#include "src/sampler.h"
 #include "src/scopeinfo.h"
 #include "src/simulator.h"
 #include "src/snapshot/serialize.h"

diff --git a/src/log.cc b/src/log.cc
index 00a4fe8..b9eb577 100644 (file)
--- a/src/log.cc
+++ b/src/log.cc
@@ -11,12 +11,12 @@
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
 #include "src/log-inl.h"
 #include "src/log-utils.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/runtime-profiler.h"
 #include "src/string-stream.h"
 #include "src/vm-state-inl.h"

diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
index 9e45868..7d44fde 100644 (file)
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -28,12 +28,12 @@
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/mips/lithium-codegen-mips.h"
 #include "src/mips/lithium-gap-resolver-mips.h"
+#include "src/profiler/cpu-profiler.h"
 
 
 namespace v8 {

diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
index 2280a2d..e4cf097 100644 (file)
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -11,7 +11,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/mips/macro-assembler-mips.h"
 #include "src/runtime/runtime.h"

diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc
index 4c76551..6c7b7e1 100644 (file)
--- a/src/mips64/lithium-codegen-mips64.cc
+++ b/src/mips64/lithium-codegen-mips64.cc
@@ -4,12 +4,12 @@
 
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/mips64/lithium-codegen-mips64.h"
 #include "src/mips64/lithium-gap-resolver-mips64.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc
index 05f4bb2..1a2829d 100644 (file)
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -9,7 +9,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/mips64/macro-assembler-mips64.h"
 #include "src/runtime/runtime.h"

diff --git a/src/objects.cc b/src/objects.cc
index 4e3ffc7..0059a6a 100644 (file)
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -19,7 +19,6 @@
 #include "src/codegen.h"
 #include "src/compilation-dependencies.h"
 #include "src/compiler.h"
-#include "src/cpu-profiler.h"
 #include "src/date.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
@@ -37,6 +36,7 @@
 #include "src/macro-assembler.h"
 #include "src/messages.h"
 #include "src/objects-inl.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/prototype.h"
 #include "src/safepoint-table.h"
 #include "src/string-builder.h"

diff --git a/src/ppc/lithium-codegen-ppc.cc b/src/ppc/lithium-codegen-ppc.cc
index 92c75e4..bc50754 100644 (file)
--- a/src/ppc/lithium-codegen-ppc.cc
+++ b/src/ppc/lithium-codegen-ppc.cc
@@ -5,12 +5,12 @@
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/ppc/lithium-codegen-ppc.h"
 #include "src/ppc/lithium-gap-resolver-ppc.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/ppc/macro-assembler-ppc.cc b/src/ppc/macro-assembler-ppc.cc
index 05f244a..fe8164a 100644 (file)
--- a/src/ppc/macro-assembler-ppc.cc
+++ b/src/ppc/macro-assembler-ppc.cc
@@ -11,7 +11,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/ppc/macro-assembler-ppc.h"
 #include "src/runtime/runtime.h"

diff --git a/src/allocation-tracker.cc b/src/profiler/allocation-tracker.cc
similarity index 98%
rename from src/allocation-tracker.cc
rename to src/profiler/allocation-tracker.cc
index cc6d522..942068e 100644 (file)
--- a/src/allocation-tracker.cc
+++ b/src/profiler/allocation-tracker.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/allocation-tracker.h"
+#include "src/profiler/allocation-tracker.h"
 
 #include "src/frames-inl.h"
-#include "src/heap-snapshot-generator-inl.h"
 #include "src/objects-inl.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/allocation-tracker.h b/src/profiler/allocation-tracker.h
similarity index 98%
rename from src/allocation-tracker.h
rename to src/profiler/allocation-tracker.h
index c409f24..ebda3db 100644 (file)
--- a/src/allocation-tracker.h
+++ b/src/profiler/allocation-tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_ALLOCATION_TRACKER_H_
-#define V8_ALLOCATION_TRACKER_H_
+#ifndef V8_PROFILER_ALLOCATION_TRACKER_H_
+#define V8_PROFILER_ALLOCATION_TRACKER_H_
 
 #include <map>
 

diff --git a/src/circular-queue-inl.h b/src/profiler/circular-queue-inl.h
similarity index 89%
rename from src/circular-queue-inl.h
rename to src/profiler/circular-queue-inl.h
index 2f06f6c..66b4af5 100644 (file)
--- a/src/circular-queue-inl.h
+++ b/src/profiler/circular-queue-inl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_CIRCULAR_QUEUE_INL_H_
-#define V8_CIRCULAR_QUEUE_INL_H_
+#ifndef V8_PROFILER_CIRCULAR_QUEUE_INL_H_
+#define V8_PROFILER_CIRCULAR_QUEUE_INL_H_
 
-#include "src/circular-queue.h"
+#include "src/profiler/circular-queue.h"
 
 namespace v8 {
 namespace internal {
@@ -66,4 +66,4 @@ typename SamplingCircularQueue<T, L>::Entry* SamplingCircularQueue<T, L>::Next(
 
 } }  // namespace v8::internal
 
-#endif  // V8_CIRCULAR_QUEUE_INL_H_
+#endif  // V8_PROFILER_CIRCULAR_QUEUE_INL_H_

diff --git a/src/circular-queue.h b/src/profiler/circular-queue.h
similarity index 94%
rename from src/circular-queue.h
rename to src/profiler/circular-queue.h
index c312c59..3508b37 100644 (file)
--- a/src/circular-queue.h
+++ b/src/profiler/circular-queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_CIRCULAR_QUEUE_H_
-#define V8_CIRCULAR_QUEUE_H_
+#ifndef V8_PROFILER_CIRCULAR_QUEUE_H_
+#define V8_PROFILER_CIRCULAR_QUEUE_H_
 
 #include "src/base/atomicops.h"
 #include "src/globals.h"
@@ -65,4 +65,4 @@ class SamplingCircularQueue {
 
 } }  // namespace v8::internal
 
-#endif  // V8_CIRCULAR_QUEUE_H_
+#endif  // V8_PROFILER_CIRCULAR_QUEUE_H_

diff --git a/src/cpu-profiler-inl.h b/src/profiler/cpu-profiler-inl.h
similarity index 85%
rename from src/cpu-profiler-inl.h
rename to src/profiler/cpu-profiler-inl.h
index 075f285..df727ae 100644 (file)
--- a/src/cpu-profiler-inl.h
+++ b/src/profiler/cpu-profiler-inl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_CPU_PROFILER_INL_H_
-#define V8_CPU_PROFILER_INL_H_
+#ifndef V8_PROFILER_CPU_PROFILER_INL_H_
+#define V8_PROFILER_CPU_PROFILER_INL_H_
 
-#include "src/cpu-profiler.h"
+#include "src/profiler/cpu-profiler.h"
 
 #include <new>
-#include "src/circular-queue-inl.h"
-#include "src/profile-generator-inl.h"
-#include "src/unbound-queue-inl.h"
+#include "src/profiler/circular-queue-inl.h"
+#include "src/profiler/profile-generator-inl.h"
+#include "src/profiler/unbound-queue-inl.h"
 
 namespace v8 {
 namespace internal {
@@ -76,4 +76,4 @@ void ProfilerEventsProcessor::FinishTickSample() {
 
 } }  // namespace v8::internal
 
-#endif  // V8_CPU_PROFILER_INL_H_
+#endif  // V8_PROFILER_CPU_PROFILER_INL_H_

diff --git a/src/cpu-profiler.cc b/src/profiler/cpu-profiler.cc
similarity index 99%
rename from src/cpu-profiler.cc
rename to src/profiler/cpu-profiler.cc
index 19d61e3..c4216ed 100644 (file)
--- a/src/cpu-profiler.cc
+++ b/src/profiler/cpu-profiler.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/cpu-profiler.h"
+#include "src/profiler/cpu-profiler.h"
 
 #include "src/compiler.h"
-#include "src/cpu-profiler-inl.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/hashmap.h"
 #include "src/log-inl.h"
+#include "src/profiler/cpu-profiler-inl.h"
 #include "src/vm-state-inl.h"
 
 #include "include/v8-profiler.h"

diff --git a/src/cpu-profiler.h b/src/profiler/cpu-profiler.h
similarity index 97%
rename from src/cpu-profiler.h
rename to src/profiler/cpu-profiler.h
index 7619a1e..2d67327 100644 (file)
--- a/src/cpu-profiler.h
+++ b/src/profiler/cpu-profiler.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_CPU_PROFILER_H_
-#define V8_CPU_PROFILER_H_
+#ifndef V8_PROFILER_CPU_PROFILER_H_
+#define V8_PROFILER_CPU_PROFILER_H_
 
 #include "src/allocation.h"
 #include "src/base/atomicops.h"
 #include "src/base/platform/time.h"
-#include "src/circular-queue.h"
 #include "src/compiler.h"
-#include "src/sampler.h"
-#include "src/unbound-queue.h"
+#include "src/profiler/circular-queue.h"
+#include "src/profiler/sampler.h"
+#include "src/profiler/unbound-queue.h"
 
 namespace v8 {
 namespace internal {
@@ -273,4 +273,4 @@ class CpuProfiler : public CodeEventListener {
 } }  // namespace v8::internal
 
 
-#endif  // V8_CPU_PROFILER_H_
+#endif  // V8_PROFILER_CPU_PROFILER_H_

diff --git a/src/heap-profiler.cc b/src/profiler/heap-profiler.cc
similarity index 97%
rename from src/heap-profiler.cc
rename to src/profiler/heap-profiler.cc
index ebf3d56..3f776e0 100644 (file)
--- a/src/heap-profiler.cc
+++ b/src/profiler/heap-profiler.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/heap-profiler.h"
+#include "src/profiler/heap-profiler.h"
 
-#include "src/allocation-tracker.h"
 #include "src/api.h"
-#include "src/heap-snapshot-generator-inl.h"
+#include "src/profiler/allocation-tracker.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/heap-profiler.h b/src/profiler/heap-profiler.h
similarity index 95%
rename from src/heap-profiler.h
rename to src/profiler/heap-profiler.h
index 20fd2c7..b304f38 100644 (file)
--- a/src/heap-profiler.h
+++ b/src/profiler/heap-profiler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_HEAP_PROFILER_H_
-#define V8_HEAP_PROFILER_H_
+#ifndef V8_PROFILER_HEAP_PROFILER_H_
+#define V8_PROFILER_HEAP_PROFILER_H_
 
 #include "src/base/smart-pointers.h"
 #include "src/isolate.h"
@@ -81,4 +81,4 @@ class HeapProfiler {
 
 } }  // namespace v8::internal
 
-#endif  // V8_HEAP_PROFILER_H_
+#endif  // V8_PROFILER_HEAP_PROFILER_H_

diff --git a/src/heap-snapshot-generator-inl.h b/src/profiler/heap-snapshot-generator-inl.h
similarity index 82%
rename from src/heap-snapshot-generator-inl.h
rename to src/profiler/heap-snapshot-generator-inl.h
index ad95776..12e37f5 100644 (file)
--- a/src/heap-snapshot-generator-inl.h
+++ b/src/profiler/heap-snapshot-generator-inl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_HEAP_SNAPSHOT_GENERATOR_INL_H_
-#define V8_HEAP_SNAPSHOT_GENERATOR_INL_H_
+#ifndef V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_INL_H_
+#define V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_INL_H_
 
-#include "src/heap-snapshot-generator.h"
+#include "src/profiler/heap-snapshot-generator.h"
 
 namespace v8 {
 namespace internal {
@@ -45,4 +45,4 @@ HeapGraphEdge** HeapEntry::children_arr() {
 
 } }  // namespace v8::internal
 
-#endif  // V8_HEAP_SNAPSHOT_GENERATOR_INL_H_
+#endif  // V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_INL_H_

diff --git a/src/heap-snapshot-generator.cc b/src/profiler/heap-snapshot-generator.cc
similarity index 99%
rename from src/heap-snapshot-generator.cc
rename to src/profiler/heap-snapshot-generator.cc
index 3fda04f..c7bb3c9 100644 (file)
--- a/src/heap-snapshot-generator.cc
+++ b/src/profiler/heap-snapshot-generator.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/heap-snapshot-generator.h"
+#include "src/profiler/heap-snapshot-generator.h"
 
-#include "src/allocation-tracker.h"
 #include "src/code-stubs.h"
 #include "src/conversions.h"
 #include "src/debug/debug.h"
-#include "src/heap-profiler.h"
-#include "src/heap-snapshot-generator-inl.h"
+#include "src/profiler/allocation-tracker.h"
+#include "src/profiler/heap-profiler.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
 #include "src/types.h"
 
 namespace v8 {

diff --git a/src/heap-snapshot-generator.h b/src/profiler/heap-snapshot-generator.h
similarity index 99%
rename from src/heap-snapshot-generator.h
rename to src/profiler/heap-snapshot-generator.h
index 9a984ee..1baebee 100644 (file)
--- a/src/heap-snapshot-generator.h
+++ b/src/profiler/heap-snapshot-generator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_HEAP_SNAPSHOT_GENERATOR_H_
-#define V8_HEAP_SNAPSHOT_GENERATOR_H_
+#ifndef V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_H_
+#define V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_H_
 
 #include "include/v8-profiler.h"
 #include "src/base/platform/time.h"
@@ -618,4 +618,4 @@ class HeapSnapshotJSONSerializer {
 
 } }  // namespace v8::internal
 
-#endif  // V8_HEAP_SNAPSHOT_GENERATOR_H_
+#endif  // V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_H_

diff --git a/src/profile-generator-inl.h b/src/profiler/profile-generator-inl.h
similarity index 88%
rename from src/profile-generator-inl.h
rename to src/profiler/profile-generator-inl.h
index 966578a..c2e98cc 100644 (file)
--- a/src/profile-generator-inl.h
+++ b/src/profiler/profile-generator-inl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PROFILE_GENERATOR_INL_H_
-#define V8_PROFILE_GENERATOR_INL_H_
+#ifndef V8_PROFILER_PROFILE_GENERATOR_INL_H_
+#define V8_PROFILER_PROFILE_GENERATOR_INL_H_
 
-#include "src/profile-generator.h"
+#include "src/profiler/profile-generator.h"
 
 namespace v8 {
 namespace internal {
@@ -45,4 +45,4 @@ inline unsigned ProfileNode::function_id() const {
 }
 } }  // namespace v8::internal
 
-#endif  // V8_PROFILE_GENERATOR_INL_H_
+#endif  // V8_PROFILER_PROFILE_GENERATOR_INL_H_

diff --git a/src/profile-generator.cc b/src/profiler/profile-generator.cc
similarity index 99%
rename from src/profile-generator.cc
rename to src/profiler/profile-generator.cc
index b6b97bf..f3592bb 100644 (file)
--- a/src/profile-generator.cc
+++ b/src/profiler/profile-generator.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/profile-generator.h"
+#include "src/profiler/profile-generator.h"
 
 #include "src/compiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
-#include "src/profile-generator-inl.h"
-#include "src/sampler.h"
+#include "src/profiler/profile-generator-inl.h"
+#include "src/profiler/sampler.h"
 #include "src/scopeinfo.h"
 #include "src/splay-tree-inl.h"
 #include "src/unicode.h"

diff --git a/src/profile-generator.h b/src/profiler/profile-generator.h
similarity index 98%
rename from src/profile-generator.h
rename to src/profiler/profile-generator.h
index 73d0225..ce58d70 100644 (file)
--- a/src/profile-generator.h
+++ b/src/profiler/profile-generator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PROFILE_GENERATOR_H_
-#define V8_PROFILE_GENERATOR_H_
+#ifndef V8_PROFILER_PROFILE_GENERATOR_H_
+#define V8_PROFILER_PROFILE_GENERATOR_H_
 
 #include <map>
 #include "include/v8-profiler.h"
@@ -385,4 +385,4 @@ class ProfileGenerator {
 
 } }  // namespace v8::internal
 
-#endif  // V8_PROFILE_GENERATOR_H_
+#endif  // V8_PROFILER_PROFILE_GENERATOR_H_

diff --git a/src/sampler.cc b/src/profiler/sampler.cc
similarity index 99%
rename from src/sampler.cc
rename to src/profiler/sampler.cc
index 88e429b..8f01e4f 100644 (file)
--- a/src/sampler.cc
+++ b/src/profiler/sampler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/sampler.h"
+#include "src/profiler/sampler.h"
 
 #if V8_OS_POSIX && !V8_OS_CYGWIN
 
@@ -43,10 +43,10 @@
 #endif
 
 #include "src/base/platform/platform.h"
-#include "src/cpu-profiler-inl.h"
 #include "src/flags.h"
 #include "src/frames-inl.h"
 #include "src/log.h"
+#include "src/profiler/cpu-profiler-inl.h"
 #include "src/simulator.h"
 #include "src/v8threads.h"
 #include "src/vm-state-inl.h"

diff --git a/src/sampler.h b/src/profiler/sampler.h
similarity index 97%
rename from src/sampler.h
rename to src/profiler/sampler.h
index bfdf961..ed932c0 100644 (file)
--- a/src/sampler.h
+++ b/src/profiler/sampler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_SAMPLER_H_
-#define V8_SAMPLER_H_
+#ifndef V8_PROFILER_SAMPLER_H_
+#define V8_PROFILER_SAMPLER_H_
 
 #include "include/v8.h"
 
@@ -132,4 +132,4 @@ class Sampler {
 
 } }  // namespace v8::internal
 
-#endif  // V8_SAMPLER_H_
+#endif  // V8_PROFILER_SAMPLER_H_

diff --git a/src/unbound-queue-inl.h b/src/profiler/unbound-queue-inl.h
similarity index 91%
rename from src/unbound-queue-inl.h
rename to src/profiler/unbound-queue-inl.h
index 6782281..fef7bec 100644 (file)
--- a/src/unbound-queue-inl.h
+++ b/src/profiler/unbound-queue-inl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_UNBOUND_QUEUE_INL_H_
-#define V8_UNBOUND_QUEUE_INL_H_
+#ifndef V8_PROFILER_UNBOUND_QUEUE_INL_H_
+#define V8_PROFILER_UNBOUND_QUEUE_INL_H_
 
-#include "src/unbound-queue.h"
+#include "src/profiler/unbound-queue.h"
 
 namespace v8 {
 namespace internal {
@@ -79,4 +79,4 @@ Record* UnboundQueue<Record>::Peek() const {
 
 } }  // namespace v8::internal
 
-#endif  // V8_UNBOUND_QUEUE_INL_H_
+#endif  // V8_PROFILER_UNBOUND_QUEUE_INL_H_

diff --git a/src/unbound-queue.h b/src/profiler/unbound-queue.h
similarity index 91%
rename from src/unbound-queue.h
rename to src/profiler/unbound-queue.h
index 3e12928..a63c327 100644 (file)
--- a/src/unbound-queue.h
+++ b/src/profiler/unbound-queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_UNBOUND_QUEUE_
-#define V8_UNBOUND_QUEUE_
+#ifndef V8_PROFILER_UNBOUND_QUEUE_
+#define V8_PROFILER_UNBOUND_QUEUE_
 
 #include "src/allocation.h"
 #include "src/base/atomicops.h"
@@ -44,4 +44,4 @@ class UnboundQueue BASE_EMBEDDED {
 
 } }  // namespace v8::internal
 
-#endif  // V8_UNBOUND_QUEUE_
+#endif  // V8_PROFILER_UNBOUND_QUEUE_

diff --git a/src/regexp/arm/regexp-macro-assembler-arm.cc b/src/regexp/arm/regexp-macro-assembler-arm.cc
index d502060..d296d90 100644 (file)
--- a/src/regexp/arm/regexp-macro-assembler-arm.cc
+++ b/src/regexp/arm/regexp-macro-assembler-arm.cc
@@ -7,9 +7,9 @@
 #include "src/regexp/arm/regexp-macro-assembler-arm.h"
 
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/regexp/arm64/regexp-macro-assembler-arm64.cc b/src/regexp/arm64/regexp-macro-assembler-arm64.cc
index ed24cf3..d440879 100644 (file)
--- a/src/regexp/arm64/regexp-macro-assembler-arm64.cc
+++ b/src/regexp/arm64/regexp-macro-assembler-arm64.cc
@@ -7,9 +7,9 @@
 #include "src/regexp/arm64/regexp-macro-assembler-arm64.h"
 
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/regexp/ia32/regexp-macro-assembler-ia32.cc b/src/regexp/ia32/regexp-macro-assembler-ia32.cc
index 3ba5db1..9e50a10 100644 (file)
--- a/src/regexp/ia32/regexp-macro-assembler-ia32.cc
+++ b/src/regexp/ia32/regexp-macro-assembler-ia32.cc
@@ -6,9 +6,9 @@
 
 #include "src/regexp/ia32/regexp-macro-assembler-ia32.h"
 
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/regexp/ppc/regexp-macro-assembler-ppc.cc b/src/regexp/ppc/regexp-macro-assembler-ppc.cc
index e820aa9..03f9741 100644 (file)
--- a/src/regexp/ppc/regexp-macro-assembler-ppc.cc
+++ b/src/regexp/ppc/regexp-macro-assembler-ppc.cc
@@ -8,9 +8,9 @@
 
 #include "src/base/bits.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/regexp/x64/regexp-macro-assembler-x64.cc b/src/regexp/x64/regexp-macro-assembler-x64.cc
index c0f5f2c..969edc1 100644 (file)
--- a/src/regexp/x64/regexp-macro-assembler-x64.cc
+++ b/src/regexp/x64/regexp-macro-assembler-x64.cc
@@ -6,9 +6,9 @@
 
 #include "src/regexp/x64/regexp-macro-assembler-x64.h"
 
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/regexp/x87/regexp-macro-assembler-x87.cc b/src/regexp/x87/regexp-macro-assembler-x87.cc
index c30994e..c6968dc 100644 (file)
--- a/src/regexp/x87/regexp-macro-assembler-x87.cc
+++ b/src/regexp/x87/regexp-macro-assembler-x87.cc
@@ -6,9 +6,9 @@
 
 #include "src/regexp/x87/regexp-macro-assembler-x87.h"
 
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/macro-assembler.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/unicode.h"

diff --git a/src/runtime/runtime-function.cc b/src/runtime/runtime-function.cc
index be92d59..71c4812 100644 (file)
--- a/src/runtime/runtime-function.cc
+++ b/src/runtime/runtime-function.cc
@@ -7,11 +7,11 @@
 #include "src/accessors.h"
 #include "src/arguments.h"
 #include "src/compiler.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
+#include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index 0e60299..297b31c 100644 (file)
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -9,7 +9,6 @@
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/execution.h"
 #include "src/global-handles.h"
@@ -17,6 +16,7 @@
 #include "src/ic/stub-cache.h"
 #include "src/objects.h"
 #include "src/parser.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/snapshot.h"

diff --git a/src/v8.cc b/src/v8.cc
index d7cc797..760a9b5 100644 (file)
--- a/src/v8.cc
+++ b/src/v8.cc
@@ -12,13 +12,13 @@
 #include "src/deoptimizer.h"
 #include "src/elements.h"
 #include "src/frames.h"
-#include "src/heap-profiler.h"
 #include "src/hydrogen.h"
 #include "src/isolate.h"
 #include "src/lithium-allocator.h"
 #include "src/objects.h"
+#include "src/profiler/heap-profiler.h"
+#include "src/profiler/sampler.h"
 #include "src/runtime-profiler.h"
-#include "src/sampler.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/serialize.h"
 #include "src/snapshot/snapshot.h"

diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
index 81d275f..81e4087 100644 (file)
--- a/src/x64/lithium-codegen-x64.cc
+++ b/src/x64/lithium-codegen-x64.cc
@@ -7,10 +7,10 @@
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
-#include "src/cpu-profiler.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/x64/lithium-codegen-x64.h"
 
 namespace v8 {

diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index 5b87081..ea837dc 100644 (file)
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -8,7 +8,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/heap/heap.h"
 #include "src/x64/assembler-x64.h"

diff --git a/src/x87/lithium-codegen-x87.cc b/src/x87/lithium-codegen-x87.cc
index 24f62fb..3338ea5 100644 (file)
--- a/src/x87/lithium-codegen-x87.cc
+++ b/src/x87/lithium-codegen-x87.cc
@@ -8,11 +8,11 @@
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/deoptimizer.h"
 #include "src/hydrogen-osr.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/x87/frames-x87.h"
 #include "src/x87/lithium-codegen-x87.h"
 

diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc
index 9fc8b79..c34a47a 100644 (file)
--- a/src/x87/macro-assembler-x87.cc
+++ b/src/x87/macro-assembler-x87.cc
@@ -8,7 +8,6 @@
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
-#include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/runtime/runtime.h"
 #include "src/x87/frames-x87.h"

diff --git a/test/cctest/test-api.h b/test/cctest/test-api.h
index 6b4d459..379fe9c 100644 (file)
--- a/test/cctest/test-api.h
+++ b/test/cctest/test-api.h
@@ -4,8 +4,8 @@
 
 #include "src/v8.h"
 
-#include "src/cpu-profiler.h"
 #include "src/isolate.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/vm-state.h"
 #include "test/cctest/cctest.h"
 

diff --git a/test/cctest/test-circular-queue.cc b/test/cctest/test-circular-queue.cc
index 8d0d4f9..a5bcb48 100644 (file)
--- a/test/cctest/test-circular-queue.cc
+++ b/test/cctest/test-circular-queue.cc
@@ -29,7 +29,7 @@
 
 #include "src/v8.h"
 
-#include "src/circular-queue-inl.h"
+#include "src/profiler/circular-queue-inl.h"
 #include "test/cctest/cctest.h"
 
 using i::SamplingCircularQueue;

diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
index 17eec07..f7d1e1a 100644 (file)
--- a/test/cctest/test-cpu-profiler.cc
+++ b/test/cctest/test-cpu-profiler.cc
@@ -32,8 +32,8 @@
 #include "include/v8-profiler.h"
 #include "src/base/platform/platform.h"
 #include "src/base/smart-pointers.h"
-#include "src/cpu-profiler-inl.h"
 #include "src/deoptimizer.h"
+#include "src/profiler/cpu-profiler-inl.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/profiler-extension.h"

diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
index f063235..55e5538 100644 (file)
--- a/test/cctest/test-heap-profiler.cc
+++ b/test/cctest/test-heap-profiler.cc
@@ -32,11 +32,11 @@
 #include "src/v8.h"
 
 #include "include/v8-profiler.h"
-#include "src/allocation-tracker.h"
 #include "src/debug/debug.h"
 #include "src/hashmap.h"
-#include "src/heap-profiler.h"
-#include "src/heap-snapshot-generator-inl.h"
+#include "src/profiler/allocation-tracker.h"
+#include "src/profiler/heap-profiler.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
 #include "test/cctest/cctest.h"
 
 using i::AllocationTraceNode;

diff --git a/test/cctest/test-log-stack-tracer.cc b/test/cctest/test-log-stack-tracer.cc
index e4ca282..f991e8f 100644 (file)
--- a/test/cctest/test-log-stack-tracer.cc
+++ b/test/cctest/test-log-stack-tracer.cc
@@ -36,7 +36,7 @@
 #include "src/disassembler.h"
 #include "src/isolate.h"
 #include "src/log.h"
-#include "src/sampler.h"
+#include "src/profiler/sampler.h"
 #include "src/vm-state-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/trace-extension.h"

diff --git a/test/cctest/test-log.cc b/test/cctest/test-log.cc
index 0938a9e..9ca2f83 100644 (file)
--- a/test/cctest/test-log.cc
+++ b/test/cctest/test-log.cc
@@ -36,9 +36,9 @@
 
 #include "src/v8.h"
 
-#include "src/cpu-profiler.h"
 #include "src/log.h"
 #include "src/log-utils.h"
+#include "src/profiler/cpu-profiler.h"
 #include "src/snapshot/natives.h"
 #include "src/utils.h"
 #include "src/v8threads.h"

diff --git a/test/cctest/test-profile-generator.cc b/test/cctest/test-profile-generator.cc
index 2217614..78a8204 100644 (file)
--- a/test/cctest/test-profile-generator.cc
+++ b/test/cctest/test-profile-generator.cc
@@ -30,8 +30,8 @@
 #include "src/v8.h"
 
 #include "include/v8-profiler.h"
-#include "src/cpu-profiler.h"
-#include "src/profile-generator-inl.h"
+#include "src/profiler/cpu-profiler.h"
+#include "src/profiler/profile-generator-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/profiler-extension.h"
 

diff --git a/test/cctest/test-unbound-queue.cc b/test/cctest/test-unbound-queue.cc
index 47526f2..a19b783 100644 (file)
--- a/test/cctest/test-unbound-queue.cc
+++ b/test/cctest/test-unbound-queue.cc
@@ -33,7 +33,7 @@
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
-#include "src/unbound-queue-inl.h"
+#include "src/profiler/unbound-queue-inl.h"
 
 using i::UnboundQueue;
 

diff --git a/test/cctest/trace-extension.cc b/test/cctest/trace-extension.cc
index 76524d1..5e558cf 100644 (file)
--- a/test/cctest/trace-extension.cc
+++ b/test/cctest/trace-extension.cc
@@ -30,7 +30,7 @@
 
 #include "test/cctest/trace-extension.h"
 
-#include "src/sampler.h"
+#include "src/profiler/sampler.h"
 #include "src/vm-state-inl.h"
 #include "test/cctest/cctest.h"
 

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index c39f963..3412b68 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -389,8 +389,6 @@
         '../../src/allocation.h',
         '../../src/allocation-site-scopes.cc',
         '../../src/allocation-site-scopes.h',
-        '../../src/allocation-tracker.cc',
-        '../../src/allocation-tracker.h',
         '../../src/api.cc',
         '../../src/api.h',
         '../../src/api-natives.cc',
@@ -436,8 +434,6 @@
         '../../src/char-predicates-inl.h',
         '../../src/char-predicates.h',
         '../../src/checks.h',
-        '../../src/circular-queue-inl.h',
-        '../../src/circular-queue.h',
         '../../src/code-factory.cc',
         '../../src/code-factory.h',
         '../../src/code-stubs.cc',
@@ -630,9 +626,6 @@
         '../../src/conversions.h',
         '../../src/counters.cc',
         '../../src/counters.h',
-        '../../src/cpu-profiler-inl.h',
-        '../../src/cpu-profiler.cc',
-        '../../src/cpu-profiler.h',
         '../../src/date.cc',
         '../../src/date.h',
         '../../src/dateparser-inl.h',
@@ -705,11 +698,6 @@
         '../../src/handles.cc',
         '../../src/handles.h',
         '../../src/hashmap.h',
-        '../../src/heap-profiler.cc',
-        '../../src/heap-profiler.h',
-        '../../src/heap-snapshot-generator-inl.h',
-        '../../src/heap-snapshot-generator.cc',
-        '../../src/heap-snapshot-generator.h',
         '../../src/heap/array-buffer-tracker.cc',
         '../../src/heap/array-buffer-tracker.h',
         '../../src/heap/memory-reducer.cc',
@@ -883,9 +871,25 @@
         '../../src/preparser.h',
         '../../src/prettyprinter.cc',
         '../../src/prettyprinter.h',
-        '../../src/profile-generator-inl.h',
-        '../../src/profile-generator.cc',
-        '../../src/profile-generator.h',
+        '../../src/profiler/allocation-tracker.cc',
+        '../../src/profiler/allocation-tracker.h',
+        '../../src/profiler/circular-queue-inl.h',
+        '../../src/profiler/circular-queue.h',
+        '../../src/profiler/cpu-profiler-inl.h',
+        '../../src/profiler/cpu-profiler.cc',
+        '../../src/profiler/cpu-profiler.h',
+        '../../src/profiler/heap-profiler.cc',
+        '../../src/profiler/heap-profiler.h',
+        '../../src/profiler/heap-snapshot-generator-inl.h',
+        '../../src/profiler/heap-snapshot-generator.cc',
+        '../../src/profiler/heap-snapshot-generator.h',
+        '../../src/profiler/profile-generator-inl.h',
+        '../../src/profiler/profile-generator.cc',
+        '../../src/profiler/profile-generator.h',
+        '../../src/profiler/sampler.cc',
+        '../../src/profiler/sampler.h',
+        '../../src/profiler/unbound-queue-inl.h',
+        '../../src/profiler/unbound-queue.h',
         '../../src/property-details.h',
         '../../src/property.cc',
         '../../src/property.h',
@@ -945,8 +949,6 @@
         '../../src/runtime/runtime.h',
         '../../src/safepoint-table.cc',
         '../../src/safepoint-table.h',
-        '../../src/sampler.cc',
-        '../../src/sampler.h',
         '../../src/scanner-character-streams.cc',
         '../../src/scanner-character-streams.h',
         '../../src/scanner.cc',
@@ -1000,8 +1002,6 @@
         '../../src/typing-reset.h',
         '../../src/typing.cc',
         '../../src/typing.h',
-        '../../src/unbound-queue-inl.h',
-        '../../src/unbound-queue.h',
         '../../src/unicode-inl.h',
         '../../src/unicode.cc',
         '../../src/unicode.h',