Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: Source/platform/Timer.h

Issue 1120943002: Various ASan exemptions to allow Oilpan pre-sweep poisoning of unmarkeds. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef Timer_h 26 #ifndef Timer_h
27 #define Timer_h 27 #define Timer_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/heap/AddressSanitizer.h"
30 #include "platform/heap/Handle.h" 31 #include "platform/heap/Handle.h"
31 #include "public/platform/WebTraceLocation.h" 32 #include "public/platform/WebTraceLocation.h"
32 #include "wtf/Noncopyable.h" 33 #include "wtf/Noncopyable.h"
33 #include "wtf/Threading.h" 34 #include "wtf/Threading.h"
34 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
35 36
36 namespace blink { 37 namespace blink {
37 38
38 // Time intervals are all in seconds. 39 // Time intervals are all in seconds.
39 40
(...skipping 25 matching lines...) Expand all
65 void augmentRepeatInterval(double delta) { 66 void augmentRepeatInterval(double delta) {
66 setNextFireTime(m_nextFireTime + delta); 67 setNextFireTime(m_nextFireTime + delta);
67 m_repeatInterval += delta; 68 m_repeatInterval += delta;
68 } 69 }
69 70
70 void didChangeAlignmentInterval(); 71 void didChangeAlignmentInterval();
71 72
72 private: 73 private:
73 virtual void fired() = 0; 74 virtual void fired() = 0;
74 75
76 NO_LAZY_SWEEP_SANITIZE_ADDRESS
75 virtual double alignedFireTime(double fireTime) const { return fireTime; } 77 virtual double alignedFireTime(double fireTime) const { return fireTime; }
76 78
77 void checkConsistency() const; 79 void checkConsistency() const;
78 void checkHeapIndex() const; 80 void checkHeapIndex() const;
79 81
80 void setNextFireTime(double); 82 void setNextFireTime(double);
81 83
84 NO_LAZY_SWEEP_SANITIZE_ADDRESS
82 bool inHeap() const { return m_heapIndex != -1; } 85 bool inHeap() const { return m_heapIndex != -1; }
83 86
84 bool hasValidHeapPosition() const; 87 bool hasValidHeapPosition() const;
85 void updateHeapIfNeeded(double oldTime); 88 void updateHeapIfNeeded(double oldTime);
86 89
87 void heapDecreaseKey(); 90 void heapDecreaseKey();
88 void heapDelete(); 91 void heapDelete();
89 void heapDeleteMin(); 92 void heapDeleteMin();
90 void heapIncreaseKey(); 93 void heapIncreaseKey();
91 void heapInsert(); 94 void heapInsert();
92 void heapPop(); 95 void heapPop();
93 void heapPopMin(); 96 void heapPopMin();
94 97
98 NO_LAZY_SWEEP_SANITIZE_ADDRESS
95 Vector<TimerBase*>& timerHeap() const { ASSERT(m_cachedThreadGlobalTimerHeap ); return *m_cachedThreadGlobalTimerHeap; } 99 Vector<TimerBase*>& timerHeap() const { ASSERT(m_cachedThreadGlobalTimerHeap ); return *m_cachedThreadGlobalTimerHeap; }
96 100
97 double m_nextFireTime; // 0 if inactive 101 double m_nextFireTime; // 0 if inactive
98 double m_unalignedNextFireTime; // m_nextFireTime not considering alignment interval 102 double m_unalignedNextFireTime; // m_nextFireTime not considering alignment interval
99 double m_repeatInterval; // 0 if not repeating 103 double m_repeatInterval; // 0 if not repeating
100 int m_heapIndex; // -1 if not in heap 104 int m_heapIndex; // -1 if not in heap
101 unsigned m_heapInsertionOrder; // Used to keep order among equal-fire-time t imers 105 unsigned m_heapInsertionOrder; // Used to keep order among equal-fire-time t imers
102 Vector<TimerBase*>* m_cachedThreadGlobalTimerHeap; 106 Vector<TimerBase*>* m_cachedThreadGlobalTimerHeap;
103 WebTraceLocation m_location; 107 WebTraceLocation m_location;
104 108
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 151
148 private: 152 private:
149 // FIXME: oilpan: TimerBase should be moved to the heap and m_object should be traced. 153 // FIXME: oilpan: TimerBase should be moved to the heap and m_object should be traced.
150 // This raw pointer is safe as long as Timer<X> is held by the X itself (Tha t's the case 154 // This raw pointer is safe as long as Timer<X> is held by the X itself (Tha t's the case
151 // in the current code base). 155 // in the current code base).
152 GC_PLUGIN_IGNORE("363031") 156 GC_PLUGIN_IGNORE("363031")
153 TimerFiredClass* m_object; 157 TimerFiredClass* m_object;
154 TimerFiredFunction m_function; 158 TimerFiredFunction m_function;
155 }; 159 };
156 160
161 NO_LAZY_SWEEP_SANITIZE_ADDRESS
157 inline bool TimerBase::isActive() const 162 inline bool TimerBase::isActive() const
158 { 163 {
159 ASSERT(m_thread == currentThread()); 164 ASSERT(m_thread == currentThread());
160 return m_nextFireTime; 165 return m_nextFireTime;
161 } 166 }
162 167
163 } 168 }
164 169
165 #endif 170 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698