src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Aug 20, 2026
+103 −60
Merged

src: run same-priority platform tasks in posting order #65353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 29 additions & 43 deletions src/node_platform.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
DelayedTaskScheduler* scheduler =
ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
while (!tasks_to_run.empty()) {
// We have to use const_cast because std::priority_queue::top() does not
// return a movable item.
std::unique_ptr<Task> task =
std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
tasks_to_run.pop();
// This runs either the ScheduleTasks that scheduels the timers to
// pop the tasks back into the worker task runner queue, or the
// or the StopTasks to stop the timers and drop all the pending tasks.
// ScheduleTasks (start a timer that pops the task into the worker queue)
// in posting order, then, once Stop() was called, the StopTask.
for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
task->Run();
}
}
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
bool did_work = false;

auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
while (!delayed_tasks_to_schedule.empty()) {
// We have to use const_cast because std::priority_queue::top() does not
// return a movable item.
std::unique_ptr<DelayedTask> delayed =
std::move(const_cast<std::unique_ptr<DelayedTask>&>(
delayed_tasks_to_schedule.top()));
delayed_tasks_to_schedule.pop();

for (std::unique_ptr<DelayedTask>& delayed :
foreground_delayed_tasks_.Lock().PopAll()) {
did_work = true;
uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
});
}

TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
{
auto locked = foreground_tasks_.Lock();
tasks = locked.PopAll();
}

while (!tasks.empty()) {
// We have to use const_cast because std::priority_queue::top() does not
// return a movable item.
std::unique_ptr<TaskQueueEntry> entry =
std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
tasks.pop();
for (std::unique_ptr<TaskQueueEntry>& entry :
foreground_tasks_.Lock().PopAll()) {
did_work = true;
RunForegroundTask(std::move(entry->task));
}
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
: queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
// std::priority_queue::top() only hands out a const reference.
Item& top = const_cast<Item&>(task_queue_.top());
std::unique_ptr<T> task = std::move(top.task);
task_queue_.pop();
return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
if (outstanding) {
queue_->outstanding_tasks_++;
}
queue_->task_queue_.push(std::move(task));
queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
if (queue_->task_queue_.empty()) {
return std::unique_ptr<T>(nullptr);
}
std::unique_ptr<T> result = std::move(
std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
queue_->task_queue_.pop();
return result;
return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
if (queue_->stopped_) {
return std::unique_ptr<T>(nullptr);
}
std::unique_ptr<T> result = std::move(
std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
queue_->task_queue_.pop();
return result;
return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
TaskQueue<T>::PriorityQueue result;
result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
std::vector<std::unique_ptr<T>> result;
result.reserve(queue_->task_queue_.size());
while (!queue_->task_queue_.empty()) {
result.push_back(queue_->PopTask());
}
return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
// The order of these calls is important. When the Isolate is disposed,
// it may still post tasks to the platform, so it must still be registered
Expand Down
41 changes: 24 additions & 17 deletions src/node_platform.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
public:
// If the entry type has a priority member, order the priority queue by
// that - higher priority first. Otherwise, maintain insertion order.
struct EntryCompare {
bool operator()(const std::unique_ptr<T>& a,
const std::unique_ptr<T>& b) const {
if constexpr (has_priority<T>) {
return a->priority < b->priority;
} else {
return false;
}
}
};

using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
std::vector<std::unique_ptr<T>>,
EntryCompare>;
class Locked {
public:
void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
void NotifyOfOutstandingCompletion();
void BlockingDrain();
void Stop();
PriorityQueue PopAll();
// All queued tasks, in the order Pop() would have returned them.
std::vector<std::unique_ptr<T>> PopAll();

private:
friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
Locked Lock() { return Locked(this); }

private:
struct Item {
std::unique_ptr<T> task;
uint64_t sequence;
};
// Higher priority first if the entry type has one; posting order otherwise
// and among equal priorities (a sequence number breaks the tie).
struct ItemCompare {
bool operator()(const Item& a, const Item& b) const {
if constexpr (has_priority<T>) {
if (a.task->priority != b.task->priority) {
return a.task->priority < b.task->priority;
}
}
return a.sequence > b.sequence;
}
};
using PriorityQueue =
std::priority_queue<Item, std::vector<Item>, ItemCompare>;

std::unique_ptr<T> PopTask();

Mutex lock_;
ConditionVariable tasks_available_;
ConditionVariable outstanding_tasks_drained_;
int outstanding_tasks_;
bool stopped_;
uint64_t next_sequence_ = 0;
PriorityQueue task_queue_;
};

Expand Down
50 changes: 50 additions & 0 deletions test/cctest/test_platform.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
node::SetTracingController(orig_controller);
EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
public:
RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
void Run() override { log_->push_back(id_); }

private:
std::vector<int>* log_;
int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
std::vector<int> log;
{
node::TaskQueue<v8::Task> queue;
for (int i = 0; i < 64; i++) {
queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
}
for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
for (int i = 64; i < 96; i++) {
queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
}
while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
}
ASSERT_EQ(log.size(), 96u);
for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

log.clear();
{
using v8::TaskPriority;
node::TaskQueue<node::TaskQueueEntry> queue;
const TaskPriority priorities[] = {TaskPriority::kUserVisible,
TaskPriority::kBestEffort,
TaskPriority::kUserBlocking,
TaskPriority::kUserVisible,
TaskPriority::kUserBlocking,
TaskPriority::kBestEffort,
TaskPriority::kUserVisible};
int id = 0;
for (TaskPriority priority : priorities) {
queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
std::make_unique<RecordingTask>(&log, id++), priority));
}
for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
entry->task->Run();
}
}
const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
EXPECT_EQ(log, expected);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
src: run same-priority platform tasks in posting order#65353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 1 commit into

