8a1bafaf1a
There was a data race in the access of the foreground_task_runner_map_. I protect each access to foreground_task_runner_map_ with a lock now. Original change's description: > [platform] Implement TaskRunners in the DefaultPlatform > > This CL implements the TaskRunners in the DefaultPlatform which has been > added recently to the platform API. In addition I changed how task > posting works on the DefaultPlatform. > > With this implementation the DefaultPlatform keeps one > DefaultForegroundTaskRunner per isolate, plus one > DefaultBackgroundTaskRunner. The DefaultPlatform owns these TaskRunners > with a shared_ptr, which is also shared with any caller of > GetForegroundTaskRunner or GetBackgroundTaskrunner. > > This CL moves the task management from the DefaultPlatform to the > TaskRunners. The DefaultForegroundTaskRunner owns and manages the the > task queue, the delayed task queue, and the idle task queue. The > DefaultBackgroundTaskRunner owns the WorkerThread pool and the > background task queue. > > In addition changed many Task* to std::unique_ptr<Task> to document task > ownership. > > R=rmcilroy@chromium.org > > Change-Id: Ib9a01f1f45e5b48844a37d801f884210ec3f6c27 > Reviewed-on: https://chromium-review.googlesource.com/753583 > Commit-Queue: Andreas Haas <ahaas@chromium.org> > Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> > Cr-Commit-Position: refs/heads/master@{#49354} Change-Id: Iddccdb07bde1a799815ec6ed6af37082df4987c7 Reviewed-on: https://chromium-review.googlesource.com/770970 Commit-Queue: Andreas Haas <ahaas@chromium.org> Reviewed-by: Andreas Haas <ahaas@chromium.org> Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> Cr-Commit-Position: refs/heads/master@{#49379}
69 lines
1.7 KiB
C++
69 lines
1.7 KiB
C++
// Copyright 2014 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 "include/v8-platform.h"
|
|
#include "src/libplatform/task-queue.h"
|
|
#include "src/libplatform/worker-thread.h"
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
|
|
using testing::InSequence;
|
|
using testing::IsNull;
|
|
using testing::StrictMock;
|
|
|
|
namespace v8 {
|
|
namespace platform {
|
|
|
|
namespace {
|
|
|
|
struct MockTask : public Task {
|
|
virtual ~MockTask() { Die(); }
|
|
MOCK_METHOD0(Run, void());
|
|
MOCK_METHOD0(Die, void());
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// Needs to be in v8::platform due to BlockUntilQueueEmptyForTesting
|
|
// being private.
|
|
TEST(WorkerThreadTest, PostSingleTask) {
|
|
TaskQueue queue;
|
|
WorkerThread thread1(&queue);
|
|
WorkerThread thread2(&queue);
|
|
|
|
InSequence s;
|
|
std::unique_ptr<StrictMock<MockTask>> task(new StrictMock<MockTask>);
|
|
EXPECT_CALL(*task.get(), Run());
|
|
EXPECT_CALL(*task.get(), Die());
|
|
queue.Append(std::move(task));
|
|
|
|
// The next call should not time out.
|
|
queue.BlockUntilQueueEmptyForTesting();
|
|
queue.Terminate();
|
|
}
|
|
|
|
namespace worker_thread_unittest {
|
|
|
|
TEST(WorkerThreadTest, Basic) {
|
|
static const size_t kNumTasks = 10;
|
|
|
|
TaskQueue queue;
|
|
for (size_t i = 0; i < kNumTasks; ++i) {
|
|
InSequence s;
|
|
std::unique_ptr<StrictMock<MockTask>> task(new StrictMock<MockTask>);
|
|
EXPECT_CALL(*task.get(), Run());
|
|
EXPECT_CALL(*task.get(), Die());
|
|
queue.Append(std::move(task));
|
|
}
|
|
|
|
WorkerThread thread1(&queue);
|
|
WorkerThread thread2(&queue);
|
|
|
|
// TaskQueue DCHECKS that it's empty in its destructor.
|
|
queue.Terminate();
|
|
}
|
|
|
|
} // namespace worker_thread_unittest
|
|
} // namespace platform
|
|
} // namespace v8
|