e4e57d16b9
This is a reland of bebb2bdc06
Original change's description:
> [heap] Allow LocalHeap on the main thread
>
> This changes the safepoint scope to skip LocalHeap that is active
> for the current thread to avoid deadlocking.
>
> Bug: v8:10315
> Change-Id: I45e80ae66d0dbbe768107aa9cf0603204c644d9f
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2289983
> Reviewed-by: Dominik Inführ <dinfuehr@chromium.org>
> Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#68769}
Bug: v8:10315
Tbr: dinfuehr@chromium.org
Change-Id: I1974d8b6ffffbf3244e7ede2d20d9b2d623df150
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2290851
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68785}
162 lines
3.5 KiB
C++
162 lines
3.5 KiB
C++
// Copyright 2020 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "src/heap/safepoint.h"
|
|
#include "src/base/platform/mutex.h"
|
|
#include "src/base/platform/platform.h"
|
|
#include "src/heap/heap.h"
|
|
#include "src/heap/local-heap.h"
|
|
#include "test/unittests/test-utils.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
using SafepointTest = TestWithIsolate;
|
|
|
|
TEST_F(SafepointTest, ReachSafepointWithoutLocalHeaps) {
|
|
Heap* heap = i_isolate()->heap();
|
|
FLAG_local_heaps = true;
|
|
bool run = false;
|
|
{
|
|
SafepointScope scope(heap);
|
|
run = true;
|
|
}
|
|
CHECK(run);
|
|
}
|
|
|
|
class ParkedThread final : public v8::base::Thread {
|
|
public:
|
|
ParkedThread(Heap* heap, base::Mutex* mutex)
|
|
: v8::base::Thread(base::Thread::Options("ThreadWithLocalHeap")),
|
|
heap_(heap),
|
|
mutex_(mutex) {}
|
|
|
|
void Run() override {
|
|
LocalHeap local_heap(heap_);
|
|
|
|
if (mutex_) {
|
|
ParkedScope scope(&local_heap);
|
|
base::MutexGuard guard(mutex_);
|
|
}
|
|
}
|
|
|
|
Heap* heap_;
|
|
base::Mutex* mutex_;
|
|
};
|
|
|
|
TEST_F(SafepointTest, StopParkedThreads) {
|
|
Heap* heap = i_isolate()->heap();
|
|
FLAG_local_heaps = true;
|
|
|
|
int safepoints = 0;
|
|
|
|
const int kThreads = 10;
|
|
const int kRuns = 5;
|
|
|
|
for (int run = 0; run < kRuns; run++) {
|
|
base::Mutex mutex;
|
|
std::vector<ParkedThread*> threads;
|
|
|
|
mutex.Lock();
|
|
|
|
for (int i = 0; i < kThreads; i++) {
|
|
ParkedThread* thread =
|
|
new ParkedThread(heap, i % 2 == 0 ? &mutex : nullptr);
|
|
CHECK(thread->Start());
|
|
threads.push_back(thread);
|
|
}
|
|
|
|
{
|
|
SafepointScope scope(heap);
|
|
safepoints++;
|
|
}
|
|
mutex.Unlock();
|
|
|
|
for (ParkedThread* thread : threads) {
|
|
thread->Join();
|
|
delete thread;
|
|
}
|
|
}
|
|
|
|
CHECK_EQ(safepoints, kRuns);
|
|
}
|
|
|
|
static const int kRuns = 10000;
|
|
|
|
class RunningThread final : public v8::base::Thread {
|
|
public:
|
|
RunningThread(Heap* heap, std::atomic<int>* counter)
|
|
: v8::base::Thread(base::Thread::Options("ThreadWithLocalHeap")),
|
|
heap_(heap),
|
|
counter_(counter) {}
|
|
|
|
void Run() override {
|
|
LocalHeap local_heap(heap_);
|
|
|
|
for (int i = 0; i < kRuns; i++) {
|
|
counter_->fetch_add(1);
|
|
if (i % 100 == 0) local_heap.Safepoint();
|
|
}
|
|
}
|
|
|
|
Heap* heap_;
|
|
std::atomic<int>* counter_;
|
|
};
|
|
|
|
TEST_F(SafepointTest, StopRunningThreads) {
|
|
Heap* heap = i_isolate()->heap();
|
|
FLAG_local_heaps = true;
|
|
|
|
const int kThreads = 10;
|
|
const int kRuns = 5;
|
|
const int kSafepoints = 3;
|
|
int safepoint_count = 0;
|
|
|
|
for (int run = 0; run < kRuns; run++) {
|
|
std::atomic<int> counter(0);
|
|
std::vector<RunningThread*> threads;
|
|
|
|
for (int i = 0; i < kThreads; i++) {
|
|
RunningThread* thread = new RunningThread(heap, &counter);
|
|
CHECK(thread->Start());
|
|
threads.push_back(thread);
|
|
}
|
|
|
|
for (int i = 0; i < kSafepoints; i++) {
|
|
SafepointScope scope(heap);
|
|
safepoint_count++;
|
|
}
|
|
|
|
for (RunningThread* thread : threads) {
|
|
thread->Join();
|
|
delete thread;
|
|
}
|
|
}
|
|
|
|
CHECK_EQ(safepoint_count, kRuns * kSafepoints);
|
|
}
|
|
|
|
TEST_F(SafepointTest, SkipLocalHeapOfThisThread) {
|
|
Heap* heap = i_isolate()->heap();
|
|
FLAG_local_heaps = true;
|
|
LocalHeap local_heap(heap);
|
|
{
|
|
SafepointScope scope(heap);
|
|
local_heap.Safepoint();
|
|
}
|
|
{
|
|
ParkedScope parked_scope(&local_heap);
|
|
SafepointScope scope(heap);
|
|
local_heap.Safepoint();
|
|
}
|
|
{
|
|
SafepointScope scope(heap);
|
|
local_heap.Safepoint();
|
|
}
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|