Changeset 59171 in webkit for trunk/JavaScriptCore/wtf/text/AtomicString.cpp

Timestamp:

May 11, 2010, 1:52:51 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Patch by Gavin Barraclough.

Reviewed by Steve Falkenburg.

REGRESSION (r57900-57919): 3% PLT Regression from moving strings into WTF.
​https://bugs.webkit.org/show_bug.cgi?id=38930
<rdar://problem/7937188>

When the String classes were moved from WebCore to WTF, it meant that on Windows, all operations
on Strings in WebCore had to cross a DLL boundary (from WebKit.dll to JavaScript.dll).

We fix this by refactoring some of the WTF string code, so the code in AtomicString, StringImpl, and
WTFString can be built by both WebCore and WTF, and we don't need to talk across a DLL to do operations
on Strings.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Remove string exports, because these are now

handled in WebCore.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Remove the post-build step that was added

here (the post build step is in JavaScriptCoreCommon.vsprops).

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Copy the three cpp files that need to be compiled

by WebCore into the WebKitOutputDir directory.

• JavaScriptCore.vcproj/WTF/WTF.vcproj: Add the StringStatics file.
• JavaScriptCore.vcproj/jsc/jsc.vcproj: Add the three WTF string cpp files to this project.
• JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Remove the need to link against WTF.lib (since jsc links against JavaScriptCore).
• JavaScriptCore.xcodeproj/project.pbxproj: Add the StringStatics file.
• wtf/text/AtomicString.cpp: Moved code to StringStatics.
• wtf/text/StringImpl.cpp: Ditto.
• wtf/text/StringStatics.cpp: Added. Move functions in WTF Strings that define static variables to here, so

the rest of the files can be compiled in WebCore.

(WebCore::StringImpl::empty): Moved from StringImpl.cpp to here.
(WebCore::AtomicString::init): Moved from AtomicString.cpp to here.

WebCore: Patch by Gavin Barraclough.

Reviewed by Steve Falkenburg.

REGRESSION (r57900-57919): 3% PLT Regression from moving strings into WTF.
​https://bugs.webkit.org/show_bug.cgi?id=38930
<rdar://problem/7937188>

Add the WTF strings into the WebCore vcproj, from their copied location in $(WebKitOutputDir).

No new tests because no change in behavior.

• WebCore.vcproj/WebCore.vcproj:

File:

• trunk/JavaScriptCore/wtf/text/AtomicString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/text/AtomicString.cpp

@@ -21 +21 @@
 #include "config.h"
 
-#ifdef SKIP_STATIC_CONSTRUCTORS_ON_GCC
-#define ATOMICSTRING_HIDE_GLOBALS 1
-#endif
-
 #include "AtomicString.h"
 
-#include "StaticConstructors.h"
 #include "StringHash.h"
 #include <wtf/HashSet.h>
@@ -300 +295 @@
 }
 
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "")
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text")
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment")
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*")
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml")
-JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns")
-
-void AtomicString::init()
-{
-    static bool initialized;
-    if (!initialized) {
-        // Initialization is not thread safe, so this function must be called from the main thread first.
-        ASSERT(isMainThread());
-
-        // Use placement new to initialize the globals.
-        new ((void*)&nullAtom) AtomicString;
-        new ((void*)&emptyAtom) AtomicString("");
-        new ((void*)&textAtom) AtomicString("#text");
-        new ((void*)&commentAtom) AtomicString("#comment");
-        new ((void*)&starAtom) AtomicString("*");
-        new ((void*)&xmlAtom) AtomicString("xml");
-        new ((void*)&xmlnsAtom) AtomicString("xmlns");
-
-        initialized = true;
-    }
-}
-
-}
+}