OLD | NEW |
1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 Handle<JSWeakSet> weakset(JSWeakSet::cast(*weakset_obj)); | 48 Handle<JSWeakSet> weakset(JSWeakSet::cast(*weakset_obj)); |
49 // Do not leak handles for the hash table, it would make entries strong. | 49 // Do not leak handles for the hash table, it would make entries strong. |
50 { | 50 { |
51 HandleScope scope(isolate); | 51 HandleScope scope(isolate); |
52 Handle<ObjectHashTable> table = ObjectHashTable::New(isolate, 1); | 52 Handle<ObjectHashTable> table = ObjectHashTable::New(isolate, 1); |
53 weakset->set_table(*table); | 53 weakset->set_table(*table); |
54 } | 54 } |
55 return weakset; | 55 return weakset; |
56 } | 56 } |
57 | 57 |
| 58 static void PutIntoWeakSet(Handle<JSWeakSet> weakset, |
| 59 Handle<JSObject> key, |
| 60 Handle<Object> value) { |
| 61 Runtime::WeakCollectionSet(weakset, key, value); |
| 62 } |
| 63 |
58 static int NumberOfWeakCalls = 0; | 64 static int NumberOfWeakCalls = 0; |
59 static void WeakPointerCallback( | 65 static void WeakPointerCallback( |
60 const v8::WeakCallbackData<v8::Value, void>& data) { | 66 const v8::WeakCallbackData<v8::Value, void>& data) { |
61 std::pair<v8::Persistent<v8::Value>*, int>* p = | 67 std::pair<v8::Persistent<v8::Value>*, int>* p = |
62 reinterpret_cast<std::pair<v8::Persistent<v8::Value>*, int>*>( | 68 reinterpret_cast<std::pair<v8::Persistent<v8::Value>*, int>*>( |
63 data.GetParameter()); | 69 data.GetParameter()); |
64 DCHECK_EQ(1234, p->second); | 70 DCHECK_EQ(1234, p->second); |
65 NumberOfWeakCalls++; | 71 NumberOfWeakCalls++; |
66 p->first->Reset(); | 72 p->first->Reset(); |
67 } | 73 } |
(...skipping 15 matching lines...) Expand all Loading... |
83 HandleScope scope(isolate); | 89 HandleScope scope(isolate); |
84 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); | 90 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); |
85 Handle<JSObject> object = factory->NewJSObjectFromMap(map); | 91 Handle<JSObject> object = factory->NewJSObjectFromMap(map); |
86 key = global_handles->Create(*object); | 92 key = global_handles->Create(*object); |
87 } | 93 } |
88 CHECK(!global_handles->IsWeak(key.location())); | 94 CHECK(!global_handles->IsWeak(key.location())); |
89 | 95 |
90 // Put entry into weak set. | 96 // Put entry into weak set. |
91 { | 97 { |
92 HandleScope scope(isolate); | 98 HandleScope scope(isolate); |
93 Handle<Smi> smi(Smi::FromInt(23), isolate); | 99 PutIntoWeakSet(weakset, |
94 Runtime::WeakCollectionSet(weakset, key, smi); | 100 Handle<JSObject>(JSObject::cast(*key)), |
| 101 Handle<Smi>(Smi::FromInt(23), isolate)); |
95 } | 102 } |
96 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 103 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
97 | 104 |
98 // Force a full GC. | 105 // Force a full GC. |
99 heap->CollectAllGarbage(false); | 106 heap->CollectAllGarbage(false); |
100 CHECK_EQ(0, NumberOfWeakCalls); | 107 CHECK_EQ(0, NumberOfWeakCalls); |
101 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 108 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
102 CHECK_EQ( | 109 CHECK_EQ( |
103 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); | 110 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); |
104 | 111 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 | 145 |
139 // Check initial capacity. | 146 // Check initial capacity. |
140 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity()); | 147 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity()); |
141 | 148 |
142 // Fill up weak set to trigger capacity change. | 149 // Fill up weak set to trigger capacity change. |
143 { | 150 { |
144 HandleScope scope(isolate); | 151 HandleScope scope(isolate); |
145 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); | 152 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); |
146 for (int i = 0; i < 32; i++) { | 153 for (int i = 0; i < 32; i++) { |
147 Handle<JSObject> object = factory->NewJSObjectFromMap(map); | 154 Handle<JSObject> object = factory->NewJSObjectFromMap(map); |
148 Handle<Smi> smi(Smi::FromInt(i), isolate); | 155 PutIntoWeakSet(weakset, object, Handle<Smi>(Smi::FromInt(i), isolate)); |
149 Runtime::WeakCollectionSet(weakset, object, smi); | |
150 } | 156 } |
151 } | 157 } |
152 | 158 |
153 // Check increased capacity. | 159 // Check increased capacity. |
154 CHECK_EQ(128, ObjectHashTable::cast(weakset->table())->Capacity()); | 160 CHECK_EQ(128, ObjectHashTable::cast(weakset->table())->Capacity()); |
155 | 161 |
156 // Force a full GC. | 162 // Force a full GC. |
157 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 163 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
158 CHECK_EQ( | 164 CHECK_EQ( |
159 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); | 165 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); |
(...skipping 26 matching lines...) Expand all Loading... |
186 Page* first_page = heap->old_pointer_space()->anchor()->next_page(); | 192 Page* first_page = heap->old_pointer_space()->anchor()->next_page(); |
187 factory->NewFixedArray(900 * KB / kPointerSize, TENURED); | 193 factory->NewFixedArray(900 * KB / kPointerSize, TENURED); |
188 | 194 |
189 // Fill up weak set with values on an evacuation candidate. | 195 // Fill up weak set with values on an evacuation candidate. |
190 { | 196 { |
191 HandleScope scope(isolate); | 197 HandleScope scope(isolate); |
192 for (int i = 0; i < 32; i++) { | 198 for (int i = 0; i < 32; i++) { |
193 Handle<JSObject> object = factory->NewJSObject(function, TENURED); | 199 Handle<JSObject> object = factory->NewJSObject(function, TENURED); |
194 CHECK(!heap->InNewSpace(object->address())); | 200 CHECK(!heap->InNewSpace(object->address())); |
195 CHECK(!first_page->Contains(object->address())); | 201 CHECK(!first_page->Contains(object->address())); |
196 Runtime::WeakCollectionSet(weakset, key, object); | 202 PutIntoWeakSet(weakset, key, object); |
197 } | 203 } |
198 } | 204 } |
199 | 205 |
200 // Force compacting garbage collection. | 206 // Force compacting garbage collection. |
201 CHECK(FLAG_always_compact); | 207 CHECK(FLAG_always_compact); |
202 heap->CollectAllGarbage(Heap::kNoGCFlags); | 208 heap->CollectAllGarbage(Heap::kNoGCFlags); |
203 } | 209 } |
204 | 210 |
205 | 211 |
206 // Test that weak set keys on an evacuation candidate which are reachable by | 212 // Test that weak set keys on an evacuation candidate which are reachable by |
(...skipping 19 matching lines...) Expand all Loading... |
226 | 232 |
227 // Fill up weak set with keys on an evacuation candidate. | 233 // Fill up weak set with keys on an evacuation candidate. |
228 Handle<JSObject> keys[32]; | 234 Handle<JSObject> keys[32]; |
229 for (int i = 0; i < 32; i++) { | 235 for (int i = 0; i < 32; i++) { |
230 keys[i] = factory->NewJSObject(function, TENURED); | 236 keys[i] = factory->NewJSObject(function, TENURED); |
231 CHECK(!heap->InNewSpace(keys[i]->address())); | 237 CHECK(!heap->InNewSpace(keys[i]->address())); |
232 CHECK(!first_page->Contains(keys[i]->address())); | 238 CHECK(!first_page->Contains(keys[i]->address())); |
233 } | 239 } |
234 Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate); | 240 Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate); |
235 for (int i = 0; i < 32; i++) { | 241 for (int i = 0; i < 32; i++) { |
236 Handle<Smi> smi(Smi::FromInt(i), isolate); | 242 PutIntoWeakSet(weakset, |
237 Runtime::WeakCollectionSet(weakset, keys[i], smi); | 243 keys[i], |
| 244 Handle<Smi>(Smi::FromInt(i), isolate)); |
238 } | 245 } |
239 | 246 |
240 // Force compacting garbage collection. The subsequent collections are used | 247 // Force compacting garbage collection. The subsequent collections are used |
241 // to verify that key references were actually updated. | 248 // to verify that key references were actually updated. |
242 CHECK(FLAG_always_compact); | 249 CHECK(FLAG_always_compact); |
243 heap->CollectAllGarbage(Heap::kNoGCFlags); | 250 heap->CollectAllGarbage(Heap::kNoGCFlags); |
244 heap->CollectAllGarbage(Heap::kNoGCFlags); | 251 heap->CollectAllGarbage(Heap::kNoGCFlags); |
245 heap->CollectAllGarbage(Heap::kNoGCFlags); | 252 heap->CollectAllGarbage(Heap::kNoGCFlags); |
246 } | 253 } |
OLD | NEW |