Commit 571eedbb authored by Ms2ger's avatar Ms2ger
Browse files

Bug 692277 - Part a: Introduce an unstable public API for JS memory... 

Bug 692277 - Part a: Introduce an unstable public API for JS memory measurements to be used in XPCJSRuntime; r=njn sr=dmandelin
parent e927de08

js/public/MemoryMetrics.h

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/* ***** BEGIN LICENSE BLOCK *****

 * Version: MPL 1.1/GPL 2.0/LGPL 2.1

 *

 * The contents of this file are subject to the Mozilla Public License Version

 * 1.1 (the "License"); you may not use this file except in compliance with

 * the License. You may obtain a copy of the License at

 * http://www.mozilla.org/MPL/

 *

 * Software distributed under the License is distributed on an "AS IS" basis,

 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

 * for the specific language governing rights and limitations under the

 * License.

 *

 * The Original Code is about:memory glue.

 *

 * The Initial Developer of the Original Code is

 * Ms2ger <ms2ger@gmail.com>.

 * Portions created by the Initial Developer are Copyright (C) 2011

 * the Initial Developer. All Rights Reserved.

 *

 * Contributor(s):

 *

 * Alternatively, the contents of this file may be used under the terms of

 * either the GNU General Public License Version 2 or later (the "GPL"), or

 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),

 * in which case the provisions of the GPL or the LGPL are applicable instead

 * of those above. If you wish to allow use of your version of this file only

 * under the terms of either the GPL or the LGPL, and not to allow others to

 * use your version of this file under the terms of the MPL, indicate your

 * decision by deleting the provisions above and replace them with the notice

 * and other provisions required by the GPL or the LGPL. If you do not delete

 * the provisions above, a recipient may use your version of this file under

 * the terms of any one of the MPL, the GPL or the LGPL.

 *

 * ***** END LICENSE BLOCK ***** */



#ifndef js_MemoryMetrics_h

#define js_MemoryMetrics_h



/*

 * These declarations are not within jsapi.h because they are highly likely

 * to change in the future. Depend on them at your own risk.

 */



#include "jspubtd.h"



#include "js/Utility.h"



namespace JS {



/* Data for tracking analysis/inference memory usage. */

struct TypeInferenceMemoryStats

{

    int64_t scripts;

    int64_t objects;

    int64_t tables;

