Bug 784894 - put NPOTB tools/utilities in js/src/devtools (r=sfink)
authorLuke Wagner <luke@mozilla.com>
Mon, 27 Aug 2012 09:13:44 -0700
changeset 105762 f24546b76f3e8b3d462c7df75a11f203e4ee1592
parent 105761 0a5dee7e43fa274074ab02ac87633ec45a83459a
child 105763 ce700bebd73c4853358b61257c2af2afbed2f2ca
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewerssfink
bugs784894
milestone18.0a1
Bug 784894 - put NPOTB tools/utilities in js/src/devtools (r=sfink)
js/src/ETWProvider.man
js/src/Makefile.in
js/src/MemoryMetrics.cpp
js/src/devtools/ETWProvider.man
js/src/devtools/gc/README.txt
js/src/devtools/gc/gc-test.py
js/src/devtools/gc/tests/clock.js
js/src/devtools/gc/tests/dslots.js
js/src/devtools/gc/tests/loops.js
js/src/devtools/gc/tests/objGraph.js
js/src/devtools/gnuplot/gcTimer.gnu
js/src/devtools/javascript-trace.d
js/src/devtools/jint/sunspider/3d-cube.js
js/src/devtools/jint/sunspider/3d-morph.js
js/src/devtools/jint/sunspider/3d-raytrace.js
js/src/devtools/jint/sunspider/access-binary-trees.js
js/src/devtools/jint/sunspider/access-fannkuch.js
js/src/devtools/jint/sunspider/access-nbody.js
js/src/devtools/jint/sunspider/access-nsieve.js
js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js
js/src/devtools/jint/sunspider/bitops-bits-in-byte.js
js/src/devtools/jint/sunspider/bitops-bitwise-and.js
js/src/devtools/jint/sunspider/bitops-nsieve-bits.js
js/src/devtools/jint/sunspider/controlflow-recursive.js
js/src/devtools/jint/sunspider/crypto-aes.js
js/src/devtools/jint/sunspider/crypto-md5.js
js/src/devtools/jint/sunspider/crypto-sha1.js
js/src/devtools/jint/sunspider/date-format-tofte.js
js/src/devtools/jint/sunspider/date-format-xparb.js
js/src/devtools/jint/sunspider/math-cordic.js
js/src/devtools/jint/sunspider/math-partial-sums.js
js/src/devtools/jint/sunspider/math-spectral-norm.js
js/src/devtools/jint/sunspider/regexp-dna.js
js/src/devtools/jint/sunspider/string-base64.js
js/src/devtools/jint/sunspider/string-fasta.js
js/src/devtools/jint/sunspider/string-tagcloud.js
js/src/devtools/jint/sunspider/string-unpack-code.js
js/src/devtools/jint/sunspider/string-validate-input.js
js/src/devtools/jint/treesearch.py
js/src/devtools/jint/v8/base.js
js/src/devtools/jint/v8/crypto.js
js/src/devtools/jint/v8/deltablue.js
js/src/devtools/jint/v8/earley-boyer.js
js/src/devtools/jint/v8/raytrace.js
js/src/devtools/jint/v8/richards.js
js/src/devtools/jint/v8/run-earley-boyer.js
js/src/devtools/jint/v8/run-raytrace.js
js/src/devtools/jint/v8/run-richards.js
js/src/devtools/jint/v8/run.js
js/src/devtools/sharkctl.cpp
js/src/devtools/sharkctl.h
js/src/devtools/vprof/manifest.mk
js/src/devtools/vprof/readme.txt
js/src/devtools/vprof/testVprofMT.c
js/src/devtools/vprof/vprof.cpp
js/src/devtools/vprof/vprof.h
js/src/gnuplot/gcTimer.gnu
js/src/javascript-trace.d
js/src/jsmemorymetrics.cpp
js/src/metrics/gc/README.txt
js/src/metrics/gc/gc-test.py
js/src/metrics/gc/tests/clock.js
js/src/metrics/gc/tests/dslots.js
js/src/metrics/gc/tests/loops.js
js/src/metrics/gc/tests/objGraph.js
js/src/metrics/jint/sunspider/3d-cube.js
js/src/metrics/jint/sunspider/3d-morph.js
js/src/metrics/jint/sunspider/3d-raytrace.js
js/src/metrics/jint/sunspider/access-binary-trees.js
js/src/metrics/jint/sunspider/access-fannkuch.js
js/src/metrics/jint/sunspider/access-nbody.js
js/src/metrics/jint/sunspider/access-nsieve.js
js/src/metrics/jint/sunspider/bitops-3bit-bits-in-byte.js
js/src/metrics/jint/sunspider/bitops-bits-in-byte.js
js/src/metrics/jint/sunspider/bitops-bitwise-and.js
js/src/metrics/jint/sunspider/bitops-nsieve-bits.js
js/src/metrics/jint/sunspider/controlflow-recursive.js
js/src/metrics/jint/sunspider/crypto-aes.js
js/src/metrics/jint/sunspider/crypto-md5.js
js/src/metrics/jint/sunspider/crypto-sha1.js
js/src/metrics/jint/sunspider/date-format-tofte.js
js/src/metrics/jint/sunspider/date-format-xparb.js
js/src/metrics/jint/sunspider/math-cordic.js
js/src/metrics/jint/sunspider/math-partial-sums.js
js/src/metrics/jint/sunspider/math-spectral-norm.js
js/src/metrics/jint/sunspider/regexp-dna.js
js/src/metrics/jint/sunspider/string-base64.js
js/src/metrics/jint/sunspider/string-fasta.js
js/src/metrics/jint/sunspider/string-tagcloud.js
js/src/metrics/jint/sunspider/string-unpack-code.js
js/src/metrics/jint/sunspider/string-validate-input.js
js/src/metrics/jint/treesearch.py
js/src/metrics/jint/v8/base.js
js/src/metrics/jint/v8/crypto.js
js/src/metrics/jint/v8/deltablue.js
js/src/metrics/jint/v8/earley-boyer.js
js/src/metrics/jint/v8/raytrace.js
js/src/metrics/jint/v8/richards.js
js/src/metrics/jint/v8/run-earley-boyer.js
js/src/metrics/jint/v8/run-raytrace.js
js/src/metrics/jint/v8/run-richards.js
js/src/metrics/jint/v8/run.js
js/src/sharkctl.cpp
js/src/sharkctl.h
js/src/vprof/manifest.mk
js/src/vprof/readme.txt
js/src/vprof/testVprofMT.c
js/src/vprof/vprof.cpp
js/src/vprof/vprof.h
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -52,16 +52,17 @@ ifdef JS_SHARED_LIBRARY
 FORCE_SHARED_LIB = 1
 endif
 FORCE_STATIC_LIB = 1
 DIST_INSTALL = 1
 
 VPATH		= \
 		$(srcdir) \
 		$(srcdir)/builtin \
