Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit f12b58e

Browse files
Rename initializeThreading to initialize
https://bugs.webkit.org/show_bug.cgi?id=213674 Reviewed by Mark Lam. Source/JavaScriptCore: * API/JSClassRef.cpp: * API/JSContextRef.cpp: (JSContextGroupCreate): (JSGlobalContextCreate): (JSGlobalContextCreateInGroup): * API/JSObjectRef.cpp: (JSClassCreate): * API/JSStringRef.cpp: (JSStringCreateWithCharacters): (JSStringCreateWithUTF8CString): (JSStringCreateWithCharactersNoCopy): * API/JSStringRefCF.cpp: (JSStringCreateWithCFString): * API/tests/CompareAndSwapTest.cpp: (testCompareAndSwap): * API/tests/ExecutionTimeLimitTest.cpp: (testExecutionTimeLimit): * API/tests/FunctionOverridesTest.cpp: (testFunctionOverrides): * API/tests/MultithreadedMultiVMExecutionTest.cpp: (startMultithreadedMultiVMExecutionTest): * API/tests/PingPongStackOverflowTest.cpp: (testPingPongStackOverflow): * JavaScriptCore.order: * assembler/testmasm.cpp: (JSC::run): * b3/air/testair.cpp: (main): * b3/testb3_1.cpp: (main): * dfg/testdfg.cpp: (main): * dynbench.cpp: (main): * inspector/remote/cocoa/RemoteInspectorCocoa.mm: (Inspector::RemoteInspector::singleton): * jsc.cpp: (main): (jscmain): * runtime/InitializeThreading.cpp: (JSC::initialize): (JSC::initializeThreading): Deleted. * runtime/InitializeThreading.h: * runtime/JSCConfig.h: * shell/playstation/TestShell.cpp: (setupTestRun): * testRegExp.cpp: (main): Source/WebCore: * Modules/webdatabase/DatabaseManager.cpp: (WebCore::DatabaseManager::openDatabase): * WebCore.order: * bindings/js/CommonVM.cpp: (WebCore::commonVMSlow): * bindings/js/ScriptController.cpp: (WebCore::ScriptController::initializeMainThread): (WebCore::ScriptController::initializeThreading): Deleted. * bindings/js/ScriptController.h: * bridge/objc/WebScriptObject.mm: (+[WebScriptObject initialize]): * platform/cocoa/SharedBufferCocoa.mm: (+[WebCoreSharedBufferData initialize]): * platform/ios/wak/WebCoreThread.mm: (RunWebThread): Source/WebKit: * Shared/API/c/WKString.cpp: (WKStringCopyJSString): * Shared/Cocoa/WebKit2InitializeCocoa.mm: (WebKit::runInitializationCode): * Shared/WebKit2Initialize.cpp: (WebKit::InitializeWebKit2): Source/WebKitLegacy/mac: * History/WebBackForwardList.mm: (+[WebBackForwardList initialize]): * History/WebHistoryItem.mm: (+[WebHistoryItem initialize]): * Misc/WebCache.mm: (+[WebCache initialize]): * Misc/WebElementDictionary.mm: (+[WebElementDictionary initialize]): * Misc/WebIconDatabase.mm: * Misc/WebStringTruncator.mm: (+[WebStringTruncator initialize]): * Plugins/Hosted/WebHostedNetscapePluginView.mm: (+[WebHostedNetscapePluginView initialize]): * Plugins/WebBaseNetscapePluginView.mm: * Plugins/WebBasePluginPackage.mm: (+[WebBasePluginPackage initialize]): * Plugins/WebNetscapePluginView.mm: (+[WebNetscapePluginView initialize]): * WebCoreSupport/WebEditorClient.mm: (+[WebUndoStep initialize]): * WebCoreSupport/WebFrameLoaderClient.mm: (+[WebFramePolicyListener initialize]): * WebView/WebArchive.mm: (+[WebArchivePrivate initialize]): * WebView/WebDataSource.mm: (+[WebDataSource initialize]): * WebView/WebHTMLView.mm: (+[WebHTMLViewPrivate initialize]): (+[WebHTMLView initialize]): * WebView/WebPreferences.mm: (+[WebPreferences initialize]): * WebView/WebResource.mm: (+[WebResourcePrivate initialize]): * WebView/WebTextIterator.mm: (+[WebTextIteratorPrivate initialize]): * WebView/WebView.mm: (+[WebView initialize]): * WebView/WebViewData.mm: (+[WebViewPrivate initialize]): Source/WebKitLegacy/win: * WebKitClassFactory.cpp: (WebKitClassFactory::WebKitClassFactory): * WebView.cpp: (WebView::WebView): Source/WTF: Reasons: (1) You need to call it even if you don't use threads. (2) It initializes things unrelated to threads (like the PRNG). (3) People seem to get confused about the relationship between initializeThreading() and initializeMainThread(), and sometimes think initializeThreading() is a superset. The opposite is true! I think the confusion may come from "threading" being read as "all threading". Some filenames still use the legacy name. We can fix that in post. * benchmarks/ConditionSpeedTest.cpp: (main): * benchmarks/HashSetDFGReplay.cpp: (main): * benchmarks/LockFairnessTest.cpp: (main): * benchmarks/LockSpeedTest.cpp: (main): * wtf/MainThread.cpp: (WTF::initializeMainThread): * wtf/Threading.cpp: (WTF::Thread::create): (WTF::initialize): (WTF::initializeThreading): Deleted. * wtf/Threading.h: (WTF::Thread::current): Tools: * TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp: (ApplicationManifestParserTest::SetUp): * TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp: (TestWebKitAPI::ComplexTextControllerTest::SetUp): * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp: (TestWebKitAPI::ContentExtensionTest::SetUp): * TestWebKitAPI/Tests/WebCore/StringUtilities.mm: (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm: (TestWebKitAPI::WebCoreNSURLSessionTest::SetUp): * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp: (WebKitTestServer::WebKitTestServer): * WebKitTestRunner/TestController.cpp: (WTR::TestController::initialize): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent eb3e057 commit f12b58e

