Changeset 36863 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 24, 2008, 1:38:55 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-24 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Fixed <rdar://problem/5605532> Need a SPI for telling JS the size of
the objects it retains

• API/JSBase.h: Filled in some missing function names.

• API/tests/testapi.c: Test the new SPI a little.

• API/JSSPI.cpp: Add the new SPI.
• API/JSSPI.h: Add the new SPI.
• JavaScriptCore.exp: Add the new SPI.
• JavaScriptCore.xcodeproj/project.pbxproj: Add the new SPI.

Location:

trunk/JavaScriptCore

Files:

• API/JSBase.cpp (modified) (2 diffs)
• API/JSBasePrivate.h (added)
• API/tests/testapi.c (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "JSBase.h"
+#include "JSBasePrivate.h"
 
 #include "APICast.h"
@@ -103 +104 @@
     // the collector is busy.
 }
+
+void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
+{
+    ExecState* exec = toJS(ctx);
+    exec->globalData().heap->registerThread();
+    JSLock lock(exec);
+
+    exec->globalData().heap->reportExtraMemoryCost(size);
+}

trunk/JavaScriptCore/API/tests/testapi.c

@@ -25 +25 @@
 
 #include "JavaScriptCore.h"
+#include "JSBasePrivate.h"
 #include <math.h>
 #include <wtf/Assertions.h>
@@ -584 +585 @@
     JSGlobalContextRetain(context);
     JSGlobalContextRelease(context);
+    
+    JSReportExtraMemoryCost(context, 0);
+    JSReportExtraMemoryCost(context, 1);
+    JSReportExtraMemoryCost(context, 1024);
 
     JSObjectRef globalObject = JSContextGetGlobalObject(context);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-24  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Darin Adler.
+        
+        Fixed <rdar://problem/5605532> Need a SPI for telling JS the size of
+        the objects it retains
+
+        * API/JSBase.h: Filled in some missing function names.
+
+        * API/tests/testapi.c: Test the new SPI a little.
+
+        * API/JSSPI.cpp: Add the new SPI.
+        * API/JSSPI.h: Add the new SPI.
+        * JavaScriptCore.exp: Add the new SPI.
+        * JavaScriptCore.xcodeproj/project.pbxproj: Add the new SPI.
+
 2008-09-24  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -43 +43 @@
 _JSPropertyNameArrayRelease
 _JSPropertyNameArrayRetain
+_JSReportExtraMemoryCost
 _JSStartProfiling
 _JSStringCopyCFString

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -38 +38 @@
                 06D358B40DAADAAA003B174E /* MainThreadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */; };
                 140B7D1D0DC69AF7009C42B8 /* JSActivation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */; };
+                140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
                 141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
@@ -444 +445 @@
                 06D358A20DAAD9C4003B174E /* MainThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainThread.cpp; sourceTree = "<group>"; };
                 06D358A30DAAD9C4003B174E /* MainThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThread.h; sourceTree = "<group>"; };
+                140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBasePrivate.h; sourceTree = "<group>"; };
                 141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = "<group>"; };
                 1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = minidom.js; path = tests/minidom.js; sourceTree = "<group>"; };
@@ -919 +921 @@
                         isa = PBXGroup;
                         children = (
+                                140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */,
                                 1482B78A0A4305AB00517CFC /* APICast.h */,
                                 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */,
@@ -1593 +1596 @@
                                 147B84630E6DE6B1004775A4 /* PutPropertySlot.h in Headers */,
                                 7E2ADD8E0E79AAD500D50C51 /* CharacterClassConstructor.h in Headers */,
+                                140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;