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

Side by Side Diff: runtime/vm/object.cc

Issue 15772005: - Add different types for persistent and weak persistent handles (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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 | Annotate | Revision Log
« runtime/include/dart_api.h ('K') | « runtime/vm/object.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/cpu.h" 10 #include "vm/cpu.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } else if (value == '\\') { 288 } else if (value == '\\') {
289 return '\\'; 289 return '\\';
290 } else if (value == '$') { 290 } else if (value == '$') {
291 return '$'; 291 return '$';
292 } 292 }
293 UNREACHABLE(); 293 UNREACHABLE();
294 return '\0'; 294 return '\0';
295 } 295 }
296 296
297 297
298 static void DeleteWeakPersistentHandle(Dart_Handle handle) { 298 static void DeleteWeakPersistentHandle(Dart_WeakPersistentHandle handle) {
299 ApiState* state = Isolate::Current()->api_state(); 299 ApiState* state = Isolate::Current()->api_state();
300 ASSERT(state != NULL); 300 ASSERT(state != NULL);
301 FinalizablePersistentHandle* weak_ref = 301 FinalizablePersistentHandle* weak_ref =
302 reinterpret_cast<FinalizablePersistentHandle*>(handle); 302 reinterpret_cast<FinalizablePersistentHandle*>(handle);
303 ASSERT(state->IsValidWeakPersistentHandle(handle)); 303 ASSERT(state->IsValidWeakPersistentHandle(handle));
304 state->weak_persistent_handles().FreeHandle(weak_ref); 304 state->weak_persistent_handles().FreeHandle(weak_ref);
305 } 305 }
306 306
307 307
308 void Object::InitOnce() { 308 void Object::InitOnce() {
(...skipping 4714 matching lines...) Expand 10 before | Expand all | Expand 10 after
5023 RawExternalTypedData* TokenStream::GetStream() const { 5023 RawExternalTypedData* TokenStream::GetStream() const {
5024 return raw_ptr()->stream_; 5024 return raw_ptr()->stream_;
5025 } 5025 }
5026 5026
5027 5027
5028 void TokenStream::SetStream(const ExternalTypedData& value) const { 5028 void TokenStream::SetStream(const ExternalTypedData& value) const {
5029 StorePointer(&raw_ptr()->stream_, value.raw()); 5029 StorePointer(&raw_ptr()->stream_, value.raw());
5030 } 5030 }
5031 5031
5032 5032
5033 void TokenStream::DataFinalizer(Dart_Handle handle, void *peer) { 5033 void TokenStream::DataFinalizer(Dart_WeakPersistentHandle handle, void *peer) {
5034 ASSERT(peer != NULL); 5034 ASSERT(peer != NULL);
5035 ::free(peer); 5035 ::free(peer);
5036 DeleteWeakPersistentHandle(handle); 5036 DeleteWeakPersistentHandle(handle);
5037 } 5037 }
5038 5038
5039 5039
5040 RawString* TokenStream::PrivateKey() const { 5040 RawString* TokenStream::PrivateKey() const {
5041 return raw_ptr()->private_key_; 5041 return raw_ptr()->private_key_;
5042 } 5042 }
5043 5043
(...skipping 7214 matching lines...) Expand 10 before | Expand all | Expand 10 after
12258 result ^= raw; 12258 result ^= raw;
12259 result.SetLength(len); 12259 result.SetLength(len);
12260 result.SetHash(0); 12260 result.SetHash(0);
12261 SetExternalData(result, external_data); 12261 SetExternalData(result, external_data);
12262 } 12262 }
12263 AddFinalizer(result, external_data, ExternalOneByteString::Finalize); 12263 AddFinalizer(result, external_data, ExternalOneByteString::Finalize);
12264 return ExternalOneByteString::raw(result); 12264 return ExternalOneByteString::raw(result);
12265 } 12265 }
12266 12266
12267 12267
12268 void ExternalOneByteString::Finalize(Dart_Handle handle, void* peer) { 12268 void ExternalOneByteString::Finalize(Dart_WeakPersistentHandle handle, void* pee r) {
12269 delete reinterpret_cast<ExternalStringData<uint8_t>*>(peer); 12269 delete reinterpret_cast<ExternalStringData<uint8_t>*>(peer);
12270 DeleteWeakPersistentHandle(handle); 12270 DeleteWeakPersistentHandle(handle);
12271 } 12271 }
12272 12272
12273 12273
12274 RawExternalTwoByteString* ExternalTwoByteString::New( 12274 RawExternalTwoByteString* ExternalTwoByteString::New(
12275 const uint16_t* data, 12275 const uint16_t* data,
12276 intptr_t len, 12276 intptr_t len,
12277 void* peer, 12277 void* peer,
12278 Dart_PeerFinalizer callback, 12278 Dart_PeerFinalizer callback,
(...skipping 16 matching lines...) Expand all
12295 result ^= raw; 12295 result ^= raw;
12296 result.SetLength(len); 12296 result.SetLength(len);
12297 result.SetHash(0); 12297 result.SetHash(0);
12298 SetExternalData(result, external_data); 12298 SetExternalData(result, external_data);
12299 } 12299 }
12300 AddFinalizer(result, external_data, ExternalTwoByteString::Finalize); 12300 AddFinalizer(result, external_data, ExternalTwoByteString::Finalize);
12301 return ExternalTwoByteString::raw(result); 12301 return ExternalTwoByteString::raw(result);
12302 } 12302 }
12303 12303
12304 12304
12305 void ExternalTwoByteString::Finalize(Dart_Handle handle, void* peer) { 12305 void ExternalTwoByteString::Finalize(Dart_WeakPersistentHandle handle, void* pee r) {
12306 delete reinterpret_cast<ExternalStringData<uint16_t>*>(peer); 12306 delete reinterpret_cast<ExternalStringData<uint16_t>*>(peer);
12307 DeleteWeakPersistentHandle(handle); 12307 DeleteWeakPersistentHandle(handle);
12308 } 12308 }
12309 12309
12310 12310
12311 RawBool* Bool::New(bool value) { 12311 RawBool* Bool::New(bool value) {
12312 ASSERT(Isolate::Current()->object_store()->bool_class() != Class::null()); 12312 ASSERT(Isolate::Current()->object_store()->bool_class() != Class::null());
12313 Bool& result = Bool::Handle(); 12313 Bool& result = Bool::Handle();
12314 { 12314 {
12315 // Since the two boolean instances are singletons we allocate them straight 12315 // Since the two boolean instances are singletons we allocate them straight
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
13258 } 13258 }
13259 return result.raw(); 13259 return result.raw();
13260 } 13260 }
13261 13261
13262 13262
13263 const char* WeakProperty::ToCString() const { 13263 const char* WeakProperty::ToCString() const {
13264 return "_WeakProperty"; 13264 return "_WeakProperty";
13265 } 13265 }
13266 13266
13267 } // namespace dart 13267 } // namespace dart
OLDNEW
« runtime/include/dart_api.h ('K') | « runtime/vm/object.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698