Bug 919889 (part 1) - Rename jsmemorymetrics.cpp as vm/MemoryMetrics.cpp. r=luke.
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 24 Sep 2013 23:24:27 -0700
changeset 148759 d46380708d860cb87a82b811f2de3fd8dca44b3a
parent 148758 225f540cd413727057c433f037d7c8212bd2107b
child 148760 c82655409e8e95a9ac4f86ad43fa9392569e2680
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersluke
bugs919889
milestone27.0a1
Bug 919889 (part 1) - Rename jsmemorymetrics.cpp as vm/MemoryMetrics.cpp. r=luke.
config/check_spidermonkey_style.py
js/src/config/check_spidermonkey_style.py
js/src/jsmemorymetrics.cpp
js/src/moz.build
js/src/vm/MemoryMetrics.cpp
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -312,20 +312,16 @@ def is_module_header(enclosing_inclname,
     if module == module_name(header_inclname):
         return True
 
     # A public header, e.g. module == "foo/Bar", header_inclname == "js/Bar.h".
     m = re.match(r'js\/(.*)\.h', header_inclname)
     if m is not None and module.endswith('/' + m.group(1)):
         return True
 
-    # A weird public header case.
-    if module == 'jsmemorymetrics' and header_inclname == 'js/MemoryMetrics.h':
-        return True
-
     return False
 
 
 class Include(object):
     '''Important information for a single #include statement.'''
 
     def __init__(self, inclname, linenum, is_system):
         self.inclname = inclname
--- a/js/src/config/check_spidermonkey_style.py
+++ b/js/src/config/check_spidermonkey_style.py
@@ -312,20 +312,16 @@ def is_module_header(enclosing_inclname,
     if module == module_name(header_inclname):
         return True
 
     # A public header, e.g. module == "foo/Bar", header_inclname == "js/Bar.h".
     m = re.match(r'js\/(.*)\.h', header_inclname)
     if m is not None and module.endswith('/' + m.group(1)):
         return True
 
-    # A weird public header case.
-    if module == 'jsmemorymetrics' and header_inclname == 'js/MemoryMetrics.h':
-        return True
-
     return False
 
 
 class Include(object):
     '''Important information for a single #include statement.'''
 
     def __init__(self, inclname, linenum, is_system):
         self.inclname = inclname
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -94,16 +94,17 @@ CPP_SOURCES += [
     'Id.cpp',
     'Interpreter.cpp',
     'Intl.cpp',
     'Iteration.cpp',
     'LifoAlloc.cpp',
     'MapObject.cpp',
     'Marking.cpp',
     'Memory.cpp',
+    'MemoryMetrics.cpp',
     'Module.cpp',
     'Monitor.cpp',
     'NameFunctions.cpp',
     'Nursery.cpp',
     'Object.cpp',
     'ObjectImpl.cpp',
     'OldDebugAPI.cpp',
     'PageBlock.cpp',
@@ -159,17 +160,16 @@ CPP_SOURCES += [
     'jsdtoa.cpp',
     'jsexn.cpp',
     'jsfriendapi.cpp',
     'jsfun.cpp',
     'jsgc.cpp',
     'jsinfer.cpp',
     'jsiter.cpp',
     'jsmath.cpp',
-    'jsmemorymetrics.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
     'jsobj.cpp',
     'json.cpp',
     'jsonparser.cpp',
     'jsopcode.cpp',
     'jsperf.cpp',
     'jsprf.cpp',
rename from js/src/jsmemorymetrics.cpp
rename to js/src/vm/MemoryMetrics.cpp