    int64_t temporary;

};



extern JS_PUBLIC_API(void)

SizeOfCompartmentTypeInferenceData(JSContext *cx, JSCompartment *compartment,

                                   TypeInferenceMemoryStats *stats,

                                   JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(void)

SizeOfObjectTypeInferenceData(/*TypeObject*/ void *object,

                              TypeInferenceMemoryStats *stats,

                              JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(size_t)

SizeOfObjectDynamicSlots(JSObject *obj, JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(size_t)

SizeOfCompartmentShapeTable(JSCompartment *c, JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(size_t)

SizeOfCompartmentMjitCode(const JSCompartment *c);



extern JS_PUBLIC_API(bool)

IsShapeInDictionary(const void *shape);



extern JS_PUBLIC_API(size_t)

SizeOfShapePropertyTable(const void *shape, JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(size_t)

SizeOfShapeKids(const void *shape, JSMallocSizeOfFun mallocSizeOf);



extern JS_PUBLIC_API(size_t)

SizeOfScriptData(JSScript *script, JSMallocSizeOfFun mallocSizeOf);



#ifdef JS_METHODJIT

extern JS_PUBLIC_API(size_t)

SizeOfScriptJitData(JSScript *script, JSMallocSizeOfFun mallocSizeOf);

#endif



extern JS_PUBLIC_API(size_t)

SystemCompartmentCount(const JSRuntime *rt);



extern JS_PUBLIC_API(size_t)

UserCompartmentCount(const JSRuntime *rt);



} // namespace JS



#endif // js_MemoryMetrics_h

js/src/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ EXPORTS_NAMESPACES += js 
EXPORTS_js = \

		HashTable.h \

		LegacyIntTypes.h \

		MemoryMetrics.h \

		TemplateLib.h \

		Utility.h \

		Vector.h \

js/src/jsapi-tests/testIntTypesABI.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "jsxdrapi.h"



#include "js/HashTable.h"

#include "js/MemoryMetrics.h"

#include "js/TemplateLib.h"

#include "js/Utility.h"

#include "js/Vector.h"

js/src/jsapi.cpp

+25 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#include "builtin/RegExp.h"

#include "frontend/BytecodeCompiler.h"

#include "frontend/BytecodeEmitter.h"

#include "js/MemoryMetrics.h"



#include "jsatominlines.h"

#include "jsinferinlines.h"
@@ -923,6 +924,30 @@ JS_SetRuntimePrivate(JSRuntime *rt, void *data) 
    rt->data = data;

}



JS_PUBLIC_API(size_t)

JS::SystemCompartmentCount(const JSRuntime *rt)

{

    size_t n = 0;

    for (size_t i = 0; i < rt->compartments.length(); i++) {

        if (rt->compartments[i]->isSystemCompartment) {

            ++n;

        }

    }

    return n;

}



JS_PUBLIC_API(size_t)

JS::UserCompartmentCount(const JSRuntime *rt)

{

    size_t n = 0;

    for (size_t i = 0; i < rt->compartments.length(); i++) {

        if (!rt->compartments[i]->isSystemCompartment) {

            ++n;

        }

    }

    return n;

}



#ifdef JS_THREADSAFE

static void

StartRequest(JSContext *cx)

js/src/jscompartment.cpp

+28 −10
Original line number Diff line number Diff line
@@ -48,12 +48,14 @@ 
#include "jsscope.h"

#include "jswatchpoint.h"

#include "jswrapper.h"



#include "assembler/wtf/Platform.h"

#include "yarr/BumpPointerAllocator.h"

#include "js/MemoryMetrics.h"

#include "methodjit/MethodJIT.h"

#include "methodjit/PolyIC.h"

#include "methodjit/MonoIC.h"

#include "vm/Debugger.h"

#include "yarr/BumpPointerAllocator.h"



#include "jsgcinlines.h"

#include "jsobjinlines.h"
@@ -142,17 +144,24 @@ JSCompartment::ensureJaegerCompartmentExists(JSContext *cx) 
    return true;

}



void

JSCompartment::sizeOfCode(size_t *method, size_t *regexp, size_t *unused) const

size_t

JSCompartment::sizeOfMjitCode() const

{

    if (jaegerCompartment_) {

        jaegerCompartment_->execAlloc()->sizeOfCode(method, regexp, unused);

    } else {

        *method = 0;

        *regexp = 0;

        *unused = 0;

    if (!jaegerCompartment_)

        return 0;



    size_t method, regexp, unused;

    jaegerCompartment_->execAlloc()->sizeOfCode(&method, &regexp, &unused);

    JS_ASSERT(regexp == 0);

    return method + unused;

}



JS_PUBLIC_API(size_t)

JS::SizeOfCompartmentMjitCode(const JSCompartment *c)

{

    return c->sizeOfMjitCode();

}



#endif



bool
@@ -740,3 +749,12 @@ JSCompartment::createBarrierTracer() 
    JS_ASSERT(!gcIncrementalTracer);

    return NULL;

}



JS_PUBLIC_API(size_t)

JS::SizeOfCompartmentShapeTable(JSCompartment *c, JSMallocSizeOfFun mallocSizeOf)

{

    return c->baseShapes.sizeOfExcludingThis(mallocSizeOf)

         + c->initialShapes.sizeOfExcludingThis(mallocSizeOf)

         + c->newTypeObjects.sizeOfExcludingThis(mallocSizeOf)

         + c->lazyTypeObjects.sizeOfExcludingThis(mallocSizeOf);

}