File tree

77 files changed

+307
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+307
-101
lines changed

Source/JavaScriptCore/API/JSClassRef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass*
5151
, convertToType(definition->convertToType)
5252
, m_className(String::fromUTF8(definition->className))
5353
{
54-
initializeThreading();
54+
JSC::initialize();
5555

5656
if (const JSStaticValue* staticValue = definition->staticValues) {
5757
m_staticValues = makeUnique<OpaqueJSClassStaticValuesTable>();

Source/JavaScriptCore/API/JSContextRef.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ using namespace JSC;
6666

6767
JSContextGroupRef JSContextGroupCreate()
6868
{
69-
initializeThreading();
69+
JSC::initialize();
7070
return toRef(&VM::createContextGroup().leakRef());
7171
}
7272

@@ -116,7 +116,7 @@ void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef group)
116116

117117
JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
118118
{
119-
initializeThreading();
119+
JSC::initialize();
120120

121121
#if OS(DARWIN)
122122
// If the application was linked before JSGlobalContextCreate was changed to use a unique VM,
@@ -131,7 +131,7 @@ JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
131131

132132
JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass)
133133
{
134-
initializeThreading();
134+
JSC::initialize();
135135

136136
Ref<VM> vm = group ? Ref<VM>(*toJS(group)) : VM::createContextGroup();
137137

Source/JavaScriptCore/API/JSObjectRef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ using namespace JSC;
5656

5757
JSClassRef JSClassCreate(const JSClassDefinition* definition)
5858
{
59-
initializeThreading();
59+
JSC::initialize();
6060
auto jsClass = (definition->attributes & kJSClassAttributeNoAutomaticPrototype)
6161
? OpaqueJSClass::createNoAutomaticPrototype(definition)
6262
: OpaqueJSClass::create(definition);

Source/JavaScriptCore/API/JSStringRef.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ using namespace WTF::Unicode;
3636

3737
JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
3838
{
39-
initializeThreading();
39+
JSC::initialize();
4040
return &OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
4141
}
4242

4343
JSStringRef JSStringCreateWithUTF8CString(const char* string)
4444
{
45-
initializeThreading();
45+
JSC::initialize();
4646
if (string) {
4747
size_t length = strlen(string);
4848
Vector<UChar, 1024> buffer(length);
@@ -61,7 +61,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
6161

6262
JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
6363
{
64-
initializeThreading();
64+
JSC::initialize();
6565
return OpaqueJSString::tryCreate(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
6666
}
6767

Source/JavaScriptCore/API/JSStringRefCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
JSStringRef JSStringCreateWithCFString(CFStringRef string)
3737
{
38-
JSC::initializeThreading();
38+
JSC::initialize();
3939

4040
// We cannot use CFIndex here since CFStringGetLength can return values larger than
4141
// it can hold. (<rdar://problem/6806478>)

Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void testCompareAndSwap()
100100
RefPtr<Thread> threads[numThreads];
101101
Data data[numThreads];
102102

103-
WTF::initializeThreading();
103+
WTF::initialize();
104104

105105
printf("Starting %d threads for CompareAndSwap test. Test should complete without hanging.\n", numThreads);
106106
for (int i = 0; i < numThreads; i++) {

Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ int testExecutionTimeLimit()
127127

128128
bool failed = false;
129129

130-
JSC::initializeThreading();
130+
JSC::initialize();
131131

132132
for (auto tierOptions : tierOptionsList) {
133133
StringBuilder savedOptionsBuilder;

Source/JavaScriptCore/API/tests/FunctionOverridesTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int testFunctionOverrides()
3737
{
3838
bool failed = false;
3939

40-
JSC::initializeThreading();
40+
JSC::initialize();
4141

4242
const char* oldFunctionOverrides = Options::functionOverrides();
4343

Source/JavaScriptCore/API/tests/MultithreadedMultiVMExecutionTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static std::vector<std::thread>& threadsList()
4949
void startMultithreadedMultiVMExecutionTest()
5050
{
5151
WTF::initializeMainThread();
52-
JSC::initializeThreading();
52+
JSC::initialize();
5353

5454
#define CHECK(condition, message) do { \
5555
if (!condition) { \

Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ int testPingPongStackOverflow()
116116
{
117117
bool failed = false;
118118

119-
JSC::initializeThreading();
119+
JSC::initialize();
120120

121121
auto origSoftReservedZoneSize = Options::softReservedZoneSize();
122122
auto origReservedZoneSize = Options::reservedZoneSize();

0 commit comments

Comments
 (0)