+		$(srcdir)/devtools \
 		$(srcdir)/ds \
 		$(srcdir)/frontend \
 		$(srcdir)/gc \
 		$(srcdir)/vm \
 		$(NULL)
 
 CPPSRCS		= \
 		jsalloc.cpp \
@@ -82,16 +83,17 @@ CPPSRCS		= \
 		jsfun.cpp \
 		jsgc.cpp \
 		jscrashreport.cpp \
 		jsinfer.cpp \
 		jsinterp.cpp \
 		jsiter.cpp \
 		jslog2.cpp \
 		jsmath.cpp \
+		jsmemorymetrics.cpp \
 		jsnativestack.cpp \
 		jsnum.cpp \
 		jsobj.cpp \
 		json.cpp \
 		jsonparser.cpp \
 		jsopcode.cpp \
 		jsproxy.cpp \
 		jsprf.cpp \
@@ -126,17 +128,16 @@ CPPSRCS		= \
 		ParseNode.cpp \
 		Parser.cpp \
 		SPSProfiler.cpp \
 		TokenStream.cpp \
 		TestingFunctions.cpp \
 		LifoAlloc.cpp \
 		Eval.cpp \
 		MapObject.cpp \
-		MemoryMetrics.cpp \
 		RegExpObject.cpp \
 		RegExpStatics.cpp \
 		RegExp.cpp \
 		Marking.cpp \
 		Memory.cpp \
 		Statistics.cpp \
 		StoreBuffer.cpp \
 		StringBuffer.cpp \
