| OLD | NEW |
| 1 // Copyright 2010 the V8 project authors. All rights reserved. | 1 // Copyright 2010 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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 } | 538 } |
| 539 | 539 |
| 540 | 540 |
| 541 CpuProfile* CpuProfilesCollection::GetProfile(int security_token_id, | 541 CpuProfile* CpuProfilesCollection::GetProfile(int security_token_id, |
| 542 unsigned uid) { | 542 unsigned uid) { |
| 543 HashMap::Entry* entry = profiles_uids_.Lookup(reinterpret_cast<void*>(uid), | 543 HashMap::Entry* entry = profiles_uids_.Lookup(reinterpret_cast<void*>(uid), |
| 544 static_cast<uint32_t>(uid), | 544 static_cast<uint32_t>(uid), |
| 545 false); | 545 false); |
| 546 int index; | 546 int index; |
| 547 if (entry != NULL) { | 547 if (entry != NULL) { |
| 548 index = reinterpret_cast<int>(entry->value); | 548 index = static_cast<int>(reinterpret_cast<intptr_t>(entry->value)); |
| 549 } else { | 549 } else { |
| 550 return NULL; | 550 return NULL; |
| 551 } | 551 } |
| 552 List<CpuProfile*>* unabridged_list = | 552 List<CpuProfile*>* unabridged_list = |
| 553 profiles_by_token_[TokenToIndex(CodeEntry::kNoSecurityToken)]; | 553 profiles_by_token_[TokenToIndex(CodeEntry::kNoSecurityToken)]; |
| 554 if (security_token_id == CodeEntry::kNoSecurityToken) { | 554 if (security_token_id == CodeEntry::kNoSecurityToken) { |
| 555 return unabridged_list->at(index); | 555 return unabridged_list->at(index); |
| 556 } | 556 } |
| 557 List<CpuProfile*>* list = GetProfilesList(security_token_id); | 557 List<CpuProfile*>* list = GetProfilesList(security_token_id); |
| 558 if (list->at(index) == NULL) { | 558 if (list->at(index) == NULL) { |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 *entry++ = EntryForVMState(sample.state); | 801 *entry++ = EntryForVMState(sample.state); |
| 802 } | 802 } |
| 803 } | 803 } |
| 804 | 804 |
| 805 profiles_->AddPathToCurrentProfiles(entries); | 805 profiles_->AddPathToCurrentProfiles(entries); |
| 806 } | 806 } |
| 807 | 807 |
| 808 } } // namespace v8::internal | 808 } } // namespace v8::internal |
| 809 | 809 |
| 810 #endif // ENABLE_LOGGING_AND_PROFILING | 810 #endif // ENABLE_LOGGING_AND_PROFILING |
| OLD | NEW |