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 | |
64 static int NumberOfWeakCalls = 0; | 58 static int NumberOfWeakCalls = 0; |
65 static void WeakPointerCallback( | 59 static void WeakPointerCallback( |
66 const v8::WeakCallbackData<v8::Value, void>& data) { | 60 const v8::WeakCallbackData<v8::Value, void>& data) { |
67 std::pair<v8::Persistent<v8::Value>*, int>* p = | 61 std::pair<v8::Persistent<v8::Value>*, int>* p = |
68 reinterpret_cast<std::pair<v8::Persistent<v8::Value>*, int>*>( | 62 reinterpret_cast<std::pair<v8::Persistent<v8::Value>*, int>*>( |
69 data.GetParameter()); | 63 data.GetParameter()); |
70 DCHECK_EQ(1234, p->second); | 64 DCHECK_EQ(1234, p->second); |
71 NumberOfWeakCalls++; | 65 NumberOfWeakCalls++; |
72 p->first->Reset(); | 66 p->first->Reset(); |
73 } | 67 } |
(...skipping 15 matching lines...) Expand all Loading... |
89 HandleScope scope(isolate); | 83 HandleScope scope(isolate); |
90 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); | 84 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); |
91 Handle<JSObject> object = factory->NewJSObjectFromMap(map); | 85 Handle<JSObject> object = factory->NewJSObjectFromMap(map); |
92 key = global_handles->Create(*object); | 86 key = global_handles->Create(*object); |
93 } | 87 } |
94 CHECK(!global_handles->IsWeak(key.location())); | 88 CHECK(!global_handles->IsWeak(key.location())); |
95 | 89 |
96 // Put entry into weak set. | 90 // Put entry into weak set. |
97 { | 91 { |
98 HandleScope scope(isolate); | 92 HandleScope scope(isolate); |
99 PutIntoWeakSet(weakset, | 93 Handle<Smi> smi(Smi::FromInt(23), isolate); |
100 Handle<JSObject>(JSObject::cast(*key)), | 94 Runtime::WeakCollectionSet(weakset, key, smi); |
101 Handle<Smi>(Smi::FromInt(23), isolate)); | |
102 } | 95 } |
103 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 96 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
104 | 97 |
105 // Force a full GC. | 98 // Force a full GC. |
106 heap->CollectAllGarbage(false); | 99 heap->CollectAllGarbage(false); |
107 CHECK_EQ(0, NumberOfWeakCalls); | 100 CHECK_EQ(0, NumberOfWeakCalls); |
108 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 101 CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
109 CHECK_EQ( | 102 CHECK_EQ( |
110 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); | 103 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); |
111 | 104 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 138 |
146 // Check initial capacity. | 139 // Check initial capacity. |
147 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity()); | 140 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity()); |
148 | 141 |
149 // Fill up weak set to trigger capacity change. | 142 // Fill up weak set to trigger capacity change. |
150 { | 143 { |
151 HandleScope scope(isolate); | 144 HandleScope scope(isolate); |
152 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); | 145 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); |
153 for (int i = 0; i < 32; i++) { | 146 for (int i = 0; i < 32; i++) { |
154 Handle<JSObject> object = factory->NewJSObjectFromMap(map); | 147 Handle<JSObject> object = factory->NewJSObjectFromMap(map); |
155 PutIntoWeakSet(weakset, object, Handle<Smi>(Smi::FromInt(i), isolate)); | 148 Handle<Smi> smi(Smi::FromInt(i), isolate); |
| 149 Runtime::WeakCollectionSet(weakset, object, smi); |
156 } | 150 } |
157 } | 151 } |
158 | 152 |
159 // Check increased capacity. | 153 // Check increased capacity. |
160 CHECK_EQ(128, ObjectHashTable::cast(weakset->table())->Capacity()); | 154 CHECK_EQ(128, ObjectHashTable::cast(weakset->table())->Capacity()); |
161 | 155 |
162 // Force a full GC. | 156 // Force a full GC. |
163 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->NumberOfElements()); | 157 CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->NumberOfElements()); |
164 CHECK_EQ( | 158 CHECK_EQ( |
165 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); | 159 0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements()); |
(...skipping 26 matching lines...) Expand all Loading... |
192 Page* first_page = heap->old_pointer_space()->anchor()->next_page(); | 186 Page* first_page = heap->old_pointer_space()->anchor()->next_page(); |
193 factory->NewFixedArray(900 * KB / kPointerSize, TENURED); | 187 factory->NewFixedArray(900 * KB / kPointerSize, TENURED); |
194 | 188 |
195 // Fill up weak set with values on an evacuation candidate. | 189 // Fill up weak set with values on an evacuation candidate. |
196 { | 190 { |
197 HandleScope scope(isolate); | 191 HandleScope scope(isolate); |
198 for (int i = 0; i < 32; i++) { | 192 for (int i = 0; i < 32; i++) { |
199 Handle<JSObject> object = factory->NewJSObject(function, TENURED); | 193 Handle<JSObject> object = factory->NewJSObject(function, TENURED); |
200 CHECK(!heap->InNewSpace(object->address())); | 194 CHECK(!heap->InNewSpace(object->address())); |
201 CHECK(!first_page->Contains(object->address())); | 195 CHECK(!first_page->Contains(object->address())); |
202 PutIntoWeakSet(weakset, key, object); | 196 Runtime::WeakCollectionSet(weakset, key, object); |
203 } | 197 } |
204 } | 198 } |
205 | 199 |
206 // Force compacting garbage collection. | 200 // Force compacting garbage collection. |
207 CHECK(FLAG_always_compact); | 201 CHECK(FLAG_always_compact); |
208 heap->CollectAllGarbage(Heap::kNoGCFlags); | 202 heap->CollectAllGarbage(Heap::kNoGCFlags); |
209 } | 203 } |
210 | 204 |
211 | 205 |
212 // Test that weak set keys on an evacuation candidate which are reachable by | 206 // Test that weak set keys on an evacuation candidate which are reachable by |
(...skipping 19 matching lines...) Expand all Loading... |
232 | 226 |
233 // Fill up weak set with keys on an evacuation candidate. | 227 // Fill up weak set with keys on an evacuation candidate. |
234 Handle<JSObject> keys[32]; | 228 Handle<JSObject> keys[32]; |
235 for (int i = 0; i < 32; i++) { | 229 for (int i = 0; i < 32; i++) { |
236 keys[i] = factory->NewJSObject(function, TENURED); | 230 keys[i] = factory->NewJSObject(function, TENURED); |
237 CHECK(!heap->InNewSpace(keys[i]->address())); | 231 CHECK(!heap->InNewSpace(keys[i]->address())); |
238 CHECK(!first_page->Contains(keys[i]->address())); | 232 CHECK(!first_page->Contains(keys[i]->address())); |
239 } | 233 } |
240 Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate); | 234 Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate); |
241 for (int i = 0; i < 32; i++) { | 235 for (int i = 0; i < 32; i++) { |
242 PutIntoWeakSet(weakset, | 236 Handle<Smi> smi(Smi::FromInt(i), isolate); |
243 keys[i], | 237 Runtime::WeakCollectionSet(weakset, keys[i], smi); |
244 Handle<Smi>(Smi::FromInt(i), isolate)); | |
245 } | 238 } |
246 | 239 |
247 // Force compacting garbage collection. The subsequent collections are used | 240 // Force compacting garbage collection. The subsequent collections are used |
248 // to verify that key references were actually updated. | 241 // to verify that key references were actually updated. |
249 CHECK(FLAG_always_compact); | 242 CHECK(FLAG_always_compact); |
250 heap->CollectAllGarbage(Heap::kNoGCFlags); | 243 heap->CollectAllGarbage(Heap::kNoGCFlags); |
251 heap->CollectAllGarbage(Heap::kNoGCFlags); | 244 heap->CollectAllGarbage(Heap::kNoGCFlags); |
252 heap->CollectAllGarbage(Heap::kNoGCFlags); | 245 heap->CollectAllGarbage(Heap::kNoGCFlags); |
253 } | 246 } |
OLD | NEW |