@@ -456,17 +457,17 @@ GARBAGE += jsautooplen.h host_jsoplengen
 GARBAGE += selfhosted.out.h
 
 USE_HOST_CXX = 1
 
 ifdef HAVE_DTRACE
 ifneq ($(OS_ARCH),Darwin)
 DTRACE_PROBE_OBJ = $(LIBRARY_NAME)-dtrace.$(OBJ_SUFFIX)
 endif
-MOZILLA_DTRACE_SRC = $(srcdir)/javascript-trace.d
+MOZILLA_DTRACE_SRC = $(srcdir)/devtools/javascript-trace.d
 endif
 
 default::
 
 ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
 # nsinstall doesn't get built until we enter config/ in the exports phase,
 # so we'll have to manually ensure it gets built here if we want to use
 # $(EXPORTS)
@@ -805,18 +806,18 @@ ETWProvider.res: ETWProvider.rc
 export:: ETWProvider.res
 
 install:: ETWProvider.mof ETWProvider.man
 	$(SYSINSTALL) $^ $(DESTDIR)$(bindir)
 
 endif
 
 ifdef HAVE_DTRACE
-$(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
-	dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
+$(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
+	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
 	    -e '/const/!s/char \*/const char */g' \
 	    javascript-trace.h.in > javascript-trace.h
 
 # We can't automatically generate dependencies on auto-generated headers;
 # we have to list them explicitly.
 $(addsuffix .$(OBJ_SUFFIX),jsprobes jsinterp jsobj): $(CURDIR)/javascript-trace.h
 endif
rename from js/src/ETWProvider.man
rename to js/src/devtools/ETWProvider.man
rename from js/src/metrics/gc/README.txt
rename to js/src/devtools/gc/README.txt
rename from js/src/metrics/gc/gc-test.py
rename to js/src/devtools/gc/gc-test.py
rename from js/src/metrics/gc/tests/clock.js
rename to js/src/devtools/gc/tests/clock.js
rename from js/src/metrics/gc/tests/dslots.js
rename to js/src/devtools/gc/tests/dslots.js
rename from js/src/metrics/gc/tests/loops.js
rename to js/src/devtools/gc/tests/loops.js
rename from js/src/metrics/gc/tests/objGraph.js
rename to js/src/devtools/gc/tests/objGraph.js
rename from js/src/gnuplot/gcTimer.gnu
rename to js/src/devtools/gnuplot/gcTimer.gnu
rename from js/src/javascript-trace.d
rename to js/src/devtools/javascript-trace.d
rename from js/src/metrics/jint/sunspider/3d-cube.js
rename to js/src/devtools/jint/sunspider/3d-cube.js
rename from js/src/metrics/jint/sunspider/3d-morph.js
rename to js/src/devtools/jint/sunspider/3d-morph.js
rename from js/src/metrics/jint/sunspider/3d-raytrace.js
rename to js/src/devtools/jint/sunspider/3d-raytrace.js
rename from js/src/metrics/jint/sunspider/access-binary-trees.js
rename to js/src/devtools/jint/sunspider/access-binary-trees.js
rename from js/src/metrics/jint/sunspider/access-fannkuch.js
rename to js/src/devtools/jint/sunspider/access-fannkuch.js
rename from js/src/metrics/jint/sunspider/access-nbody.js
rename to js/src/devtools/jint/sunspider/access-nbody.js
rename from js/src/metrics/jint/sunspider/access-nsieve.js
rename to js/src/devtools/jint/sunspider/access-nsieve.js
rename from js/src/metrics/jint/sunspider/bitops-3bit-bits-in-byte.js
rename to js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js
rename from js/src/metrics/jint/sunspider/bitops-bits-in-byte.js
rename to js/src/devtools/jint/sunspider/bitops-bits-in-byte.js
rename from js/src/metrics/jint/sunspider/bitops-bitwise-and.js
rename to js/src/devtools/jint/sunspider/bitops-bitwise-and.js
rename from js/src/metrics/jint/sunspider/bitops-nsieve-bits.js
rename to js/src/devtools/jint/sunspider/bitops-nsieve-bits.js
rename from js/src/metrics/jint/sunspider/controlflow-recursive.js
rename to js/src/devtools/jint/sunspider/controlflow-recursive.js
rename from js/src/metrics/jint/sunspider/crypto-aes.js
rename to js/src/devtools/jint/sunspider/crypto-aes.js
rename from js/src/metrics/jint/sunspider/crypto-md5.js
rename to js/src/devtools/jint/sunspider/crypto-md5.js
rename from js/src/metrics/jint/sunspider/crypto-sha1.js
rename to js/src/devtools/jint/sunspider/crypto-sha1.js
rename from js/src/metrics/jint/sunspider/date-format-tofte.js
rename to js/src/devtools/jint/sunspider/date-format-tofte.js
rename from js/src/metrics/jint/sunspider/date-format-xparb.js
rename to js/src/devtools/jint/sunspider/date-format-xparb.js
rename from js/src/metrics/jint/sunspider/math-cordic.js
rename to js/src/devtools/jint/sunspider/math-cordic.js
rename from js/src/metrics/jint/sunspider/math-partial-sums.js
rename to js/src/devtools/jint/sunspider/math-partial-sums.js
rename from js/src/metrics/jint/sunspider/math-spectral-norm.js
rename to js/src/devtools/jint/sunspider/math-spectral-norm.js
rename from js/src/metrics/jint/sunspider/regexp-dna.js
rename to js/src/devtools/jint/sunspider/regexp-dna.js
rename from js/src/metrics/jint/sunspider/string-base64.js
rename to js/src/devtools/jint/sunspider/string-base64.js
rename from js/src/metrics/jint/sunspider/string-fasta.js
rename to js/src/devtools/jint/sunspider/string-fasta.js
rename from js/src/metrics/jint/sunspider/string-tagcloud.js
rename to js/src/devtools/jint/sunspider/string-tagcloud.js
rename from js/src/metrics/jint/sunspider/string-unpack-code.js
rename to js/src/devtools/jint/sunspider/string-unpack-code.js
rename from js/src/metrics/jint/sunspider/string-validate-input.js
rename to js/src/devtools/jint/sunspider/string-validate-input.js
rename from js/src/metrics/jint/treesearch.py
rename to js/src/devtools/jint/treesearch.py
rename from js/src/metrics/jint/v8/base.js
rename to js/src/devtools/jint/v8/base.js
rename from js/src/metrics/jint/v8/crypto.js
rename to js/src/devtools/jint/v8/crypto.js
rename from js/src/metrics/jint/v8/deltablue.js
rename to js/src/devtools/jint/v8/deltablue.js
rename from js/src/metrics/jint/v8/earley-boyer.js
rename to js/src/devtools/jint/v8/earley-boyer.js
rename from js/src/metrics/jint/v8/raytrace.js
rename to js/src/devtools/jint/v8/raytrace.js
rename from js/src/metrics/jint/v8/richards.js
rename to js/src/devtools/jint/v8/richards.js
rename from js/src/metrics/jint/v8/run-earley-boyer.js
rename to js/src/devtools/jint/v8/run-earley-boyer.js
rename from js/src/metrics/jint/v8/run-raytrace.js
rename to js/src/devtools/jint/v8/run-raytrace.js
rename from js/src/metrics/jint/v8/run-richards.js
rename to js/src/devtools/jint/v8/run-richards.js
rename from js/src/metrics/jint/v8/run.js
rename to js/src/devtools/jint/v8/run.js
rename from js/src/sharkctl.cpp
rename to js/src/devtools/sharkctl.cpp
rename from js/src/sharkctl.h
rename to js/src/devtools/sharkctl.h
rename from js/src/vprof/manifest.mk
rename to js/src/devtools/vprof/manifest.mk
rename from js/src/vprof/readme.txt
rename to js/src/devtools/vprof/readme.txt
rename from js/src/vprof/testVprofMT.c
rename to js/src/devtools/vprof/testVprofMT.c
rename from js/src/vprof/vprof.cpp
rename to js/src/devtools/vprof/vprof.cpp
rename from js/src/vprof/vprof.h
rename to js/src/devtools/vprof/vprof.h
rename from js/src/MemoryMetrics.cpp
rename to js/src/jsmemorymetrics.cpp