from

Aug 20, 2026

+103

−60

 Merged


src: run same-priority platform tasks in posting order
#65353
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


72 changes: 29 additions & 43 deletions
src/node_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,9 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 DelayedTaskScheduler* scheduler =
 ContainerOf(&DelayedTaskScheduler::loop_, flush_tasks->loop);

 auto tasks_to_run = scheduler->tasks_.Lock().PopAll();
 while (!tasks_to_run.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<Task> task =
 std::move(const_cast<std::unique_ptr<Task>&>(tasks_to_run.top()));
 tasks_to_run.pop();
 // This runs either the ScheduleTasks that scheduels the timers to
 // pop the tasks back into the worker task runner queue, or the
 // or the StopTasks to stop the timers and drop all the pending tasks.
 // ScheduleTasks (start a timer that pops the task into the worker queue)
 // in posting order, then, once Stop() was called, the StopTask.
 for (std::unique_ptr<Task>& task : scheduler->tasks_.Lock().PopAll()) {
 task->Run();
 }
 }
Expand DownExpand Up@@ -611,15 +604,8 @@ void NodePlatform::DrainTasks(Isolate* isolate) {
bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 bool did_work = false;

 auto delayed_tasks_to_schedule = foreground_delayed_tasks_.Lock().PopAll();
 while (!delayed_tasks_to_schedule.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<DelayedTask> delayed =
 std::move(const_cast<std::unique_ptr<DelayedTask>&>(
 delayed_tasks_to_schedule.top()));
 delayed_tasks_to_schedule.pop();

 for (std::unique_ptr<DelayedTask>& delayed :
 foreground_delayed_tasks_.Lock().PopAll()) {
 did_work = true;
 uint64_t delay_millis = llround(delayed->timeout * 1000);

Expand All@@ -642,18 +628,8 @@ bool PerIsolatePlatformData::FlushForegroundTasksInternal() {
 });
 }

 TaskQueue<TaskQueueEntry>::PriorityQueue tasks;
 {
 auto locked = foreground_tasks_.Lock();
 tasks = locked.PopAll();
 }

 while (!tasks.empty()) {
 // We have to use const_cast because std::priority_queue::top() does not
 // return a movable item.
 std::unique_ptr<TaskQueueEntry> entry =
 std::move(const_cast<std::unique_ptr<TaskQueueEntry>&>(tasks.top()));
 tasks.pop();
 for (std::unique_ptr<TaskQueueEntry>& entry :
 foreground_tasks_.Lock().PopAll()) {
 did_work = true;
 RunForegroundTask(std::move(entry->task));
 }
Expand DownExpand Up@@ -788,12 +764,21 @@ template <class T>
TaskQueue<T>::Locked::Locked(TaskQueue* queue)
 : queue_(queue), lock_(queue->lock_) {}

template <class T>
std::unique_ptr<T> TaskQueue<T>::PopTask() {
 // std::priority_queue::top() only hands out a const reference.
 Item& top = const_cast<Item&>(task_queue_.top());
 std::unique_ptr<T> task = std::move(top.task);
 task_queue_.pop();
 return task;
}

template <class T>
void TaskQueue<T>::Locked::Push(std::unique_ptr<T> task, bool outstanding) {
 if (outstanding) {
 queue_->outstanding_tasks_++;
 }
 queue_->task_queue_.push(std::move(task));
 queue_->task_queue_.push({std::move(task), queue_->next_sequence_++});
 queue_->tasks_available_.Signal(lock_);
}

Expand All@@ -802,10 +787,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::Pop() {
 if (queue_->task_queue_.empty()) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -816,10 +798,7 @@ std::unique_ptr<T> TaskQueue<T>::Locked::BlockingPop() {
 if (queue_->stopped_) {
 return std::unique_ptr<T>(nullptr);
 }
 std::unique_ptr<T> result = std::move(
 std::move(const_cast<std::unique_ptr<T>&>(queue_->task_queue_.top())));
 queue_->task_queue_.pop();
 return result;
 return queue_->PopTask();
}

template <class T>
Expand All@@ -843,12 +822,19 @@ void TaskQueue<T>::Locked::Stop() {
}

template <class T>
TaskQueue<T>::PriorityQueue TaskQueue<T>::Locked::PopAll() {
 TaskQueue<T>::PriorityQueue result;
 result.swap(queue_->task_queue_);
std::vector<std::unique_ptr<T>> TaskQueue<T>::Locked::PopAll() {
 std::vector<std::unique_ptr<T>> result;
 result.reserve(queue_->task_queue_.size());
 while (!queue_->task_queue_.empty()) {
 result.push_back(queue_->PopTask());
 }
 return result;
}

template class TaskQueue<Task>;
template class TaskQueue<TaskQueueEntry>;
template class TaskQueue<DelayedTask>;

void MultiIsolatePlatform::DisposeIsolate(Isolate* isolate) {
 // The order of these calls is important. When the Isolate is disposed,
 // it may still post tasks to the platform, so it must still be registered
Expand Down

41 changes: 24 additions & 17 deletions
src/node_platform.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,22 +27,6 @@ concept has_priority = requires(T t) { t.priority; };
template <class T>
class TaskQueue {
 public:
 // If the entry type has a priority member, order the priority queue by
 // that - higher priority first. Otherwise, maintain insertion order.
 struct EntryCompare {
 bool operator()(const std::unique_ptr<T>& a,
 const std::unique_ptr<T>& b) const {
 if constexpr (has_priority<T>) {
 return a->priority < b->priority;
 } else {
 return false;
 }
 }
 };

 using PriorityQueue = std::priority_queue<std::unique_ptr<T>,
 std::vector<std::unique_ptr<T>>,
 EntryCompare>;
 class Locked {
 public:
 void Push(std::unique_ptr<T> task, bool outstanding = false);
Expand All@@ -51,7 +35,8 @@ class TaskQueue {
 void NotifyOfOutstandingCompletion();
 void BlockingDrain();
 void Stop();
 PriorityQueue PopAll();
 // All queued tasks, in the order Pop() would have returned them.
 std::vector<std::unique_ptr<T>> PopAll();

 private:
 friend class TaskQueue;
Expand All@@ -67,11 +52,33 @@ class TaskQueue {
 Locked Lock() { return Locked(this); }

 private:
 struct Item {
 std::unique_ptr<T> task;
 uint64_t sequence;
 };
 // Higher priority first if the entry type has one; posting order otherwise
 // and among equal priorities (a sequence number breaks the tie).
 struct ItemCompare {
 bool operator()(const Item& a, const Item& b) const {
 if constexpr (has_priority<T>) {
 if (a.task->priority != b.task->priority) {
 return a.task->priority < b.task->priority;
 }
 }
 return a.sequence > b.sequence;
 }
 };
 using PriorityQueue =
 std::priority_queue<Item, std::vector<Item>, ItemCompare>;

 std::unique_ptr<T> PopTask();

 Mutex lock_;
 ConditionVariable tasks_available_;
 ConditionVariable outstanding_tasks_drained_;
 int outstanding_tasks_;
 bool stopped_;
 uint64_t next_sequence_ = 0;
 PriorityQueue task_queue_;
};

Expand Down

50 changes: 50 additions & 0 deletions
test/cctest/test_platform.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,53 @@ TEST_F(PlatformTest, TracingControllerNullptr) {
 node::SetTracingController(orig_controller);
 EXPECT_EQ(node::GetTracingController(), orig_controller);
}

class RecordingTask : public v8::Task {
 public:
 RecordingTask(std::vector<int>* log, int id) : log_(log), id_(id) {}
 void Run() override { log_->push_back(id_); }

 private:
 std::vector<int>* log_;
 int id_;
};

TEST(TaskQueueTest, HigherPriorityFirstThenPostingOrder) {
 std::vector<int> log;
 {
 node::TaskQueue<v8::Task> queue;
 for (int i = 0; i < 64; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 for (std::unique_ptr<v8::Task>& task : queue.Lock().PopAll()) task->Run();
 for (int i = 64; i < 96; i++) {
 queue.Lock().Push(std::make_unique<RecordingTask>(&log, i));
 }
 while (std::unique_ptr<v8::Task> task = queue.Lock().Pop()) task->Run();
 }
 ASSERT_EQ(log.size(), 96u);
 for (int i = 0; i < 96; i++) EXPECT_EQ(log[i], i);

 log.clear();
 {
 using v8::TaskPriority;
 node::TaskQueue<node::TaskQueueEntry> queue;
 const TaskPriority priorities[] = {TaskPriority::kUserVisible,
 TaskPriority::kBestEffort,
 TaskPriority::kUserBlocking,
 TaskPriority::kUserVisible,
 TaskPriority::kUserBlocking,
 TaskPriority::kBestEffort,
 TaskPriority::kUserVisible};
 int id = 0;
 for (TaskPriority priority : priorities) {
 queue.Lock().Push(std::make_unique<node::TaskQueueEntry>(
 std::make_unique<RecordingTask>(&log, id++), priority));
 }
 for (std::unique_ptr<node::TaskQueueEntry>& entry : queue.Lock().PopAll()) {
 entry->task->Run();
 }
 }
 const std::vector<int> expected = {2, 4, 0, 3, 6, 1, 5};
 EXPECT_EQ(log, expected);
}
Loading