Bug 1407464 - Remove probes/. r?ted
The files generated from the contents of probes/ are never used even
with dtrace enabled, and mozilla-trace.d actually never contained probes
definitions. The js engine has probes of its own, and separate scripts
to generate the corresponding source headers.
(see e.g. js/src/devtools/javascript-trace.d)
--- a/moz.build
+++ b/moz.build
@@ -93,17 +93,16 @@ if not CONFIG['JS_STANDALONE']:
]
GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header'
GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
DIRS += [
'build',
'tools',
- 'probes',
]
if CONFIG['COMPILE_ENVIRONMENT']:
DIRS += ['js/src']
DIRS += [
'config/external/fdlibm',
'config/external/nspr',
deleted file mode 100644
--- a/probes/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files('**'):
- BUG_COMPONENT = ('Core', 'JavaScript Engine')
-
-if CONFIG['HAVE_DTRACE']:
- EXPORTS += [
- '!mozilla-trace.h',
- ]
-
- GENERATED_FILES += [
- 'mozilla-trace.h',
- ]
-
- trace = GENERATED_FILES['mozilla-trace.h']
- trace.script = 'trace-gen.py'
- trace.inputs += ['mozilla-trace.d']
deleted file mode 100644
--- a/probes/mozilla-trace.d
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * mozilla provider probes:
- * Data types defined in the generated file mozilla-trace.h
- *
- * TBD
- */
-
-provider mozilla {
- /* Probe definitions go here */
-};
-
-/*
-#pragma D attributes Unstable/Unstable/Common provider mozilla provider
-#pragma D attributes Private/Private/Unknown provider mozilla module
-#pragma D attributes Private/Private/Unknown provider mozilla function
-#pragma D attributes Unstable/Unstable/Common provider mozilla name
-#pragma D attributes Unstable/Unstable/Common provider mozilla args
-*/
-
deleted file mode 100644
--- a/probes/trace-gen.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-import subprocess
-
-def main(fp, input):
- temporary_file = 'mozilla-trace.h.tmp'
- subprocess.check_call(['dtrace', '-x', 'nolibs', '-h', '-s', input, '-o', temporary_file])
-
- with open(temporary_file, 'r') as temporary_fp:
- output = temporary_fp.read()
- fp.write(output.replace('if _DTRACE_VERSION', 'ifdef INCLUDE_MOZILLA_DTRACE'))
- os.remove(temporary_file)