Changeset 263635 in webkit


Ignore:
Timestamp:
Jun 28, 2020, 1:55:08 PM (5 years ago)
Author:
ggaren@apple.com
Message:

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):

(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):

Location:
trunk
Files:
77 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Source/JavaScriptCore/API/JSClassRef.cpp

    r261895 r263635  
    5252    , m_className(String::fromUTF8(definition->className))
    5353{
    54     initializeThreading();
     54    JSC::initialize();
    5555
    5656    if (const JSStaticValue* staticValue = definition->staticValues) {

  • TabularUnified trunk/Source/JavaScriptCore/API/JSContextRef.cpp

    r262054 r263635  
    6767JSContextGroupRef JSContextGroupCreate()
    6868{
    69     initializeThreading();
     69    JSC::initialize();
    7070    return toRef(&VM::createContextGroup().leakRef());
    7171}
    … …  
    117117JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
    118118{
    119     initializeThreading();
     119    JSC::initialize();
    120120
    121121#if OS(DARWIN)
    … …  
    132132JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass)
    133133{
    134     initializeThreading();
     134    JSC::initialize();
    135135
    136136    Ref<VM> vm = group ? Ref<VM>(*toJS(group)) : VM::createContextGroup();

  • TabularUnified trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

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

  • TabularUnified trunk/Source/JavaScriptCore/API/JSStringRef.cpp

    r244828 r263635  
    3737JSStringRef 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}
    … …  
    4343JSStringRef JSStringCreateWithUTF8CString(const char* string)
    4444{
    45     initializeThreading();
     45    JSC::initialize();
    4646    if (string) {
    4747        size_t length = strlen(string);
    … …  
    6262JSStringRef 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}

  • TabularUnified trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp

    r229309 r263635  
    3636JSStringRef JSStringCreateWithCFString(CFStringRef string)
    3737{
    38     JSC::initializeThreading();
     38    JSC::initialize();
    3939
    4040    // We cannot use CFIndex here since CFStringGetLength can return values larger than

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp

    r250005 r263635  
    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);

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp

    r263117 r263635  
    128128    bool failed = false;
    129129
    130     JSC::initializeThreading();
     130    JSC::initialize();
    131131
    132132    for (auto tierOptions : tierOptionsList) {

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/FunctionOverridesTest.cpp

    r263117 r263635  
    3838    bool failed = false;
    3939
    40     JSC::initializeThreading();
     40    JSC::initialize();
    4141
    4242    const char* oldFunctionOverrides = Options::functionOverrides();

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/MultithreadedMultiVMExecutionTest.cpp

    r261755 r263635  
    5050{
    5151    WTF::initializeMainThread();
    52     JSC::initializeThreading();
     52    JSC::initialize();
    5353
    5454#define CHECK(condition, message) do { \

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp

    r263117 r263635  
    117117    bool failed = false;
    118118
    119     JSC::initializeThreading();
     119    JSC::initialize();
    120120
    121121    auto origSoftReservedZoneSize = Options::softReservedZoneSize();

  • TabularUnified trunk/Source/JavaScriptCore/ChangeLog

    r263619 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * API/JSClassRef.cpp:
     9        * API/JSContextRef.cpp:
     10        (JSContextGroupCreate):
     11        (JSGlobalContextCreate):
     12        (JSGlobalContextCreateInGroup):
     13        * API/JSObjectRef.cpp:
     14        (JSClassCreate):
     15        * API/JSStringRef.cpp:
     16        (JSStringCreateWithCharacters):
     17        (JSStringCreateWithUTF8CString):
     18        (JSStringCreateWithCharactersNoCopy):
     19        * API/JSStringRefCF.cpp:
     20        (JSStringCreateWithCFString):
     21        * API/tests/CompareAndSwapTest.cpp:
     22        (testCompareAndSwap):
     23        * API/tests/ExecutionTimeLimitTest.cpp:
     24        (testExecutionTimeLimit):
     25        * API/tests/FunctionOverridesTest.cpp:
     26        (testFunctionOverrides):
     27        * API/tests/MultithreadedMultiVMExecutionTest.cpp:
     28        (startMultithreadedMultiVMExecutionTest):
     29        * API/tests/PingPongStackOverflowTest.cpp:
     30        (testPingPongStackOverflow):
     31        * JavaScriptCore.order:
     32        * assembler/testmasm.cpp:
     33        (JSC::run):
     34        * b3/air/testair.cpp:
     35        (main):
     36        * b3/testb3_1.cpp:
     37        (main):
     38        * dfg/testdfg.cpp:
     39        (main):
     40        * dynbench.cpp:
     41        (main):
     42        * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
     43        (Inspector::RemoteInspector::singleton):
     44        * jsc.cpp:
     45        (main):
     46        (jscmain):
     47        * runtime/InitializeThreading.cpp:
     48        (JSC::initialize):
     49        (JSC::initializeThreading): Deleted.
     50        * runtime/InitializeThreading.h:
     51        * runtime/JSCConfig.h:
     52        * shell/playstation/TestShell.cpp:
     53        (setupTestRun):
     54        * testRegExp.cpp:
     55        (main):
     56
    1572020-06-27  Saam Barati  <sbarati@apple.com>
    258

  • TabularUnified trunk/Source/JavaScriptCore/JavaScriptCore.order

    r263575 r263635  
    1 __ZN3JSC19initializeThreadingEv
    2 __ZN3JSCL23initializeThreadingOnceEv
    31__ZN3WTF17double_conversion10initializeEv
    4 __ZN3WTF19initializeThreadingEv
    52__ZN3WTF10StringImpl5emptyEv
    63__ZN3WTF10fastMallocEm
    … …  
    4845__ZN3WTF8fastFreeEPv
    4946__ZN3JSC13CodeProfiling15notifyAllocatorEPN3WTF13MetaAllocatorE
    50 __ZN3JSC7JSStack19initializeThreadingEv
    5147__ZN3JSC5LLInt10initializeEv
    5248__ZN3WTF19initializeGCThreadsEv

  • TabularUnified trunk/Source/JavaScriptCore/assembler/testmasm.cpp

    r263316 r263635  
    25312531void run(const char* filter)
    25322532{
    2533     JSC::initializeThreading();
     2533    JSC::initialize();
    25342534    unsigned numberOfTests = 0;
    25352535

  • TabularUnified trunk/Source/JavaScriptCore/b3/air/testair.cpp

    r262932 r263635  
    25122512    }
    25132513   
    2514     JSC::initializeThreading();
     2514    JSC::initialize();
    25152515
    25162516    for (unsigned i = 0; i <= 2; ++i) {

  • TabularUnified trunk/Source/JavaScriptCore/b3/testb3_1.cpp

    r263068 r263635  
    908908
    909909    WTF::initializeMainThread();
    910     JSC::initializeThreading();
     910    JSC::initialize();
    911911   
    912912    for (unsigned i = 0; i <= 2; ++i) {

  • TabularUnified trunk/Source/JavaScriptCore/dfg/testdfg.cpp

    r261755 r263635  
    112112    }
    113113
    114     JSC::initializeThreading();
     114    JSC::initialize();
    115115   
    116116    run(filter);

  • TabularUnified trunk/Source/JavaScriptCore/dynbench.cpp

    r251425 r263635  
    8989   
    9090    WTF::initializeMainThread();
    91     JSC::initializeThreading();
     91    JSC::initialize();
    9292
    9393    VM& vm = VM::create(LargeHeap).leakRef();

  • TabularUnified trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteInspectorCocoa.mm

    r262302 r263635  
    9898            dispatch_block_t initialize = ^{
    9999                WTF::initializeMainThread();
    100                 JSC::initializeThreading();
     100                JSC::initialize();
    101101                if (RemoteInspector::startEnabled)
    102102                    shared.get().start();

  • TabularUnified trunk/Source/JavaScriptCore/jsc.cpp

    r263316 r263635  
    26352635#endif
    26362636
    2637     // Need to initialize WTF threading before we start any threads. Cannot initialize JSC
    2638     // threading yet, since that would do somethings that we'd like to defer until after we
     2637    // Need to initialize WTF before we start any threads. Cannot initialize JSC
     2638    // yet, since that would do somethings that we'd like to defer until after we
    26392639    // have a chance to parse options.
    2640     WTF::initializeThreading();
     2640    WTF::initialize();
    26412641
    26422642#if PLATFORM(IOS_FAMILY)
    … …  
    32983298    }
    32993299
    3300     // Initialize JSC before getting VM.
    3301     JSC::initializeThreading();
     3300    JSC::initialize();
    33023301    initializeTimeoutIfNeeded();
    33033302

  • TabularUnified trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

    r263117 r263635  
    5151static_assert(sizeof(bool) == 1, "LLInt and JIT assume sizeof(bool) is always 1 when touching it directly from assembly code.");
    5252
    53 void initializeThreading()
     53void initialize()
    5454{
    55     static std::once_flag initializeThreadingOnceFlag;
     55    static std::once_flag onceFlag;
    5656
    57     std::call_once(initializeThreadingOnceFlag, []{
    58         WTF::initializeThreading();
     57    std::call_once(onceFlag, [] {
     58        WTF::initialize();
    5959        Options::initialize();
    6060
    … …  
    107107
    108108        WTF::compilerFence();
    109         RELEASE_ASSERT(!g_jscConfig.initializeThreadingHasBeenCalled);
    110         g_jscConfig.initializeThreadingHasBeenCalled = true;
     109        RELEASE_ASSERT(!g_jscConfig.initializeHasBeenCalled);
     110        g_jscConfig.initializeHasBeenCalled = true;
    111111    });
    112112}

  • TabularUnified trunk/Source/JavaScriptCore/runtime/InitializeThreading.h

    r206525 r263635  
    3131namespace JSC {
    3232
    33 // This function must be called from the main thread. It is safe to call it repeatedly.
    34 // Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly.
    35 JS_EXPORT_PRIVATE void initializeThreading();
     33JS_EXPORT_PRIVATE void initialize();
    3634
    3735} // namespace JSC

  • TabularUnified trunk/Source/JavaScriptCore/runtime/JSCConfig.h

    r263380 r263635  
    6363
    6464    // The following HasBeenCalled flags are for auditing call_once initialization functions.
    65     bool initializeThreadingHasBeenCalled;
     65    bool initializeHasBeenCalled;
    6666
    6767    struct {

  • TabularUnified trunk/Source/JavaScriptCore/shell/playstation/TestShell.cpp

    r263616 r263635  
    4141#undef STATIC_OPTION
    4242
    43     // Need to initialize WTF threading before we start any threads. Cannot initialize JSC
    44     // threading yet, since that would do somethings that we'd like to defer until after we
     43    // Need to initialize WTF before we start any threads. Cannot initialize JSC
     44    // yet, since that would do somethings that we'd like to defer until after we
    4545    // have a chance to parse options.
    4646    WTF::initializeMainThread();
    … …  
    4949    Config::enableRestrictedOptions();
    5050
    51     JSC::initializeThreading();
     51    JSC::initialize();
    5252
    5353#if ENABLE(WEBASSEMBLY)

  • TabularUnified trunk/Source/JavaScriptCore/testRegExp.cpp

    r261755 r263635  
    166166#endif
    167167
    168     // Initialize JSC before getting VM.
    169     JSC::initializeThreading();
     168    JSC::initialize();
    170169
    171170    // We can't use destructors in the following code because it uses Windows

  • TabularUnified trunk/Source/WTF/ChangeLog

    r263620 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        Reasons:
     9
     10        (1) You need to call it even if you don't use threads.
     11
     12        (2) It initializes things unrelated to threads (like the PRNG).
     13
     14        (3) People seem to get confused about the relationship between
     15        initializeThreading() and initializeMainThread(), and sometimes think
     16        initializeThreading() is a superset. The opposite is true! I think the
     17        confusion may come from "threading" being read as "all threading".
     18
     19        Some filenames still use the legacy name. We can fix that in post.
     20
     21        * benchmarks/ConditionSpeedTest.cpp:
     22        (main):
     23        * benchmarks/HashSetDFGReplay.cpp:
     24        (main):
     25        * benchmarks/LockFairnessTest.cpp:
     26        (main):
     27        * benchmarks/LockSpeedTest.cpp:
     28        (main):
     29        * wtf/MainThread.cpp:
     30        (WTF::initializeMainThread):
     31        * wtf/Threading.cpp:
     32        (WTF::Thread::create):
     33        (WTF::initialize):
     34        (WTF::initializeThreading): Deleted.
     35        * wtf/Threading.h:
     36        (WTF::Thread::current):
     37
    1382020-06-27  Sam Weinig  <weinig@apple.com>
    239

  • TabularUnified trunk/Source/WTF/benchmarks/ConditionSpeedTest.cpp

    r257688 r263635  
    194194int main(int argc, char** argv)
    195195{
    196     WTF::initializeThreading();
     196    WTF::initialize();
    197197
    198198    if (argc != 6

  • TabularUnified trunk/Source/WTF/benchmarks/HashSetDFGReplay.cpp

    r245876 r263635  
    1098510985int main(int, char**)
    1098610986{
    10987     WTF::initializeThreading();
     10987    WTF::initialize();
    1098810988   
    1098910989    WallTime before = WallTime::now();

  • TabularUnified trunk/Source/WTF/benchmarks/LockFairnessTest.cpp

    r248846 r263635  
    116116int main(int argc, char** argv)
    117117{
    118     WTF::initializeThreading();
     118    WTF::initialize();
    119119   
    120120    if (argc != 5

  • TabularUnified trunk/Source/WTF/benchmarks/LockSpeedTest.cpp

    r248846 r263635  
    160160int main(int argc, char** argv)
    161161{
    162     WTF::initializeThreading();
     162    WTF::initialize();
    163163   
    164164    if (argc != 8

  • TabularUnified trunk/Source/WTF/wtf/MainThread.cpp

    r263575 r263635  
    5454    static std::once_flag initializeKey;
    5555    std::call_once(initializeKey, [] {
    56         initializeThreading();
     56        initialize();
    5757        initializeMainThreadPlatform();
    5858        RunLoop::initializeMain();

  • TabularUnified trunk/Source/WTF/wtf/Threading.cpp

    r261661 r263635  
    170170Ref<Thread> Thread::create(const char* name, Function<void()>&& entryPoint, ThreadType threadType)
    171171{
    172     WTF::initializeThreading();
     172    WTF::initialize();
    173173    Ref<Thread> thread = adoptRef(*new Thread());
    174174    Ref<NewThreadContext> context = adoptRef(*new NewThreadContext { name, WTFMove(entryPoint), thread.copyRef() });
    … …  
    353353#endif
    354354
    355 void initializeThreading()
     355void initialize()
    356356{
    357357    static std::once_flag onceKey;

  • TabularUnified trunk/Source/WTF/wtf/Threading.h

    r261384 r263635  
    6767class PrintStream;
    6868
    69 // This function can be called from any threads.
    70 WTF_EXPORT_PRIVATE void initializeThreading();
     69WTF_EXPORT_PRIVATE void initialize();
    7170
    7271#if USE(PTHREADS)
    … …  
    9695public:
    9796    friend class ThreadGroup;
    98     friend WTF_EXPORT_PRIVATE void initializeThreading();
     97    friend WTF_EXPORT_PRIVATE void initialize();
    9998
    10099    WTF_EXPORT_PRIVATE ~Thread();
    … …  
    378377    //    on secondary ones, so there is no need for synchronization here.
    379378    // WRT JavaScriptCore:
    380     //    Thread::initializeTLSKey() is initially called from initializeThreading(), ensuring
     379    //    Thread::initializeTLSKey() is initially called from initialize(), ensuring
    381380    //    this is initially called in a std::call_once locked context.
    382381#if !HAVE(FAST_TLS) && !OS(WINDOWS)
    383382    if (UNLIKELY(Thread::s_key == InvalidThreadSpecificKey))
    384         WTF::initializeThreading();
     383        WTF::initialize();
    385384#endif
    386385    if (auto* thread = currentMayBeNull())

  • TabularUnified trunk/Source/WebCore/ChangeLog

    r263633 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * Modules/webdatabase/DatabaseManager.cpp:
     9        (WebCore::DatabaseManager::openDatabase):
     10        * WebCore.order:
     11        * bindings/js/CommonVM.cpp:
     12        (WebCore::commonVMSlow):
     13        * bindings/js/ScriptController.cpp:
     14        (WebCore::ScriptController::initializeMainThread):
     15        (WebCore::ScriptController::initializeThreading): Deleted.
     16        * bindings/js/ScriptController.h:
     17        * bridge/objc/WebScriptObject.mm:
     18        (+[WebScriptObject initialize]):
     19        * platform/cocoa/SharedBufferCocoa.mm:
     20        (+[WebCoreSharedBufferData initialize]):
     21        * platform/ios/wak/WebCoreThread.mm:
     22        (RunWebThread):
     23
    1242020-06-28  Youenn Fablet  <youenn@apple.com>
    225

  • TabularUnified trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp

    r257688 r263635  
    195195{
    196196    ASSERT(isMainThread());
    197     ScriptController::initializeThreading();
     197
     198    // FIXME: Remove this call to ScriptController::initializeMainThread(). The
     199    // main thread should have been initialized by a WebKit entrypoint already.
     200    // Also, initializeMainThread() does nothing on iOS.
     201    ScriptController::initializeMainThread();
    198202
    199203    bool setVersionInNewDatabase = !creationCallback;

  • TabularUnified trunk/Source/WebCore/WebCore.order

    r262953 r263635  
    25462546__ZN7WebCore16ScriptController42shouldBypassMainWorldContentSecurityPolicyEv
    25472547__ZN7WebCore15JSDOMWindowBase8commonVMEv
    2548 __ZN7WebCore16ScriptController19initializeThreadingEv
    25492548__ZN7WebCore15DOMWrapperWorldC1EPN3JSC2VMEb
    25502549__ZN3WTF9HashTableIPN7WebCore15DOMWrapperWorldES3_NS_17IdentityExtractorENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES8_E3addINS_22IdentityHashTranslatorIS6_EES3_S3_EENS_18HashTableAddResultINS_17HashTableIteratorIS3_S3_S4_S6_S8_S8_EEEERKT0_RKT1_

  • TabularUnified trunk/Source/WebCore/bindings/js/CommonVM.cpp

    r254464 r263635  
    5151    ASSERT(!g_commonVMOrNull);
    5252
    53     ScriptController::initializeThreading();
     53    // FIXME: Remove this call to ScriptController::initializeMainThread(). The
     54    // main thread should have been initialized by a WebKit entrypoint already.
     55    // Also, initializeMainThread() does nothing on iOS.
     56    ScriptController::initializeMainThread();
    5457
    5558    auto& vm = JSC::VM::create(JSC::LargeHeap).leakRef();

  • TabularUnified trunk/Source/WebCore/bindings/js/ScriptController.cpp

    r263628 r263635  
    8383using namespace JSC;
    8484
    85 void ScriptController::initializeThreading()
     85void ScriptController::initializeMainThread()
    8686{
    8787#if !PLATFORM(IOS_FAMILY)
    88     JSC::initializeThreading();
     88    JSC::initialize();
    8989    WTF::initializeMainThread();
    9090#endif

  • TabularUnified trunk/Source/WebCore/bindings/js/ScriptController.h

    r263008 r263635  
    113113    void executeJavaScriptURL(const URL&, RefPtr<SecurityOrigin> = nullptr, ShouldReplaceDocumentIfJavaScriptURL = ReplaceDocumentIfJavaScriptURL);
    114114
    115     // This function must be called from the main thread. It is safe to call it repeatedly.
    116     // Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly.
    117     static void initializeThreading();
     115    static void initializeMainThread();
    118116
    119117    void loadModuleScriptInWorld(LoadableModuleScript&, const String& moduleName, Ref<ModuleFetchParameters>&&, DOMWrapperWorld&);

  • TabularUnified trunk/Source/WebCore/bridge/objc/WebScriptObject.mm

    r263628 r263635  
    165165{
    166166#if !USE(WEB_THREAD)
    167     JSC::initializeThreading();
     167    JSC::initialize();
    168168    WTF::initializeMainThread();
    169169#endif

  • TabularUnified trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm

    r260485 r263635  
    4545{
    4646#if !USE(WEB_THREAD)
    47     JSC::initializeThreading();
     47    JSC::initialize();
    4848    WTF::initializeMainThread();
    4949#endif // !USE(WEB_THREAD)

  • TabularUnified trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm

    r263575 r263635  
    585585    FloatingPointEnvironment::singleton().propagateMainThreadEnvironment();
    586586
    587     // WTF::initializeWebThread() needs to be called before JSC::initializeThreading() since the
     587    // WTF::initializeWebThread() needs to be called before JSC::initialize() since the
    588588    // code invoked by the latter needs to know if it's running on the WebThread. See
    589589    // <rdar://problem/8502487>.
    590590    WTF::initializeWebThread();
    591     JSC::initializeThreading();
     591    JSC::initialize();
    592592   
    593593    // Make sure that the WebThread and the main thread share the same ThreadGlobalData objects.

  • TabularUnified trunk/Source/WebKit/ChangeLog

    r263634 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * Shared/API/c/WKString.cpp:
     9        (WKStringCopyJSString):
     10        * Shared/Cocoa/WebKit2InitializeCocoa.mm:
     11        (WebKit::runInitializationCode):
     12        * Shared/WebKit2Initialize.cpp:
     13        (WebKit::InitializeWebKit2):
     14
    1152020-06-28  Daniel Bates  <dabates@apple.com>
    216

  • TabularUnified trunk/Source/WebKit/Shared/API/c/WKString.cpp

    r244828 r263635  
    134134JSStringRef WKStringCopyJSString(WKStringRef stringRef)
    135135{
    136     JSC::initializeThreading();
     136    JSC::initialize();
    137137    return OpaqueJSString::tryCreate(WebKit::toImpl(stringRef)->string()).leakRef();
    138138}

  • TabularUnified trunk/Source/WebKit/Shared/Cocoa/WebKit2InitializeCocoa.mm

    r263575 r263635  
    5353#endif
    5454
    55     JSC::initializeThreading();
     55    JSC::initialize();
    5656    WTF::initializeMainThread();
    5757

  • TabularUnified trunk/Source/WebKit/Shared/WebKit2Initialize.cpp

    r263575 r263635  
    4040void InitializeWebKit2()
    4141{
    42     JSC::initializeThreading();
     42    JSC::initialize();
    4343    WTF::initializeMainThread();
    4444    AtomString::init();

  • TabularUnified trunk/Source/WebKitLegacy/mac/ChangeLog

    r263609 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * History/WebBackForwardList.mm:
     9        (+[WebBackForwardList initialize]):
     10        * History/WebHistoryItem.mm:
     11        (+[WebHistoryItem initialize]):
     12        * Misc/WebCache.mm:
     13        (+[WebCache initialize]):
     14        * Misc/WebElementDictionary.mm:
     15        (+[WebElementDictionary initialize]):
     16        * Misc/WebIconDatabase.mm:
     17        * Misc/WebStringTruncator.mm:
     18        (+[WebStringTruncator initialize]):
     19        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
     20        (+[WebHostedNetscapePluginView initialize]):
     21        * Plugins/WebBaseNetscapePluginView.mm:
     22        * Plugins/WebBasePluginPackage.mm:
     23        (+[WebBasePluginPackage initialize]):
     24        * Plugins/WebNetscapePluginView.mm:
     25        (+[WebNetscapePluginView initialize]):
     26        * WebCoreSupport/WebEditorClient.mm:
     27        (+[WebUndoStep initialize]):
     28        * WebCoreSupport/WebFrameLoaderClient.mm:
     29        (+[WebFramePolicyListener initialize]):
     30        * WebView/WebArchive.mm:
     31        (+[WebArchivePrivate initialize]):
     32        * WebView/WebDataSource.mm:
     33        (+[WebDataSource initialize]):
     34        * WebView/WebHTMLView.mm:
     35        (+[WebHTMLViewPrivate initialize]):
     36        (+[WebHTMLView initialize]):
     37        * WebView/WebPreferences.mm:
     38        (+[WebPreferences initialize]):
     39        * WebView/WebResource.mm:
     40        (+[WebResourcePrivate initialize]):
     41        * WebView/WebTextIterator.mm:
     42        (+[WebTextIteratorPrivate initialize]):
     43        * WebView/WebView.mm:
     44        (+[WebView initialize]):
     45        * WebView/WebViewData.mm:
     46        (+[WebViewPrivate initialize]):
     47
    1482020-06-26  Geoffrey Garen  <ggaren@apple.com>
    249

  • TabularUnified trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm

    r263575 r263635  
    9999{
    100100#if !PLATFORM(IOS_FAMILY)
    101     JSC::initializeThreading();
     101    JSC::initialize();
    102102    WTF::initializeMainThread();
    103103#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/History/WebHistoryItem.mm

    r263575 r263635  
    126126{
    127127#if !PLATFORM(IOS_FAMILY)
    128     JSC::initializeThreading();
     128    JSC::initialize();
    129129    WTF::initializeMainThread();
    130130#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm

    r263575 r263635  
    6464{
    6565#if !PLATFORM(IOS_FAMILY)
    66     JSC::initializeThreading();
     66    JSC::initialize();
    6767    WTF::initializeMainThread();
    6868#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm

    r263575 r263635  
    6868{
    6969#if !PLATFORM(IOS_FAMILY)
    70     JSC::initializeThreading();
     70    JSC::initialize();
    7171    WTF::initializeMainThread();
    7272#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm

    r263575 r263635  
    9898+ (void)initialize
    9999{
    100     JSC::initializeThreading();
     100    JSC::initialize();
    101101    WTF::initializeMainThread();
    102102}

  • TabularUnified trunk/Source/WebKitLegacy/mac/Misc/WebStringTruncator.mm

    r251164 r263635  
    5151+ (void)initialize
    5252{
    53     JSC::initializeThreading();
     53    JSC::initialize();
    5454    WTF::initializeMainThread();
    5555}

  • TabularUnified trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r263575 r263635  
    106106{
    107107#if !PLATFORM(IOS_FAMILY)
    108     JSC::initializeThreading();
     108    JSC::initialize();
    109109    WTF::initializeMainThread();
    110110#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm

    r263575 r263635  
    7171+ (void)initialize
    7272{
    73     JSC::initializeThreading();
     73    JSC::initialize();
    7474    WTF::initializeMainThread();
    7575    WebKit::sendUserChangeNotifications();

  • TabularUnified trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm

    r263575 r263635  
    6060{
    6161#if !PLATFORM(IOS_FAMILY)
    62     JSC::initializeThreading();
     62    JSC::initialize();
    6363    WTF::initializeMainThread();
    6464#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm

    r263575 r263635  
    163163+ (void)initialize
    164164{
    165     JSC::initializeThreading();
     165    JSC::initialize();
    166166    WTF::initializeMainThread();
    167167    sendUserChangeNotifications();

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm

    r263575 r263635  
    139139{
    140140#if !PLATFORM(IOS_FAMILY)
    141     JSC::initializeThreading();
     141    JSC::initialize();
    142142    WTF::initializeMainThread();
    143143#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r263575 r263635  
    23432343{
    23442344#if !PLATFORM(IOS_FAMILY)
    2345     JSC::initializeThreading();
     2345    JSC::initialize();
    23462346    WTF::initializeMainThread();
    23472347#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebArchive.mm

    r263575 r263635  
    7070{
    7171#if !PLATFORM(IOS_FAMILY)
    72     JSC::initializeThreading();
     72    JSC::initialize();
    7373    WTF::initializeMainThread();
    7474#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm

    r263575 r263635  
    154154    if (self == [WebDataSource class]) {
    155155#if !PLATFORM(IOS_FAMILY)
    156         JSC::initializeThreading();
     156        JSC::initialize();
    157157        WTF::initializeMainThread();
    158158#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

    r263575 r263635  
    10321032    // And some of this work is likely redundant since +[WebHTMLView initialize] is guaranteed to run first.
    10331033
    1034     JSC::initializeThreading();
     1034    JSC::initialize();
    10351035    WTF::initializeMainThread();
    10361036
    … …  
    25662566    [NSApp registerServicesMenuSendTypes:[[self class] _selectionPasteboardTypes] returnTypes:[[self class] _insertablePasteboardTypes]];
    25672567
    2568     JSC::initializeThreading();
     2568    JSC::initialize();
    25692569    WTF::initializeMainThread();
    25702570}

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r263575 r263635  
    388388{
    389389#if !PLATFORM(IOS_FAMILY)
    390     JSC::initializeThreading();
     390    JSC::initialize();
    391391    WTF::initializeMainThread();
    392392    bool attachmentElementEnabled = MacApplication::isAppleMail();

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebResource.mm

    r263575 r263635  
    6868{
    6969#if !PLATFORM(IOS_FAMILY)
    70     JSC::initializeThreading();
     70    JSC::initialize();
    7171    WTF::initializeMainThread();
    7272#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebTextIterator.mm

    r263575 r263635  
    4848{
    4949#if !PLATFORM(IOS_FAMILY)
    50     JSC::initializeThreading();
     50    JSC::initialize();
    5151    WTF::initializeMainThread();
    5252#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r263575 r263635  
    55585558
    55595559#if !PLATFORM(IOS_FAMILY)
    5560     JSC::initializeThreading();
     5560    JSC::initialize();
    55615561    WTF::initializeMainThread();
    55625562#endif

  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm

    r263575 r263635  
    168168{
    169169#if !PLATFORM(IOS_FAMILY)
    170     JSC::initializeThreading();
     170    JSC::initialize();
    171171    WTF::initializeMainThread();
    172172#endif

  • TabularUnified trunk/Source/WebKitLegacy/win/ChangeLog

    r263575 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * WebKitClassFactory.cpp:
     9        (WebKitClassFactory::WebKitClassFactory):
     10        * WebView.cpp:
     11        (WebView::WebView):
     12
    1132020-06-26  Geoffrey Garen  <ggaren@apple.com>
    214

  • TabularUnified trunk/Source/WebKitLegacy/win/WebKitClassFactory.cpp

    r219684 r263635  
    6464    : m_targetClass(targetClass)
    6565{
    66     JSC::initializeThreading();
     66    JSC::initialize();
    6767    WTF::initializeMainThread();
    6868

  • TabularUnified trunk/Source/WebKitLegacy/win/WebView.cpp

    r263575 r263635  
    421421WebView::WebView()
    422422{
    423     JSC::initializeThreading();
     423    JSC::initialize();
    424424    WTF::initializeMainThread();
    425425    WTF::setProcessPrivileges(allPrivileges());

  • TabularUnified trunk/Tools/ChangeLog

    r263630 r263635  
     12020-06-28  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rename initializeThreading to initialize
     4        https://bugs.webkit.org/show_bug.cgi?id=213674
     5
     6        Reviewed by Mark Lam.
     7
     8        * TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp:
     9        (ApplicationManifestParserTest::SetUp):
     10        * TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:
     11        (TestWebKitAPI::ComplexTextControllerTest::SetUp):
     12        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
     13        (TestWebKitAPI::ContentExtensionTest::SetUp):
     14        * TestWebKitAPI/Tests/WebCore/StringUtilities.mm:
     15        (TestWebKitAPI::TEST):
     16        * TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
     17        (TestWebKitAPI::WebCoreNSURLSessionTest::SetUp):
     18        * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:
     19        (WebKitTestServer::WebKitTestServer):
     20        * WebKitTestRunner/TestController.cpp:
     21        (WTR::TestController::initialize):
     22
    1232020-06-27  Daniel Bates  <dabates@apple.com>
    224

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp

    r263575 r263635  
    5757    virtual void SetUp()
    5858    {
    59         JSC::initializeThreading();
     59        JSC::initialize();
    6060        WTF::initializeMainThread();
    6161

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp

    r263575 r263635  
    4040    virtual void SetUp()
    4141    {
    42         JSC::initializeThreading();
     42        JSC::initialize();
    4343        WTF::initializeMainThread();
    4444    }

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp

    r263575 r263635  
    7676    virtual void SetUp()
    7777    {
    78         JSC::initializeThreading();
     78        JSC::initialize();
    7979        WTF::initializeMainThread();
    8080    }

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/StringUtilities.mm

    r263133 r263635  
    3636TEST(WebCore, WildcardStringMatching)
    3737{
    38     JSC::initializeThreading();
     38    JSC::initialize();
    3939
    4040    String wildcardString = "a*b";

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm

    r244857 r263635  
    115115    {
    116116#if PLATFORM(IOS_FAMILY)
    117         JSC::initializeThreading();
     117        JSC::initialize();
    118118#endif
    119119        view = [[WebView alloc] initWithFrame:NSZeroRect];

  • TabularUnified trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp

    r246677 r263635  
    2828{
    2929    if (options & ServerRunInThread) {
    30         WTF::initializeThreading();
     30        WTF::initialize();
    3131        m_queue = WorkQueue::create("WebKitTestServer");
    3232    }

  • TabularUnified trunk/Tools/WebKitTestRunner/TestController.cpp

    r263575 r263635  
    445445    AutodrainedPool pool;
    446446
    447     JSC::initializeThreading();
     447    JSC::initialize();
    448448    WTF::initializeMainThread();
    449449    WTF::setProcessPrivileges(allPrivileges());
Note: See TracChangeset for help on using the changeset viewer.