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

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

Fixed <rdar://problem/8310571> CrashTracer: 60 crashes in Photo Booth at
com.apple.JavaScriptCore: JSC::Heap::markRoots + 746

Reviewed by Gavin Barraclough.

  • API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock): Call our new
synchronize() function.

  • runtime/Collector.cpp:

(JSC::Heap::activityCallback):

  • runtime/Collector.h: Added an activityCallback() accessor, for the

call above.

  • runtime/GCActivityCallback.h:

(JSC::GCActivityCallback::synchronize):

  • runtime/GCActivityCallbackCF.cpp:

(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::~DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::operator()):
(JSC::DefaultGCActivityCallback::synchronize): Track the run loop we're
scheduled in. If we begin/resume execution within a new run loop, reschedule
on it. This prevents a crash when using a lockless context group on
multiple threads -- the crash would happen if the GC timer scheduled on
thread A, then you continued execution on thread B, then the thread A
timer fired.

File size: 3.2 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 "GCActivityCallback.h"
31#include "JSLock.h"
32#include <wtf/WTFThreadData.h>
33
34namespace JSC {
35
36class APIEntryShimWithoutLock {
37protected:
38 APIEntryShimWithoutLock(JSGlobalData* globalData, bool registerThread)
39 : m_globalData(globalData)
40 , m_entryIdentifierTable(wtfThreadData().setCurrentIdentifierTable(globalData->identifierTable))
41 {
42 if (registerThread)
43 globalData->heap.registerThread();
44 m_globalData->heap.activityCallback()->synchronize();
45 m_globalData->timeoutChecker.start();
46 }
47
48 ~APIEntryShimWithoutLock()
49 {
50 m_globalData->timeoutChecker.stop();
51 wtfThreadData().setCurrentIdentifierTable(m_entryIdentifierTable);
52 }
53
54private:
55 JSGlobalData* m_globalData;
56 IdentifierTable* m_entryIdentifierTable;
57};
58
59class APIEntryShim : public APIEntryShimWithoutLock {
60public:
61 // Normal API entry
62 APIEntryShim(ExecState* exec, bool registerThread = true)
63 : APIEntryShimWithoutLock(&exec->globalData(), registerThread)
64 , m_lock(exec)
65 {
66 }
67
68 // JSPropertyNameAccumulator only has a globalData.
69 APIEntryShim(JSGlobalData* globalData, bool registerThread = true)
70 : APIEntryShimWithoutLock(globalData, registerThread)
71 , m_lock(globalData->isSharedInstance() ? LockForReal : SilenceAssertionsOnly)
72 {
73 }
74
75private:
76 JSLock m_lock;
77};
78
79class APICallbackShim {
80public:
81 APICallbackShim(ExecState* exec)
82 : m_dropAllLocks(exec)
83 , m_globalData(&exec->globalData())
84 {
85 wtfThreadData().resetCurrentIdentifierTable();
86 }
87
88 ~APICallbackShim()
89 {
90 m_globalData->heap.activityCallback()->synchronize();
91 wtfThreadData().setCurrentIdentifierTable(m_globalData->identifierTable);
92 }
93
94private:
95 JSLock::DropAllLocks m_dropAllLocks;
96 JSGlobalData* m_globalData;
97};
98
99}
100
101#endif
Note: See TracBrowser for help on using the repository browser.