Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 551 intptr_t delta = MemoryInUse() - initial_memory; | 551 intptr_t delta = MemoryInUse() - initial_memory; |
| 552 printf("delta: %" V8_PTR_PREFIX "d kB\n", delta / 1024); | 552 printf("delta: %" V8_PTR_PREFIX "d kB\n", delta / 1024); |
| 553 if (sizeof(initial_memory) == 8) { // 64-bit. | 553 if (sizeof(initial_memory) == 8) { // 64-bit. |
| 554 if (v8::internal::Snapshot::IsEnabled()) { | 554 if (v8::internal::Snapshot::IsEnabled()) { |
| 555 CHECK_LE(delta, 4000 * 1024); | 555 CHECK_LE(delta, 4000 * 1024); |
| 556 } else { | 556 } else { |
| 557 CHECK_LE(delta, 4500 * 1024); | 557 CHECK_LE(delta, 4500 * 1024); |
| 558 } | 558 } |
| 559 } else { // 32-bit. | 559 } else { // 32-bit. |
| 560 if (v8::internal::Snapshot::IsEnabled()) { | 560 if (v8::internal::Snapshot::IsEnabled()) { |
| 561 #ifndef V8_TARGET_ARCH_X32 | |
|
danno
2013/07/17 13:33:21
I don't think the limits should be special cased,
| |
| 561 CHECK_LE(delta, 3100 * 1024); | 562 CHECK_LE(delta, 3100 * 1024); |
| 563 #else | |
| 564 CHECK_LE(delta, 3700 * 1024); | |
| 565 #endif | |
| 562 } else { | 566 } else { |
| 567 #ifndef V8_TARGET_ARCH_X32 | |
| 563 CHECK_LE(delta, 3400 * 1024); | 568 CHECK_LE(delta, 3400 * 1024); |
| 569 #else | |
| 570 CHECK_LE(delta, 3900 * 1024); | |
| 571 #endif | |
| 564 } | 572 } |
| 565 } | 573 } |
| 566 } | 574 } |
| 567 } | 575 } |
| 568 | 576 |
| 569 | 577 |
| 570 intptr_t ShortLivingIsolate() { | 578 intptr_t ShortLivingIsolate() { |
| 571 v8::Isolate* isolate = v8::Isolate::New(); | 579 v8::Isolate* isolate = v8::Isolate::New(); |
| 572 { v8::Isolate::Scope isolate_scope(isolate); | 580 { v8::Isolate::Scope isolate_scope(isolate); |
| 573 v8::Locker lock(isolate); | 581 v8::Locker lock(isolate); |
| 574 v8::HandleScope handle_scope; | 582 v8::HandleScope handle_scope; |
| 575 v8::Local<v8::Context> context = v8::Context::New(isolate); | 583 v8::Local<v8::Context> context = v8::Context::New(isolate); |
| 576 CHECK(!context.IsEmpty()); | 584 CHECK(!context.IsEmpty()); |
| 577 } | 585 } |
| 578 isolate->Dispose(); | 586 isolate->Dispose(); |
| 579 return MemoryInUse(); | 587 return MemoryInUse(); |
| 580 } | 588 } |
| 581 | 589 |
| 582 | 590 |
| 583 TEST(RegressJoinThreadsOnIsolateDeinit) { | 591 TEST(RegressJoinThreadsOnIsolateDeinit) { |
| 584 intptr_t size_limit = ShortLivingIsolate() * 2; | 592 intptr_t size_limit = ShortLivingIsolate() * 2; |
| 585 for (int i = 0; i < 10; i++) { | 593 for (int i = 0; i < 10; i++) { |
| 586 CHECK_GT(size_limit, ShortLivingIsolate()); | 594 CHECK_GT(size_limit, ShortLivingIsolate()); |
| 587 } | 595 } |
| 588 } | 596 } |
| 589 | 597 |
| 590 #endif // __linux__ and !USE_SIMULATOR | 598 #endif // __linux__ and !USE_SIMULATOR |
| OLD | NEW |