source: webkit/trunk/JavaScriptCore/API/APIShims.h@ 57829

Last change on this file since 57829 was 57829, checked in by [email protected], 15 years ago

https://bugs.webkit.org/show_bug.cgi?id=37745
Move string uniquing tables to (new) WTFThreadData class.

Reviewed by Sam Weinig.

Remove AtomicString's dependency on ThreadGlobalData so that we can move
WebCore's string classes up to WTF.

JavaScriptCore:

WTFThreadData.cpp/.h are based on ThreadGlobalData from WebCore.
Moved JSC & WebCore's string uniquing tables to this class.

This patch introduces a temporary layering violation in providing forward
declarations of classes from JSC and WTF; this will be resolved as we move
more string code up to WTF.

  • API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
(JSC::APIEntryShimWithoutLock::~APIEntryShimWithoutLock):
(JSC::APICallbackShim::APICallbackShim):
(JSC::APICallbackShim::~APICallbackShim):

(JSC::checkSyntax):
(JSC::evaluate):

  • runtime/Identifier.cpp:

(JSC::Identifier::remove):
(JSC::Identifier::checkCurrentIdentifierTable):

  • runtime/Identifier.h:
  • runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):

  • runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::create):

  • wtf/WTFThreadData.cpp: Copied from WebCore/platform/ThreadGlobalData.cpp.

(WTF::WTFThreadData::WTFThreadData):
(WTF::WTFThreadData::~WTFThreadData):

  • wtf/WTFThreadData.h: Copied from WebCore/platform/ThreadGlobalData.h.

(WTF::WTFThreadData::atomicStringTable):
(WTF::WTFThreadData::initializeIdentifierTable):
(WTF::WTFThreadData::currentIdentifierTable):
(WTF::WTFThreadData::setCurrentIdentifierTable):
(WTF::WTFThreadData::resetCurrentIdentifierTable):
(WTF::wtfThreadData):

JavaScriptGlue:

  • ForwardingHeaders/wtf/WTFThreadData.h: Added.
  • JSUtils.cpp: Update

(JSGlueAPIEntry::JSGlueAPIEntry):
(JSGlueAPIEntry::~JSGlueAPIEntry):
(JSGlueAPICallback::JSGlueAPICallback):
(JSGlueAPICallback::~JSGlueAPICallback):

WebCore:

  • ForwardingHeaders/wtf/WTFThreadData.h: Added.
  • platform/ThreadGlobalData.cpp: Remove m_atomicStringTable, all wtfThreadData() to ensure threadsafely initialized.

(WebCore::ThreadGlobalData::ThreadGlobalData):
(WebCore::ThreadGlobalData::~ThreadGlobalData):

  • platform/ThreadGlobalData.h: Remove m_atomicStringTable.

(WebCore::ThreadGlobalData::eventNames):

  • platform/text/AtomicString.cpp:

(WebCore::AtomicStringTable::create):
(WebCore::AtomicStringTable::table):
(WebCore::AtomicStringTable::destroy):
(WebCore::stringTable): Access the AtomicStringTable on wtfThreadData() rather then threadGlobalData().

File size: 3.1 KB
Line 
1/*
2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#ifndef APIShims_h
27#define APIShims_h
28
29#include "CallFrame.h"
30#include "JSLock.h"
31#include <wtf/WTFThreadData.h>
32
33namespace JSC {
34
35class APIEntryShimWithoutLock {
36protected:
37 APIEntryShimWithoutLock(JSGlobalData* globalData, bool registerThread)
38 : m_globalData(globalData)
39 , m_entryIdentifierTable(wtfThreadData().setCurrentIdentifierTable(globalData->identifierTable))
40 {
41 if (registerThread)
42 globalData->heap.registerThread();
43 m_globalData->timeoutChecker.start();
44 }
45
46 ~APIEntryShimWithoutLock()
47 {
48 m_globalData->timeoutChecker.stop();
49 wtfThreadData().setCurrentIdentifierTable(m_entryIdentifierTable);
50 }
51
52private:
53 JSGlobalData* m_globalData;
54 IdentifierTable* m_entryIdentifierTable;
55};
56
57class APIEntryShim : public APIEntryShimWithoutLock {
58public:
59 // Normal API entry
60 APIEntryShim(ExecState* exec, bool registerThread = true)
61 : APIEntryShimWithoutLock(&exec->globalData(), registerThread)
62 , m_lock(exec)
63 {
64 }
65
66 // JSPropertyNameAccumulator only has a globalData.
67 APIEntryShim(JSGlobalData* globalData, bool registerThread = true)
68 : APIEntryShimWithoutLock(globalData, registerThread)
69 , m_lock(globalData->isSharedInstance ? LockForReal : SilenceAssertionsOnly)
70 {
71 }
72
73private:
74 JSLock m_lock;
75};
76
77class APICallbackShim {
78public:
79 APICallbackShim(ExecState* exec)
80 : m_dropAllLocks(exec)
81 , m_globalData(&exec->globalData())
82 {
83 wtfThreadData().resetCurrentIdentifierTable();
84 }
85
86 ~APICallbackShim()
87 {
88 wtfThreadData().setCurrentIdentifierTable(m_globalData->identifierTable);
89 }
90
91private:
92 JSLock::DropAllLocks m_dropAllLocks;
93 JSGlobalData* m_globalData;
94};
95
96}
97
98#endif
Note: See TracBrowser for help on using the repository browser.